jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,272 Commits 134 Branches 31 Tags
373ce89a2c79b44b5e972fc162131b94d8400eff
Commit Graph

33 Commits

Author SHA1 Message Date
mgw
b071b14bbd 优化展示效果 2024-07-05 11:36:48 +08:00
mgw
fd225fa0e1 工作中心的参数修改需增加sns模块("记录备注") 2024-07-05 11:26:02 +08:00
qihao.gong@jikimo.com
c81dc99aef 修改获取CNC程序从工单到制造订单 2024-01-05 11:23:27 +08:00
qihao.gong@jikimo.com
b73a449b01 修改代码不规范问题 2023-11-23 17:37:06 +08:00
jinling.yang
6ec6094c5e 1.新增销售和计划权限组2.优化代码格式 2023-11-21 16:10:05 +08:00
qihao.gong@jikimo.com
6b375ee64d 修改故障日志bug 2023-09-27 14:30:38 +08:00
qihao.gong@jikimo.com
22a4ccad6b 修改维保生成编码和名称的规则 2023-09-26 17:29:14 +08:00
qihao.gong@jikimo.com
9e424600bc 处理机床能力数据 2023-09-13 14:32:32 +08:00
yuxianghui
39feda07e5 自建模块日志警告信息处理 2023-08-28 17:31:41 +08:00
qihao.gong@jikimo.com
3b3847990d 工作重心看板展示设备状态以及图片，设备看板增加负责人 2023-08-24 14:51:03 +08:00
WEB许何哲\xuhez
5a28ec7579 工作中心看板视图标签页的动态添加并实现点击筛选 2023-08-07 14:48:55 +08:00
mgw
c0d14daf44 修复工作中心计划报错的问题，修改制造模块目录结构 2023-07-17 15:37:23 +08:00
qihao.gong@jikimo.com
8f795096c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/订单计划 
# Conflicts:
#	sf_maintenance/__manifest__.py
#	sf_manufacturing/views/mrp_workcenter_views.xml
 2023-07-14 09:02:48 +08:00
qihao.gong@jikimo.com
78fd5a7ac3 修改工作中心与设备关联关系 2023-07-10 10:03:02 +08:00
jinling.yang
a0570cb999 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹 2023-07-07 17:38:04 +08:00
jinling.yang
a008dbb76a 1.sf的工作中心新增表面工艺字段，工序类型新增表面工艺类型，且当工序类型为表面工艺时，则显示表面工艺，其他则不显示 
2.sf的工作中心新增工艺外协字段，该字段若被勾选则为表面工艺的外协加工中心
3.sf的销售订单上点击生成制造订单时在已有的成品工序后累加表面工艺工序，表面工艺的工序生成规则需根据表面工艺所对应的类别的排序来依次生成，并且工序里的工作中心的匹配规则需根据表面工艺的可选参数里的获取方式字段的值来匹配
 2023-03-30 17:52:05 +08:00
jinling.yang
e8d923df03 bfm分配工厂: 
1.销售页面：客户的值为业务平台，
2.没有原材料，事务回滚
3.去掉注释和没用到的代码
 2023-02-01 18:27:29 +08:00
gqh
bdae9d9f95 恢复代码 2023-01-29 15:42:33 +08:00
gqh
9c473e6f32 优化sf 2023-01-23 20:21:00 +08:00
jinling.yang
5492d4f2fa 修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复 2023-01-13 16:43:30 +08:00
gqh
eb162cb416 合并工单优化 2023-01-11 11:13:52 +08:00
jinling.yang
01cf30b03f 优化涉及到的接口 2023-01-11 11:05:06 +08:00
gqh
311c7c723a sf1.0 2023-01-09 23:04:53 +08:00
gqh
d0497aa043 工单优化 2023-01-09 20:40:27 +08:00
jinling.yang
c3e5610b17 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化sf 
# Conflicts:
#	sf_manufacturing/models/__init__.py
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/views/mrp_workorder_view.xml
 2023-01-09 20:33:53 +08:00
jinling.yang
b7723f82d0 优化sf获取cnc程序和ftp 2023-01-09 19:54:02 +08:00
gqh
b53fddeec5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_manufacturing/models/mrp_workcenter.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_manufacturing/views/mrp_workorder_view.xml
 2023-01-04 10:35:38 +08:00
gqh
08efe7813d sf工单优化及权限 2023-01-04 10:13:29 +08:00
jinling.yang
5fcb17d048 胚料bug修复，销售订单明细行路线修复，编程单下发优化 2022-12-27 17:28:47 +08:00
jinling.yang
11a360222e cnc获取 2022-11-22 21:18:15 +08:00
jinling.yang
6b9fe9167e 代码终版 2022-11-22 13:18:18 +08:00
jinling.yang
3cbd1140bb mrs为名的更改为sf 2022-11-22 10:20:18 +08:00
jinling.yang
c3fdaf8d76 更改制造模块名 2022-11-22 09:41:52 +08:00