jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,046 Commits 134 Branches 31 Tags
5ca555c5209b93c0d6881c8cef0be3594820d93b
Commit Graph

298 Commits

Author SHA1 Message Date
jinling.yang
487f6c2054 修复多面加工产线状态 2024-07-03 09:55:47 +08:00
jinling.yang
9c4c2b85dd 修复制造订单数量 2024-07-01 20:08:46 +08:00
jinling.yang
e9c9b77112 修复所有工单完成报库存问题 2024-07-01 18:27:59 +08:00
jinling.yang
46e3a23492 优化解绑rfid 2024-07-01 17:11:34 +08:00
jinling.yang
2591e627f0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺 2024-07-01 10:47:33 +08:00
jinling.yang
4c66d86ee6 修复表面工艺 2024-07-01 10:47:05 +08:00
yuxianghui
4c845ee9fd Merge branch 'feature/工单优化-1' into feature/工单优化-2 2024-07-01 09:53:11 +08:00
yuxianghui
726c3aede1 1、优化工单扫描绑定托盘的提示信息 2024-07-01 09:52:16 +08:00
jinling.yang
404a41294c 修复表面工艺外协单状态 2024-06-30 19:16:48 +08:00
杨金灵
998daaa7f7 Accept Merge Request #1115: (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/1115?initial=true
 2024-06-30 12:45:54 +08:00
jinling.yang
4a648fbd7b 1,修复制造订单状态：第一张装夹工单未就绪是，状态需为：待加工;所有工单完成后,状态需为：完成;2.修复多个产品确认制造订单未生产多个编程单问题3.优化工单页面：去掉非必要的字段 2024-06-30 11:45:52 +08:00
mgw
172e420939 增加分组内排序 2024-06-28 16:00:50 +08:00
mgw
c8de75ceae 修复隐藏项目 2024-06-28 09:51:31 +08:00
jinling.yang
88ef9c106d 修复编程单下发ftp路径 2024-06-25 17:54:08 +08:00
jinling.yang
0af6d7f4cd 优化重新下发程序:装夹预调，cnc加工工单展示 2024-06-24 16:48:58 +08:00
jinling.yang
16a00bdb10 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单(cnc和cmc)涉及多个加工面 2024-06-24 10:53:53 +08:00
jinling.yang
612906e01d 修改根据多面生成工单逻辑 2024-06-21 16:00:04 +08:00
禹翔辉
c6a509c6f4 Accept Merge Request #1085: (release/release1.7 -> 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/1085
 2024-06-20 09:31:50 +08:00
yuxianghui
60560fe195 1、优化工单解绑Rfid 2024-06-19 17:40:49 +08:00
jinling.yang
67b48814f6 优化制造订单和生成工单逻辑 2024-06-19 17:35:13 +08:00
yuxianghui
4497fb04c1 1、优化 托盘绑定工单逻辑优化 ；2 完成 整体式刀具批次/序列号生成的优化需求； 3、完成 坯料序列号生成规则优化需求1。 2024-06-18 17:19:41 +08:00
jinling.yang
47305a2e61 添加'是否重新下发NC程序'字段 2024-06-18 17:17:09 +08:00
jinling.yang
3793d0a174 优化装夹预调工单 2024-06-18 11:35:50 +08:00
jinling.yang
7dea8c7c1e 去掉返工和报废的代码 2024-06-17 16:16:22 +08:00
jinling.yang
2862c5a888 去掉客户部分字段必填校验和返工报废代码 2024-06-17 09:52:18 +08:00
jinling.yang
adafce85bd 1.工单,工件配送新增sns及给部分字段添加tracking(跟踪)及优化页面 
2.优化agv：部分字段不可编辑
 2024-06-11 16:56:20 +08:00
jinling.yang
7be5b53767 工件配送添加sns 2024-06-07 17:29:49 +08:00
杨金灵
0b2b162d85 Merge branch refs/heads/develop into refs/heads/hotfix/优化多次编程单下发 2024-06-06 09:29:39 +08:00
jinling.yang
17e2a3ffc3 cnc程序的程序单更新 2024-06-05 16:26:34 +08:00
jinling.yang
8bd5841d7a 去掉重写state方法 2024-06-04 15:59:35 +08:00
jinling.yang
2ab9f37062 1.修复工件配送2.优化运送空料架.3.cloud下发编程单至sf时，将程序单pdf同步至制造订单的装夹预调工单的加工图纸上4.修复工件上下产线接口 2024-06-03 16:59:14 +08:00
jinling.yang
711e0d1437 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程 2024-06-03 16:09:08 +08:00
jinling.yang
ea6de0c248 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造订单报废流程 
# Conflicts:
#	sf_manufacturing/models/mrp_production.py
 2024-06-03 15:43:57 +08:00
jinling.yang
a673630fd3 1.优化工件配送超时提示2.优化工件上下线接口3.优化编程单下发至cnc工单时，将程序单pdf文件也传给装夹预调工单的加工图纸字段上 2024-06-03 15:36:19 +08:00
jinling.yang
d883a7ff22 新增名称校验 2024-05-30 11:01:29 +08:00
jinling.yang
17678c53c9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/空料架名称去重校验 2024-05-29 17:56:55 +08:00
jinling.yang
c437c185a4 空料架名称去重校验 2024-05-29 17:56:22 +08:00
jinling.yang
65d2593db9 配送空料架开放新建 2024-05-29 15:03:08 +08:00
jinling.yang
d2babec1aa Merge tag '修复编程单下发接口' into develop 2024-05-29 12:50:05 +08:00
jinling.yang
decfd27401 1.修复cnc工单没有程序文件路径 
2.修复编程单已下发，在工件配送时，提示未下发nc程序
 2024-05-29 12:41:55 +08:00
jinling.yang
a1d8b88db2 修复工单排序 2024-05-29 10:25:23 +08:00
jinling.yang
fe88a416a7 制造订单合并一张编程单下发时，工件配送记录的未下发nc程序为未下发及cnc程序没有对应ftp文件路径问题 2024-05-28 17:57:27 +08:00
jinling.yang
412bf4b9be 优化返工和报废 2024-05-24 17:00:44 +08:00
jinling.yang
5f42b5d056 优化制造订单报废流程，返工流程暂停（需求需重新设计） 2024-05-23 11:46:09 +08:00
jinling.yang
ff12a86406 优化cnc工单返工：在原有的cnc工单后新增返工标志的cnc工单，且工序累加，状态为就绪，解除装夹工单的状态为等待其他工单 2024-05-22 17:35:57 +08:00
马广威
6d503968a5 Accept Merge Request #1033: (feature/制造代码优化 -> develop) 
Merge Request: 修复value bug

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1033?initial=true
 2024-05-18 20:03:02 +08:00
mgw
cc7963cb5a 修复value bug 2024-05-18 20:02:32 +08:00
马广威
e2fdfbf1ee Accept Merge Request #1032: (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/1032#mr-1032-review-151369
 2024-05-18 19:54:48 +08:00
jinling.yang
f9cca591bb 修复表面工艺工单完成时对应库存(stock.move)的状态为完成并跳过标记完成方法的检查 2024-05-18 19:52:58 +08:00
mgw
6f3d423da1 cnc工单和解除装夹工单隐藏【工序状态】字段，装夹预调工单已完成后【工序状态】字段显示“装夹预调完成” 2024-05-18 19:52:27 +08:00