liaodanlong
|
701decb38f
|
表面工艺采购单确认订单进行限制
|
2024-12-31 17:08:38 +08:00 |
|
yuxianghui
|
b35f842915
|
调整托盘解绑修改顺序
|
2024-12-30 09:57:36 +08:00 |
|
yuxianghui
|
676f8eb7eb
|
添加点击工单的解绑托盘按钮时，修改对应托盘状态为空闲
|
2024-12-30 09:52:32 +08:00 |
|
yuxianghui
|
0e7e7af85a
|
1、优化销售订单状态；2、优化夹具物料查询的托盘可用状态；3、优化工单开始按键；4、优化采购订单的采购类型，根据销售订单的供货方式和工艺确认时是否外协自动选择对应采购类型；
|
2024-12-23 13:46:30 +08:00 |
|
yuxianghui
|
bdac1e7460
|
1、处理工单返工时就解除rfid绑定问题；2、同步bfm的订单状态到销售订单
|
2024-12-20 11:06:41 +08:00 |
|
yuxianghui
|
9cb1cff671
|
Merge branch 'feature/销售、制造、返工优化' into feature/制造、工单优化
|
2024-12-19 17:21:04 +08:00 |
|
yuxianghui
|
03dbeaf988
|
1、隐藏返工状态工单的开始按钮；2、优化工单状态方法；3、优化制造订单状态
|
2024-12-19 17:14:48 +08:00 |
|
胡尧
|
23afbc14c9
|
增加agv配送重新下发与取消
|
2024-12-19 17:00:40 +08:00 |
|
yuxianghui
|
1c4a6ca85e
|
开放返工入口
|
2024-12-09 16:07:34 +08:00 |
|
胡尧
|
e3db40ae25
|
Accept Merge Request #1603: (feature/sale_order_route_pick -> develop)
Merge Request: 解决删除表面工艺，多增加了采购单的bug
Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1603
|
2024-12-05 15:09:49 +08:00 |
|
胡尧
|
52ab962ace
|
解决删除表面工艺，多增加了采购单的bug
|
2024-12-05 15:09:04 +08:00 |
|
胡尧
|
05247ee8d9
|
Accept Merge Request #1602: (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/1602?initial=true
|
2024-12-05 13:42:33 +08:00 |
|
胡尧
|
dbf75684ee
|
特殊表面工艺工单没有完成对应采购单时工单处于等待组件
|
2024-12-05 13:42:07 +08:00 |
|
mgw
|
731e6abc90
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
# Conflicts:
# sf_manufacturing/models/mrp_workorder.py
|
2024-12-05 11:48:07 +08:00 |
|
mgw
|
58b33b6c8d
|
制造订单退回调整-删除表面工艺后对应的外协出入库单没有变成取消状态
|
2024-12-05 11:05:43 +08:00 |
|
胡尧
|
e011e4cfd6
|
解决表面工艺工单完成后，生产入库单未就绪的问题
|
2024-12-05 09:31:06 +08:00 |
|
胡尧
|
ef1f7b1d08
|
解决冲突
|
2024-12-05 08:36:48 +08:00 |
|
胡尧
|
5f12976d8f
|
修改表面工艺外协工单流程
|
2024-12-05 01:33:46 +08:00 |
|
胡尧
|
ef60f36c90
|
修改工艺外协工单
|
2024-12-04 20:42:34 +08:00 |
|
liaodanlong
|
aa32fdcd07
|
坯料长宽高修改
|
2024-12-04 16:41:42 +08:00 |
|
liaodanlong
|
dc5c0b1d1e
|
Merge branch 'refs/heads/develop' into feature/manufactur_order
|
2024-12-04 10:46:38 +08:00 |
|
liaodanlong
|
9a1cde6abc
|
表面工艺采购单与调拨单拆分
|
2024-12-04 10:45:46 +08:00 |
|
guanhuan
|
d6afd556d3
|
询价单查询
|
2024-12-03 15:59:10 +08:00 |
|
yuxianghui
|
7025bde56e
|
隐藏手动返工报废入口
|
2024-12-02 13:46:20 +08:00 |
|
jinling.yang
|
9955157dd3
|
还原代码
|
2024-11-29 10:07:17 +08:00 |
|
jinling.yang
|
805eabd07e
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复外协出入库单
|
2024-11-28 16:01:11 +08:00 |
|
jinling.yang
|
c42c053d66
|
修复表面工艺外协及工艺设计
|
2024-11-28 15:59:17 +08:00 |
|
yuxianghui
|
d741d6ccf5
|
Merge branch 'feature/制造订单状态优化' into feature/工单状态优化_2
|
2024-11-28 15:09:51 +08:00 |
|
yuxianghui
|
8ff73d5647
|
工单状态优化
|
2024-11-28 15:09:11 +08:00 |
|
jinling.yang
|
9bf57005f0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复制造订单-采购单
|
2024-11-28 10:41:13 +08:00 |
|
jinling.yang
|
a80d498eab
|
修复制造订单-采购单
|
2024-11-28 10:40:48 +08:00 |
|
胡尧
|
4847596072
|
Accept Merge Request #1565: (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/1565?initial=true
|
2024-11-28 10:18:35 +08:00 |
|
胡尧
|
d4ba58b55a
|
修改排程单的问题
|
2024-11-28 10:17:03 +08:00 |
|
杨金灵
|
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 |
|