jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,754 Commits 134 Branches 0 Tags
b86d15c5cb1598ab68929afd6de82f37a4e32372
Commit Graph

78 Commits

Author SHA1 Message Date
yuxianghui
98923c1797 1、设备维保优化 2024-10-22 17:52:20 +08:00
mgw
786fca2937 调整“驾驶舱”的机床状态与工厂产线实际不一致的问题 2024-10-10 14:01:39 +08:00
guanhuan
d067c5b8c4 左侧图标修改 2024-09-20 09:49:13 +08:00
yuxianghui
0f47f7c3b8 1、添加权限；2、设备的设备检修标准字段关闭创建功能；3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug；4、关闭仓库创建按钮 2024-05-13 11:54:03 +08:00
黄焱
f639e59b91 解决频繁报错弹窗，新增判断 2024-03-15 10:10:17 +08:00
黄焱
776877f7a4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 2024-03-14 16:50:03 +08:00
黄焱
cdf8e7227c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 
# Conflicts:
#	sf_maintenance/views/equipment_maintenance_standards_views.xml

增加owl监听必填标识功能
 2024-03-14 16:47:20 +08:00
qihao.gong@jikimo.com
20436ff6ac 增加必填按钮 修改字段string 2024-03-14 14:28:38 +08:00
qihao.gong@jikimo.com
1a50a8220e 处理设备字段类型相关缺陷 2024-03-05 16:50:08 +08:00
黄焱
98103bac73 修改必填标识js，修改之前必填标识样式 2024-03-04 11:21:50 +08:00
qihao.gong@jikimo.com
7e4a3251c8 增加必填标识 2024-03-01 15:43:03 +08:00
qihao.gong@jikimo.com
75354c67db 修改设备oee自动生成，设备刀库编码规则 2024-02-28 17:14:42 +08:00
qihao.gong@jikimo.com
e70a91d1ec 修改定时同步接口，机床参数 2024-02-26 17:07:16 +08:00
qihao.gong@jikimo.com
fc7c66c615 AGV增加运行日志 
设备oee增加运行日志
 2024-01-24 17:29:42 +08:00
qihao.gong@jikimo.com
ce53afe1b0 修改权限组访问权限 2024-01-08 15:29:48 +08:00
qihao.gong@jikimo.com
c81dc99aef 修改获取CNC程序从工单到制造订单 2024-01-05 11:23:27 +08:00
qihao.gong@jikimo.com
7fe7de46c6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 2024-01-02 10:01:24 +08:00
黄焱
e9987fdcfa // 加工能力\冷却方式 竖列展示改为横列展示 2023-12-28 17:44:51 +08:00
qihao.gong@jikimo.com
98847a2c42 处理设备控制bug 2023-12-28 17:38:56 +08:00
qihao.gong@jikimo.com
93fe4d8c62 区分tree和form继承视图 2023-12-27 14:41:53 +08:00
qihao.gong@jikimo.com
c65e13a83e 修改设备类别以及机床参数 2023-12-18 17:38:24 +08:00
qihao.gong@jikimo.com
ef2f7d3ecb 修改机床设备参数，处理同步bug，以及机床设备视图布局 2023-12-15 17:28:42 +08:00
qihao.gong@jikimo.com
94c0b00c2d 机床注册按钮根据权限组区分 2023-12-04 17:28:54 +08:00
qihao.gong@jikimo.com
b4b5207aea 开发测试制造模块权限，修改设备机床类别的布局以及编码规则 2023-11-22 17:36:50 +08:00
jinling.yang
5ffe2ce0e2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-10-30 10:48:13 +08:00
qihao.gong@jikimo.com
b88c6a53ab 长宽高 2023-10-27 09:37:23 +08:00
qihao.gong@jikimo.com
ccb53a61de 修改设备菜单默认展示页面 2023-10-26 17:32:00 +08:00
jinling.yang
d83255cc67 优化同步刀具标准库接口（包含全部合并每日） 2023-10-19 17:23:53 +08:00
jinling.yang
14edbd85f4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11） 
# Conflicts:
#	sf_base/models/tool_base.py
#	sf_base/models/tool_base_new.py
#	sf_maintenance/views/maintenance_views.xml
#	sf_mrs_connect/models/res_config_setting.py
 2023-10-19 10:53:03 +08:00
