guanhuan
|
ccbe311c58
|
快速订单填写的零件图号和零件图纸传给制造订单
|
2024-09-13 10:45:08 +08:00 |
|
guanhuan
|
4c58f4d7f3
|
快速订单填写的零件图号和零件图纸传给制造订单
|
2024-09-13 10:22:14 +08:00 |
|
jinling.yang
|
09ee1c26b1
|
修复报废-外协入库验证
|
2024-09-02 17:33:06 +08:00 |
|
jinling.yang
|
821a7a63be
|
优化工单
|
2024-08-28 17:30:46 +08:00 |
|
jinling.yang
|
35c13dc51c
|
修复报废-坯料序列号
|
2024-08-27 16:12:48 +08:00 |
|
jinling.yang
|
b40a87df88
|
修复报废
|
2024-08-27 11:24:04 +08:00 |
|
jinling.yang
|
e662490cb5
|
修复报废
|
2024-08-26 17:31:14 +08:00 |
|
jinling.yang
|
7fee98cdee
|
修复报废
|
2024-08-23 16:13:03 +08:00 |
|
jinling.yang
|
6668e0ee2f
|
还原OCC代码
|
2024-08-21 14:43:22 +08:00 |
|
jinling.yang
|
3c8dac799d
|
修复报废
|
2024-08-16 17:28:21 +08:00 |
|
jinling.yang
|
e2d7576a5e
|
优化报废
|
2024-08-15 17:31:37 +08:00 |
|
jinling.yang
|
a9b7f99944
|
修复表面工艺外协
|
2024-08-09 15:39:58 +08:00 |
|
jinling.yang
|
34e858ffe4
|
添加表面工艺服务产品验证
|
2024-08-09 11:31:30 +08:00 |
|
jinling.yang
|
41efe81119
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化表面工艺外协
|
2024-08-09 10:43:34 +08:00 |
|
jinling.yang
|
7cab8cd287
|
调拨单新增表面工艺参数字段
|
2024-08-09 10:42:59 +08:00 |
|
jinling.yang
|
112efccb7c
|
修复表面工艺外协采购
|
2024-08-08 16:21:15 +08:00 |
|
jinling.yang
|
f58fb2ea13
|
Merge branch 'feature/优化表面工艺' into develop
|
2024-08-08 15:08:08 +08:00 |
|
jinling.yang
|
aaa19b96fd
|
还原注释代码
|
2024-08-08 14:57:55 +08:00 |
|
jinling.yang
|
1547a6064f
|
优化表面工艺
|
2024-08-07 17:30:29 +08:00 |
|
jinling.yang
|
5393ef686a
|
优化表面工艺
|
2024-08-05 17:28:48 +08:00 |
|
yuxianghui
|
070890e3b6
|
解决 SF，根据制造订单生成的采购单坯料入库时到原材料库BUG
|
2024-08-05 16:26:54 +08:00 |
|
jinling.yang
|
39214e5352
|
注释代码
|
2024-07-28 11:47:12 +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
|
f0fdeff699
|
修复cnc工单按钮显示问题
|
2024-07-24 11:40:16 +08:00 |
|
mgw
|
e02f792300
|
修改订单状态
|
2024-07-11 11:22:25 +08:00 |
|
mgw
|
ed4903b6f1
|
解除装夹处打印成品二维码
|
2024-07-09 10:18:13 +08:00 |
|
jinling.yang
|
4c66d86ee6
|
修复表面工艺
|
2024-07-01 10:47:05 +08:00 |
|
jinling.yang
|
404a41294c
|
修复表面工艺外协单状态
|
2024-06-30 19:16:48 +08:00 |
|
jinling.yang
|
e124560089
|
修复无外协单和程序单
|
2024-06-30 17:52:02 +08:00 |
|
jinling.yang
|
fd3a363bf6
|
修复无外协单和程序单
|
2024-06-30 16:51:40 +08:00 |
|
jinling.yang
|
4a648fbd7b
|
1,修复制造订单状态：第一张装夹工单未就绪是，状态需为：待加工;所有工单完成后,状态需为：完成;2.修复多个产品确认制造订单未生产多个编程单问题3.优化工单页面：去掉非必要的字段
|
2024-06-30 11:45:52 +08:00 |
|
mgw
|
c8de75ceae
|
修复隐藏项目
|
2024-06-28 09:51:31 +08:00 |
|
jinling.yang
|
dbd5c488f8
|
修复制造订单生成时没有采购单
|
2024-06-26 16:36:51 +08:00 |
|
jinling.yang
|
5f4ecf8ff9
|
修复生成制造订单
|
2024-06-24 14:46:02 +08:00 |
|
jinling.yang
|
733b554942
|
no message
|
2024-06-24 14:16:53 +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 |
|
jinling.yang
|
67b48814f6
|
优化制造订单和生成工单逻辑
|
2024-06-19 17:35:13 +08:00 |
|
jinling.yang
|
c035ab8156
|
注释OCC代码
|
2024-06-19 15:32:03 +08:00 |
|
yuxianghui
|
6dae144d76
|
1、功能刀具拆解单优化；2、完成 需求坯料序列号生成规则优化2；
|
2024-06-19 11:19:47 +08:00 |
|
jinling.yang
|
25dddb5b3b
|
优化制造订单：生成制造订单的同时不生成工单
|
2024-06-18 17:35:41 +08:00 |
|
yuxianghui
|
4497fb04c1
|
1、优化 托盘绑定工单逻辑优化 ；2 完成 整体式刀具批次/序列号生成的优化需求； 3、完成 坯料序列号生成规则优化需求1。
|
2024-06-18 17:19:41 +08:00 |
|
jinling.yang
|
7dea8c7c1e
|
去掉返工和报废的代码
|
2024-06-17 16:16:22 +08:00 |
|
马广威
|
4894576d25
|
Accept Merge Request #1072: (release/release_1.5 -> 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/1072
|
2024-06-14 16:21:38 +08:00 |
|
yuxianghui
|
469839f38e
|
1、处理二维码问题
|
2024-06-12 10:02:15 +08:00 |
|
yuxianghui
|
206fc7bb21
|
Merge branch 'hotfix/新增刀具按批次管理' into hotfix/新增刀具按批次管理_1.1
# Conflicts:
# sf_tool_management/controllers/controllers.py
|
2024-06-06 09:17:32 +08:00 |
|
杨金灵
|
1af160542c
|
Accept Merge Request #1061: (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/1061
|
2024-06-05 15:53:56 +08:00 |
|
jinling.yang
|
e9ab57854e
|
修改生成外协出入库单时，查询条件排序修改为根据create_date或id排序
|
2024-06-04 10:48:50 +08:00 |
|