jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,838 Commits 134 Branches 31 Tags
bdac1e7460e13f915ed5b065f754e378c8b985f0
Commit Graph

145 Commits

Author SHA1 Message Date
yuxianghui
bdac1e7460 1、处理工单返工时就解除rfid绑定问题；2、同步bfm的订单状态到销售订单 2024-12-20 11:06:41 +08:00
liaodanlong
84ebce0786 智能工厂空模型处理 2024-11-25 11:40:01 +08:00
yuxianghui
211d74d9ff 处理 客供料入库单优化 需求 2024-11-06 17:24:10 +08:00
胡尧
61339da204 增加销售订单确认日志 2024-10-28 17:26:27 +08:00
胡尧
745fd429c2 增加销售订单确认日志 2024-10-28 17:21:51 +08:00
liaodanlong
378850682d 错误日志信息调整 2024-09-23 17:50:25 +08:00
liaodanlong
2808005ce9 错误处理 2024-09-12 15:17:09 +08:00
hujiaying
00809d88f6 修改打印日志 2024-09-05 09:53:32 +08:00
jinling.yang
6572ca25fe 优化提示 2024-08-29 17:30:16 +08:00
jinling.yang
6a7e6ee5c5 修复销售-表面工艺外协 2024-08-29 17:24:09 +08:00
liaodanlong
10a622b52d 错误处理 2024-08-27 16:34:27 +08:00
hujiaying
c646e70a66 Merge branch 'develop' into feature/update_process_start_time 2024-08-23 16:28:42 +08:00
jinling.yang
3c8dac799d 修复报废 2024-08-16 17:28:21 +08:00
hujiaying
5a60eed5b1 联调加工订单从待确认到加工中，经过的内部管理系统，bfm,sf接口测试联调，修改对应接收的参数值改变。采购订单加工中同步到内部管理系统失败，则新增到同步表，由同步表定时发起接口重试 2024-08-14 12:48:40 +08:00
jinling.yang
1547a6064f 优化表面工艺 2024-08-07 17:30:29 +08:00
jinling.yang
ed0d57c364 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/models/mrp_workorder.py
 2024-08-02 14:41:42 +08:00
mgw
754047bf02 同步修改引用位置 2024-07-30 11:08:27 +08:00
jinling.yang
36a2bcca6e 优化表面工yi 2024-07-26 15:49:25 +08:00
jinling.yang
19c4b99bae 创建制造订单后生成询价单 2024-07-25 17:21:44 +08:00
jinling.yang
2deaffb4eb 添加表面工艺产品校验 2024-07-25 14:07:36 +08:00
jinling.yang
96c22a5d46 添加表面工艺服务产品验证 2024-07-24 17:30:59 +08:00
jinling.yang
121861863f 优化销售订单确认方法 2024-07-24 16:57:50 +08:00
mgw
869e3e4b4f 修复”制造订单完工后对应的成品入库单还是等待状态-应该是就绪状态“ 2024-07-04 16:12:27 +08:00
mgw
d7d5ccc142 优化订单状态条件及物流的容错处理 2024-07-01 17:27:52 +08:00
mgw
ee1629b40a 优化物流提示 2024-07-01 11:47:51 +08:00
mgw
7fd3647afb sf物流优化 2024-06-26 16:34:04 +08:00
jinling.yang
88ef9c106d 修复编程单下发ftp路径 2024-06-25 17:54:08 +08:00
mgw
f67d08fc88 工件装夹预调工单页面优化需求-1 2024-06-24 15:00:54 +08:00
mgw
4459ed2e81 库存处增加批量调拨功能 2024-06-06 15:44:20 +08:00
mgw
fe6bb46d54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-05-17 11:47:44 +08:00
mgw
432a012596 显示优化，物流下单增补逻辑 2024-05-17 11:47:26 +08:00
jinling.yang
7e31869d1f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复 
# Conflicts:
#	sf_sale/views/sale_order_view.xml
 2024-05-17 11:00:58 +08:00
mgw
d244409d9c 处理物流处修改销售订单状态问题 2024-05-15 14:09:44 +08:00
jinling.yang
934b59d213 坯料新增路线 2024-05-14 10:51:38 +08:00
mgw
1afc48a20e 去掉销售订单加工状态 2024-05-11 23:36:18 +08:00
jinling.yang
2bffc5964a 1.1修复排程工件配送没有目的生产线2.注释获取cnc程序最新代码（第二期）3.优化部分页面 2024-05-11 00:17:43 +08:00
jinling.yang
d5a1a82c72 1.优化分配工厂时材料型号获取方式为采购和外协时未有供应商返回提示 
2.修复质量标准去掉审核按钮显示
 2024-03-15 16:59:51 +08:00
jinling.yang
0bc055b1a7 优化加工订单接口日志 2024-02-29 11:09:20 +08:00
mgw
391dedc7b1 产品加工进度反馈给销售订单 2024-02-27 15:47:16 +08:00
jinling.yang
7bf2316c09 优化接口和工单 2024-02-22 19:40:25 +08:00
jinling.yang
5916b4a740 修复日计划工单接口和http 2024-02-22 18:52:36 +08:00
jinling.yang
da97fce6d5 新增agv相关接口 2024-02-22 17:16:16 +08:00
jinling.yang
0d755a50ae 优化工单相关接口 2024-02-22 14:26:56 +08:00
jinling.yang
0354f6b136 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化快速订单 2024-02-21 14:52:36 +08:00
jinling.yang
1e006b0bd7 1.工单新增rfid字段 
2.修改中控对接的工单接口
3.快速订单材料，型号，客户修改为可选择
 2024-02-21 14:52:14 +08:00
mgw
72df0aa640 修复物流方式导致的分配工厂失败问题 2024-02-21 11:32:06 +08:00
mgw
635583826f 物流处bug修复 2024-02-19 17:23:57 +08:00
jinling.yang
1ca5817379 客户页面优化编辑 2024-02-04 14:22:53 +08:00
mgw
1af08763ea 调整视图显隐控制逻辑 2024-01-24 14:24:01 +08:00
mgw
5c129331e0 增加功能：当为非“自提”单时，必须进行物流下单才能进行出库操作。增加对字段的显隐控制 2024-01-23 16:13:53 +08:00