jinling.yang
|
c0202330f8
|
去掉工单输出
|
2024-08-01 16:40:46 +08:00 |
|
yuxianghui
|
2fa47eae27
|
1
|
2024-07-31 15:06:55 +08:00 |
|
yuxianghui
|
cb2e1ecabe
|
1
|
2024-07-31 15:06:14 +08:00 |
|
yuxianghui
|
9f1233d20e
|
1
|
2024-07-31 15:04:37 +08:00 |
|
yuxianghui
|
db50253100
|
Merge branch 'feature/优化工单_6' into feature/优化工单状态
|
2024-07-31 15:00:48 +08:00 |
|
yuxianghui
|
5f7f905540
|
优化工单状态
|
2024-07-31 14:59:57 +08:00 |
|
jinling.yang
|
f361106c40
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化三次元检测报告
|
2024-07-31 11:51:16 +08:00 |
|
jinling.yang
|
a46cd0f515
|
优化三次元检测报告
|
2024-07-31 11:51:04 +08:00 |
|
yuxianghui
|
ffb775abb7
|
1、优化工单状态
|
2024-07-31 11:45:59 +08:00 |
|
jinling.yang
|
1980ee2a9a
|
优化三次元检测报告
|
2024-07-31 10:59:35 +08:00 |
|
jinling.yang
|
c01dfddfb4
|
修复返工-功能刀具
|
2024-07-30 17:45:41 +08:00 |
|
yuxianghui
|
a0ed14aed1
|
解决 制造订单提交返工-申请重新编程-第一张工单状态不对 bug
|
2024-07-30 09:21:08 +08:00 |
|
yuxianghui
|
639dd4e78d
|
1、处理大批量修改cnc编程单的工单状态时，导致工单状态的自动计算方法进行递归而产生的栈溢出问题
|
2024-07-29 11:32:33 +08:00 |
|
yuxianghui
|
55016918eb
|
1、添加工单状态自动计算方法的触发条件
|
2024-07-28 16:35:17 +08:00 |
|
yuxianghui
|
e84842d0a3
|
1、功能刀具状态备注值自动计算方法优化
|
2024-07-28 16:23:17 +08:00 |
|
yuxianghui
|
6643684e9b
|
Merge branch 'feature/优化工单_4' into feature/优化工单_5
|
2024-07-28 16:06:20 +08:00 |
|
yuxianghui
|
f77a1f6167
|
1、优化工单状态；2、添加功能刀具位置字段自动计算方法触发条件
|
2024-07-28 16:05:09 +08:00 |
|
jinling.yang
|
b1b805959a
|
修复多次返工报依赖问题
|
2024-07-28 15:20:12 +08:00 |
|
yuxianghui
|
66caeee1cd
|
1、优化工单状态方法
|
2024-07-26 16:25:16 +08:00 |
|
yuxianghui
|
de8bebc1f9
|
1、添加制造订单的刀具备注字段自动计算逻辑及方法；2、优化工单状态自动计算方法；
|
2024-07-26 10:57:11 +08:00 |
|
jinling.yang
|
258e24eb05
|
修复返工bug
|
2024-07-25 17:30:33 +08:00 |
|
jinling.yang
|
f9ace6da7c
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复工件配送目的生产线
|
2024-07-25 15:41:01 +08:00 |
|
jinling.yang
|
60b77e09d6
|
修复工件配送目的生产线
|
2024-07-25 15:40:44 +08:00 |
|
yuxianghui
|
6859458db2
|
Merge branch 'feature/修复工单cnc校验bug_2' into feature/修复工单cnc校验bug_3
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-07-25 15:29:39 +08:00 |
|
jinling.yang
|
9eddfe36d6
|
修复返工-工件配送
|
2024-07-25 15:22:48 +08:00 |
|
yuxianghui
|
9655281b67
|
1、解决 缺刀状态第一张工单状态不对 bug
|
2024-07-25 15:21:36 +08:00 |
|
jinling.yang
|
c9d4f0667a
|
修复中控对接接口
|
2024-07-25 10:27:07 +08:00 |
|
yuxianghui
|
001b2ead57
|
1、更具制造订单功能刀具状态变更第一个装夹预调工单的工单状态
|
2024-07-24 16:20:48 +08:00 |
|
yuxianghui
|
b88b0fc38a
|
Merge branch 'feature/修复工单cnc校验bug' into feature/修复工单cnc校验bug_1
# Conflicts:
# sf_tool_management/models/mrp_workorder.py
|
2024-07-24 12:35:31 +08:00 |
|
yuxianghui
|
4297d41dda
|
添加工单开始校验
|
2024-07-24 12:32:33 +08:00 |
|
jinling.yang
|
f0fdeff699
|
修复cnc工单按钮显示问题
|
2024-07-24 11:40:16 +08:00 |
|
jinling.yang
|
da8e543819
|
修复返工向导
|
2024-07-23 17:18:31 +08:00 |
|
jinling.yang
|
e3580d9ac8
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复返工(CNC加工)
|
2024-07-23 10:33:37 +08:00 |
|
jinling.yang
|
ded1789813
|
修复返工(CNC加工)
|
2024-07-23 10:33:22 +08:00 |
|
yuxianghui
|
7d1db793b1
|
Merge branch 'feature/NC程序和功能刀具校验' into feature/NC程序和功能刀具校验_1
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-07-23 09:06:57 +08:00 |
|
jinling.yang
|
83396f5434
|
修复返工(CNC加工)
|
2024-07-22 17:32:31 +08:00 |
|
jinling.yang
|
251e289fd1
|
修复返工多面
|
2024-07-22 15:08:14 +08:00 |
|
yuxianghui
|
f3a7dcc6a4
|
Merge branch 'feature/无效刀返工' into feature/NC程序和功能刀具校验
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-07-22 11:36:29 +08:00 |
|
jinling.yang
|
28843b0733
|
修复返工bug
|
2024-07-22 10:57:43 +08:00 |
|
jinling.yang
|
8a0c968b10
|
修复返工bug
|
2024-07-19 17:25:51 +08:00 |
|
jinling.yang
|
33bf88968c
|
修复返工bug
|
2024-07-18 16:17:19 +08:00 |
|
jinling.yang
|
7163e025d2
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化最新版报废
# Conflicts:
# sf_manufacturing/security/ir.model.access.csv
|
2024-07-17 19:32:21 +08:00 |
|
jinling.yang
|
77f7602b23
|
修复多面返工工单状态变更错误
|
2024-07-17 19:03:07 +08:00 |
|
yuxianghui
|
70b8521b90
|
Merge branch 'feature/销售订单、工单优化' into feature/无效刀返工
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/models/mrp_workorder.py
|
2024-07-17 16:57:11 +08:00 |
|
jinling.yang
|
974671ee07
|
修复解除装夹
|
2024-07-17 15:33:49 +08:00 |
|
jinling.yang
|
8726f8cac3
|
添加报废向导；添加重新生成制造订单
|
2024-07-17 15:20:31 +08:00 |
|
jinling.yang
|
c536dde2cc
|
去掉注释代码
|
2024-07-16 17:24:15 +08:00 |
|
yuxianghui
|
3eca74518a
|
Merge branch 'feature/CNC功能刀具用刀校验' into feature/销售订单、工单优化
|
2024-07-16 10:41:56 +08:00 |
|
yuxianghui
|
37977be862
|
1、工单解绑时添加二次校验是否解绑成功；2、销售订单创建接口添加详情信息‘备注’字段；
|
2024-07-16 10:40:18 +08:00 |
|
jinling.yang
|
a0bd214118
|
修复返工操作时工单状态及制造订单更新程序
|
2024-07-15 17:34:18 +08:00 |
|