yuxianghui
|
c223869bbd
|
Merge branch 'feature/销售视图优化' into feature/库存优化
|
2025-02-12 11:30:27 +08:00 |
|
mgw
|
523cc4ac5e
|
增加人工线下加工工单的查找
|
2025-02-10 11:29:37 +08:00 |
|
mgw
|
9695997542
|
人工线下加工编程方式设置
|
2025-02-10 10:58:01 +08:00 |
|
mgw
|
ffde591b3c
|
人工线下加工默认加工面ZM
|
2025-02-10 09:12:58 +08:00 |
|
yuxianghui
|
bc4806b303
|
1、销售订单详情界面列表优化；2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求
|
2025-02-08 16:47:06 +08:00 |
|
mgw
|
976d75973d
|
调整程序写入逻辑
|
2025-02-08 16:00:07 +08:00 |
|
mgw
|
aff81f0b3a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-08 13:32:59 +08:00 |
|
胡尧
|
d852cf54df
|
修复bug
|
2025-02-07 10:49:17 +08:00 |
|
mgw
|
978e427734
|
调整制造订单集合
|
2025-02-05 17:44:32 +08:00 |
|
mgw
|
dd35a6ae5f
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-05 17:42:10 +08:00 |
|
mgw
|
0a8cc050b8
|
人工线下加工工单也需要走cloud编程流程的优化需求
|
2025-02-05 17:41:52 +08:00 |
|
guanhuan
|
5636681ee6
|
CNC工单返工
|
2025-01-23 16:42:16 +08:00 |
|
guanhuan
|
9b49edb290
|
装夹工单返工
|
2025-01-23 13:55:35 +08:00 |
|
胡尧
|
6abb237491
|
Merge branch 'develop' into feature/验证合并的逻辑
|
2025-01-21 10:39:41 +08:00 |
|
yuxianghui
|
8f9b7b2fb0
|
优化工件下产线，修改CNC加工工单状态为待检测时，同步修改对应质检单状态为待处理
|
2025-01-20 15:39:08 +08:00 |
|
mgw
|
32255af3a3
|
申请编程状态
|
2025-01-20 14:53:26 +08:00 |
|
yuxianghui
|
955b6a6213
|
工单优化
|
2025-01-20 14:47:09 +08:00 |
|
yuxianghui
|
8e788d3745
|
处理CNC加工工单通过接口上产线下产线变更为待检测时，对应质检单还是等待状态问题
|
2025-01-20 14:18:02 +08:00 |
|
mgw
|
dbcf8b1089
|
申请编程状态控制
|
2025-01-20 14:02:54 +08:00 |
|
胡尧
|
c436bbea46
|
Merge branch 'release/release_2.8' into feature/验证合并的逻辑
|
2025-01-17 16:12:27 +08:00 |
|
yuxianghui
|
41cdeb7fd9
|
制造订单状态优化
|
2025-01-17 11:06:17 +08:00 |
|
胡尧
|
19e1b16122
|
屏蔽将制造订单的补货组修改为不同的代码
|
2025-01-17 09:27:38 +08:00 |
|
yuxianghui
|
39d6c8ae24
|
处理制造订单再次返工时，点击返工按钮报错
|
2025-01-16 15:41:07 +08:00 |
|
yuxianghui
|
1e71fc1b08
|
Merge branch 'feature/制造订单状态优化' into feature/质检单优化_1
|
2025-01-16 14:51:51 +08:00 |
|
yuxianghui
|
add528f0f3
|
1、质检单有关后置三元检测的字段和页签添加工单没有后置三元检测时隐藏的条件；2、工单添加质检单跳转按钮
|
2025-01-16 14:51:04 +08:00 |
|
廖丹龙
|
f93edef2d3
|
Accept Merge Request #1770: (feature/customer_supply -> 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/1770
|
2025-01-16 12:42:28 +08:00 |
|
liaodanlong
|
5c780c7b82
|
客供料合并
|
2025-01-16 11:35:37 +08:00 |
|
yuxianghui
|
e3562e7ae3
|
1、制造订单状态优化
|
2025-01-16 09:01:11 +08:00 |
|
yuxianghui
|
5297bf05d1
|
1、制造订单返工按钮添加新的显示条件；2、优化返工流程
|
2025-01-15 14:36:49 +08:00 |
|
yuxianghui
|
1b9dbffcce
|
Merge branch 'feature/质检单优化' into feature/工单-制造订单优化
|
2025-01-15 11:26:01 +08:00 |
|
yuxianghui
|
8d5d19ec69
|
1、质检单通过、失败按钮添加工单为返工时隐藏条件；2、处理夹具入库到夹具房时，夹具查询中夹具可用状态没有变更为可用问题；3、处理后置三元检测选择返工后制造订单状态没有变更为返工的问题
|
2025-01-15 11:25:00 +08:00 |
|
胡尧
|
f79fa75a68
|
Accept Merge Request #1762: (feature/customer_supply -> 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/1762#mr-1762-review-218183
|
2025-01-15 08:43:31 +08:00 |
|
liaodanlong
|
f4f87555a8
|
排除坯料制造订单
|
2025-01-15 01:44:48 +08:00 |
|
yuxianghui
|
bf3256c4bc
|
Merge branch 'feature/工单-质检优化_3' into feature/质检单优化
|
2025-01-14 16:22:59 +08:00 |
|
yuxianghui
|
847b7da8f7
|
处理 质检单确认合格或者不合格时报错 bug
|
2025-01-14 16:22:17 +08:00 |
|
mgw
|
2a9d19436a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-01-14 16:21:07 +08:00 |
|
yuxianghui
|
b433c6423b
|
Merge branch 'feature/工单-质检优化_2' into feature/工单-质检优化_3
|
2025-01-14 15:08:42 +08:00 |
|
yuxianghui
|
eae310ddad
|
1、工单、质检单优化
|
2025-01-14 15:07:53 +08:00 |
|
廖丹龙
|
deff14b4d3
|
Accept Merge Request #1753: (feature/customer_supply -> 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/1753
|
2025-01-14 14:17:26 +08:00 |
|
liaodanlong
|
9d6baee082
|
客供料与非客供料分开合并
|
2025-01-14 14:12:08 +08:00 |
|
管欢
|
47c54107f1
|
Accept Merge Request #1752: (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/1752
|
2025-01-14 13:53:17 +08:00 |
|
mgw
|
883d6938e5
|
调整提示词
|
2025-01-14 13:28:08 +08:00 |
|
guanhuan
|
437b081f15
|
加工面筛选修改
|
2025-01-14 13:13:50 +08:00 |
|
yuxianghui
|
f44dff2106
|
Merge branch 'feature/工单-质检优化_1' into feature/工单-质检优化_2
|
2025-01-14 10:40:56 +08:00 |
|
yuxianghui
|
07d854a740
|
处理质检结果为返工时，制造订单状态没有更改为返工的问题
|
2025-01-14 09:25:06 +08:00 |
|
mgw
|
86747b77a6
|
调整判断条件
|
2025-01-14 08:47:30 +08:00 |
|
mgw
|
5865aab25c
|
解除屏蔽
|
2025-01-14 08:41:41 +08:00 |
|
mgw
|
63ca6f5856
|
解除状态限制屏蔽
|
2025-01-14 08:33:34 +08:00 |
|
liaodanlong
|
6cf4bf1005
|
代码合并
|
2025-01-13 17:16:22 +08:00 |
|
秦圣
|
2756edd6bc
|
Accept Merge Request #1741: (feature/customer_supply -> develop)
Merge Request: 采购单取消错误提示修改
Created By: @廖丹龙
Accepted By: @秦圣
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1741
|
2025-01-13 17:03:17 +08:00 |
|