gqh
|
e0ce0fcfa3
|
回滚
|
2023-01-29 15:48:50 +08:00 |
|
gqh
|
9125eedf5a
|
回滚
|
2023-01-29 15:48:12 +08:00 |
|
gqh
|
e6883a1f92
|
回滚
|
2023-01-29 15:47:46 +08:00 |
|
gqh
|
16623b3292
|
回滚
|
2023-01-29 15:47:18 +08:00 |
|
gqh
|
878e28791c
|
回滚
|
2023-01-29 15:46:58 +08:00 |
|
gqh
|
e319b282fc
|
回滚
|
2023-01-29 15:46:14 +08:00 |
|
gqh
|
bdae9d9f95
|
恢复代码
|
2023-01-29 15:42:33 +08:00 |
|
gqh
|
cfde389826
|
工单操作page默认在前面
|
2023-01-29 09:43:03 +08:00 |
|
mgw
|
0a248d577a
|
优化代码-设置按钮权限等
|
2023-01-29 09:26:19 +08:00 |
|
gqh
|
9c473e6f32
|
优化sf
|
2023-01-23 20:21:00 +08:00 |
|
jinling.yang
|
270b8d3cc1
|
修复工作中心绑定机床和胚料外协供应商外包未勾选问题
|
2023-01-13 16:47:12 +08:00 |
|
jinling.yang
|
5492d4f2fa
|
修复工作中心绑定机床和胚料外协供应商是否外包未勾选bug修复
|
2023-01-13 16:43:30 +08:00 |
|
gqh
|
c212810d60
|
合并
|
2023-01-12 14:16:05 +08:00 |
|
jinling.yang
|
f5cfd50d33
|
cnc按钮展示问题，加工进度字段去掉注释
|
2023-01-11 16:32:48 +08:00 |
|
jinling.yang
|
6d48618253
|
优化接口
|
2023-01-11 16:23:19 +08:00 |
|
jinling.yang
|
39136bb137
|
新增依赖
|
2023-01-11 15:25:49 +08:00 |
|
jinling.yang
|
6374388d7b
|
附件新增字段
|
2023-01-11 15:11:44 +08:00 |
|
gqh
|
381d6ca9a5
|
更新mrs_connect
|
2023-01-11 15:04:37 +08:00 |
|
gqh
|
8e51654f17
|
合并sf代码
|
2023-01-11 14:51:59 +08:00 |
|
gqh
|
aba5a076b1
|
合并
|
2023-01-11 14:08:12 +08:00 |
|
gqh
|
eb162cb416
|
合并工单优化
|
2023-01-11 11:13:52 +08:00 |
|
jinling.yang
|
01cf30b03f
|
优化涉及到的接口
|
2023-01-11 11:05:06 +08:00 |
|
jinling.yang
|
d66687297d
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2023-01-10 09:27:14 +08:00 |
|
gqh
|
311c7c723a
|
sf1.0
|
2023-01-09 23:04:53 +08:00 |
|
jinling.yang
|
0de2222009
|
cnc程序获取优化
|
2023-01-09 21:20:51 +08:00 |
|
gqh
|
d0497aa043
|
工单优化
|
2023-01-09 20:40:27 +08:00 |
|
jinling.yang
|
1dcc15802a
|
Merge branch 'feature/优化sf' into develop
|
2023-01-09 20:35:21 +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 |
|
马广威
|
3d882f5492
|
Accept Merge Request #76: (feature/轨迹跟踪 -> develop)
Merge Request: 物流前轨迹跟踪代码合并
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/76
|
2023-01-09 14:42:37 +08:00 |
|
mgw
|
d088bc1c86
|
优化扫码部分
|
2023-01-08 16:51:24 +08:00 |
|
mgw
|
7c4baa4d91
|
加工中代码测试完成
|
2023-01-07 01:12:25 +08:00 |
|
mgw
|
0dbd941ed0
|
加工中轨迹跟踪代码
|
2023-01-06 16:47:40 +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 |
|
马广威
|
fd0d65867e
|
Accept Merge Request #63: (feature/三元补偿值写入下张工单 -> develop)
Merge Request: 合并三元补偿值写入
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/63
|
2023-01-03 15:12:29 +08:00 |
|
mgw
|
be90cd933b
|
删除接口调用
|
2023-01-03 15:05:09 +08:00 |
|
mgw
|
a5f79ea97d
|
重写工单完成方法，添加接口调用
|
2023-01-03 11:08:39 +08:00 |
|
杨金灵
|
c023a13e3a
|
Accept Merge Request #60: (feature/胚料问题修复 -> develop)
Merge Request: 新增occ模块及部分bug修复
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/60
|
2022-12-30 11:15:25 +08:00 |
|
jinling.yang
|
a3e39d4fac
|
产品和制造订单新增模型和occ查看模型模块
|
2022-12-30 10:00:17 +08:00 |
|
mgw
|
ac383797e0
|
将三元补偿值写入CNC加工工单
|
2022-12-28 16:44:24 +08:00 |
|
jinling.yang
|
5fcb17d048
|
胚料bug修复，销售订单明细行路线修复，编程单下发优化
|
2022-12-27 17:28:47 +08:00 |
|
jinling.yang
|
c6b9953e40
|
Merge branch 'feature/odoo16的代码修改' into develop
|
2022-12-26 10:26:01 +08:00 |
|
jinling.yang
|
a4be58098e
|
创建胚料的bug修复
|
2022-12-26 10:25:16 +08:00 |
|
jinling.yang
|
dd5c387585
|
解决代码冲突
|
2022-12-12 16:59:42 +08:00 |
|
jinling.yang
|
0b0f5c82ed
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
# sf_dlm/data/product_data.xml
|
2022-12-12 16:56:04 +08:00 |
|
jinling.yang
|
70b7aa4c0f
|
工单修改
|
2022-12-12 16:52:58 +08:00 |
|
gqh
|
257ed593c9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
# Conflicts:
# sf_dlm/data/product_data.xml
# sf_dlm/models/product_template.py
# sf_manufacturing/models/mrp_workorder.py
# sf_mrs_connect/controllers/controllers.py
|
2022-12-12 14:52:48 +08:00 |
|
gqh
|
e0a0b3d411
|
优化odoo16工单视图展示问题
|
2022-12-12 14:46:54 +08:00 |
|
杨金灵
|
aa25e5b931
|
Accept Merge Request #46: (feature/修改胚料部分 -> develop)
Merge Request: 修改胚料部分
Created By: @杨金灵
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/46
|
2022-12-12 10:11:28 +08:00 |
|