杨金灵
|
306d5074f2
|
Accept Merge Request #1563: (feature/修复报废调拨 -> develop)
Merge Request: 修复制造订单生成采购
Created By: @杨金灵
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1563
|
2024-11-28 10:03:05 +08:00 |
|
jinling.yang
|
c22b91f9d9
|
优化采购：一个制造订单对应一个采购单
|
2024-11-28 09:59:01 +08:00 |
|
胡尧
|
0af7ef905d
|
Accept Merge Request #1562: (feature/sale_order_route_pick -> develop)
Merge Request: 解决工单完成的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1562?initial=true
|
2024-11-27 17:40:58 +08:00 |
|
胡尧
|
c169c0a80b
|
解决工单完成的问题
|
2024-11-27 17:40:35 +08:00 |
|
liaodanlong
|
acb24d69e3
|
排程 采购单条件判断
|
2024-11-27 14:42:41 +08:00 |
|
胡尧
|
3a7fb81276
|
Accept Merge Request #1556: (feature/sale_order_route_pick -> develop)
Merge Request: 解决工单开始结束的问题
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1556?initial=true
|
2024-11-27 09:54:04 +08:00 |
|
胡尧
|
12224fc892
|
解决工单开始结束的问题
|
2024-11-27 09:53:17 +08:00 |
|
胡尧
|
64fdedf726
|
修改工单开始
|
2024-11-27 08:37:12 +08:00 |
|
jinling.yang
|
ea914be4c7
|
修复采购链接
|
2024-11-26 16:21:17 +08:00 |
|
jinling.yang
|
43ee2d1836
|
回滚代码
|
2024-11-26 16:08:30 +08:00 |
|
jinling.yang
|
34353e3614
|
修复表面工艺
|
2024-11-26 16:05:23 +08:00 |
|
jinling.yang
|
b5beaad7bf
|
修复表面工艺
|
2024-11-26 15:37:19 +08:00 |
|
jinling.yang
|
321125adf6
|
还原代码
|
2024-11-25 16:18:41 +08:00 |
|
jinling.yang
|
5c0db45223
|
修复工单开始
|
2024-11-25 16:03:40 +08:00 |
|
jinling.yang
|
cb29baa698
|
还原代码
|
2024-11-25 14:31:02 +08:00 |
|
yuxianghui
|
7f5f65f07f
|
Merge branch 'feature/客供料入库单优化' into feature/采购优化
|
2024-11-25 09:17:40 +08:00 |
|
yuxianghui
|
3f276f4177
|
1、优化返工按钮；2、优化工单状态；
|
2024-11-22 17:57:18 +08:00 |
|
jinling.yang
|
33b9c48e87
|
优化制造订单报废
|
2024-11-22 17:51:40 +08:00 |
|
jinling.yang
|
0b931f8255
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单添加工艺设计id字段
|
2024-11-21 17:41:07 +08:00 |
|
jinling.yang
|
ed6d28cc21
|
工单添加工艺设计id字段
|
2024-11-21 17:40:04 +08:00 |
|
yuxianghui
|
c6e62f65b6
|
Merge remote-tracking branch 'origin/feature/返工优化' into feature/返工优化_1
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-11-21 17:26:49 +08:00 |
|
jinling.yang
|
c0d520a47f
|
Merge branch 'feature/优化外协采购和出入库单（工艺退回调整）' into develop
|
2024-11-21 17:23:57 +08:00 |
|
杨金灵
|
de11c57800
|
Accept Merge Request #1533: (feature/优化外协采购和出入库单（工艺退回调整） -> develop)
Merge Request: 优化外协采购和出入库单（工艺退回调整）
Created By: @杨金灵
Reviewed By: @胡尧
Approved By: @胡尧
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1533
|
2024-11-21 17:23:18 +08:00 |
|
jinling.yang
|
d4ff4be32e
|
还原注释代码
|
2024-11-21 17:19:41 +08:00 |
|
jinling.yang
|
310d8b33df
|
优化制造订单报废
|
2024-11-21 17:12:50 +08:00 |
|
yuxianghui
|
fff22a74b1
|
工单状态优化
|
2024-11-21 17:02:32 +08:00 |
|
mgw
|
1d53f47488
|
线切割、人工线下加工生成工单异常处理
|
2024-11-21 15:36:16 +08:00 |
|
jinling.yang
|
60cc49238c
|
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-21 11:46:54 +08:00 |
|
jinling.yang
|
b415278997
|
优化坯料的制造订单
|
2024-11-21 11:45:48 +08:00 |
|
yuxianghui
|
1d66c1dbea
|
工单状态优化
|
2024-11-21 11:25:00 +08:00 |
|
jinling.yang
|
085d26669f
|
Merge branch 'feature/返工优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-21 10:44:51 +08:00 |
|
yuxianghui
|
ded0d06f86
|
工单状态方法优化
|
2024-11-21 10:43:22 +08:00 |
|
jinling.yang
|
fe4346b802
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化外协采购和出入库单（工艺退回调整）
|
2024-11-20 16:08:54 +08:00 |
|
jinling.yang
|
23da273af1
|
修复bug和优化制造订单报废
|
2024-11-20 16:08:27 +08:00 |
|
liaodanlong
|
c5ac62060d
|
Merge branch 'refs/heads/develop' into feature/delivery_status
# Conflicts:
# sf_manufacturing/models/mrp_production.py
|
2024-11-20 15:23:07 +08:00 |
|
liaodanlong
|
e8d07abe05
|
人工线下加工工单的计划时间计算优化需求
|
2024-11-19 14:18:44 +08:00 |
|
jinling.yang
|
c73706555f
|
优化外协采购和出入库单（工艺退回调整）
|
2024-11-18 17:40:41 +08:00 |
|
jinling.yang
|
a2855f1f08
|
还原代码
|
2024-11-18 11:40:24 +08:00 |
|
jinling.yang
|
a8e9fe40ac
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工艺退回调整
# Conflicts:
# sf_manufacturing/models/mrp_production.py
# sf_manufacturing/views/mrp_production_addional_change.xml
|
2024-11-15 18:08:31 +08:00 |
|
jinling.yang
|
8add4b5ad1
|
优化制造订单
|
2024-11-15 17:31:28 +08:00 |
|
liaodanlong
|
811a79c7c1
|
交期状态修改
|
2024-11-15 10:33:47 +08:00 |
|
jinling.yang
|
018d51e25f
|
批量处理工艺调整
|
2024-11-14 18:02:24 +08:00 |
|
jinling.yang
|
33a1837274
|
优化工单
|
2024-11-13 17:59:47 +08:00 |
|
liaodanlong
|
9a9bfd198b
|
交期状态
|
2024-11-13 14:46:58 +08:00 |
|
liaodanlong
|
e38407c0a5
|
交期状态开发
|
2024-11-13 10:37:19 +08:00 |
|
jinling.yang
|
ff072a32bb
|
添加退回调整
|
2024-11-12 17:53:17 +08:00 |
|
jinling.yang
|
8bbc65ef88
|
新增退回调整
|
2024-11-12 11:43:40 +08:00 |
|
jinling.yang
|
359fd40ed3
|
添加工艺退回调整
|
2024-11-11 17:55:05 +08:00 |
|
jinling.yang
|
e7b18233f0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作
|
2024-11-11 14:51:11 +08:00 |
|
jinling.yang
|
38c4aba45c
|
根据工序生成工单
|
2024-11-08 18:01:23 +08:00 |
|