jinling.yang
e7df6c14b1 同步刀具标准库 2023-10-19 10:49:54 +08:00
qihao.gong@jikimo.com
a57cdbe2f3 设备其他table增加参数 2023-10-17 15:10:25 +08:00
qihao.gong@jikimo.com
93a6b4ccb4 修改设备table布局 2023-10-16 17:23:04 +08:00
qihao.gong@jikimo.com
f02d1a0ace 修改设备table布局 2023-10-16 17:11:24 +08:00
qihao.gong@jikimo.com
1f090fdd20 修改设备table格式布局 2023-10-13 16:42:16 +08:00
qihao.gong@jikimo.com
01ad3e7d8c 修改机床注册接口 2023-10-13 14:26:38 +08:00
qihao.gong@jikimo.com
53e307cd55 修改设备table的样式 修改关联品牌根据各不同类别展示 2023-10-12 14:10:29 +08:00
qihao.gong@jikimo.com
ecb1f4140e Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_mrs_connect/models/res_config_setting.py
#	sf_mrs_connect/models/sync_common.py
 2023-10-11 14:56:18 +08:00
qihao.gong@jikimo.com
b1d2cd1ceb 设备类别参数根据不同类别必填 设备增加刀具库位table 并自动生成 2023-10-11 14:45:35 +08:00
jinling.yang
6b7b536236 1.优化同步cloud的静态资源库的定时器的代码 
2.新增能力特征库的接口
 2023-10-10 17:19:11 +08:00
qihao.gong@jikimo.com
af05d3ec30 设备增加AGV小车,机械臂,检测设备参数 2023-10-07 17:26:09 +08:00
qihao.gong@jikimo.com
960bea5bb0 设备新增参数 AGV小车table页 2023-09-28 16:20:03 +08:00
WEB许何哲\xuhez
d8363f2637 看板添加字段并调整样式 2023-09-22 17:33:56 +08:00
qihao.gong@jikimo.com
0de26c4f2f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug 
# Conflicts:
#	sf_maintenance/views/maintenance_views.xml
 2023-09-15 14:27:16 +08:00
qihao.gong@jikimo.com
d78fe872ae BT50 2023-09-15 14:26:04 +08:00
WEB许何哲\xuhez
e3e717ea60 设备清单看板优化 2023-09-15 11:15:40 +08:00
mgw
db5d9863b1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造-计划优化 
# Conflicts:
#	jikimo_frontend/static/src/scss/custom_style.scss
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-09-15 10:40:30 +08:00
mgw
2cc03c21ed 优化图文展示样式 2023-09-15 10:37:20 +08:00
jinling.yang
5fa9d1e16e 1.优化生成销售订单和产品的接口：bfm分配工厂时将“结算方式”和“支付方式”传到该接口内的生成报价订单方法里 
2.优化销售和报价查询及详情页面：新增“结算方式”和“支付方式”两个字段;销售的tree列表的“号码”显示改为“订单号”；报价的tree列表的“号码”显示改为“订单号”，创建时间改为“下单时间”
3.优化快速订单：tree列表去掉“表面工艺参数”字段，新增“创建人”和“创建时间”2个字段；详情页面新增“加工时长”字段
 2023-09-14 18:04:04 +08:00
qihao.gong@jikimo.com
e3b7d5ad02 设备图文展示 2023-09-13 15:39:27 +08:00
qihao.gong@jikimo.com
9e424600bc 处理机床能力数据 2023-09-13 14:32:32 +08:00