胡尧
|
7849ce6342
|
工单列表增加模型ID搜索
|
2025-04-21 11:25:37 +08:00 |
|
liaodanlong
|
a4f8183654
|
更新工艺外协流程的采购单查询逻辑
|
2025-04-17 17:02:43 +08:00 |
|
liaodanlong
|
962931bc9d
|
外协流程更改
|
2025-04-17 14:29:06 +08:00 |
|
liaodanlong
|
61a3cf606e
|
表面工艺数据内置与数据同步调整
|
2025-04-14 15:23:47 +08:00 |
|
liaodanlong
|
77744e75d7
|
子制造订单零件图号零件名称问题
|
2025-03-27 16:38:57 +08:00 |
|
liaodanlong
|
dd6e8b6707
|
调试信息
|
2025-03-27 15:21:15 +08:00 |
|
liaodanlong
|
11a5217430
|
子制造订单零件图号与零件名称获取方式修改
|
2025-03-26 16:57:47 +08:00 |
|
胡尧
|
24897f07f8
|
获取编程单，不传递模型参数
|
2025-03-13 13:58:13 +08:00 |
|
胡尧
|
a1a94867f0
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-13 11:34:17 +08:00 |
|
liaodanlong
|
7c48e6b186
|
同一个销售订单的不同产品的坯料获取方式不一样，生成的采购订单问题
|
2025-03-13 09:49:17 +08:00 |
|
胡尧
|
da489555b0
|
去掉多余的字段
|
2025-03-12 17:17:21 +08:00 |
|
胡尧
|
29337bfceb
|
调整模型显示
|
2025-03-12 17:05:29 +08:00 |
|
胡尧
|
dedc820b50
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-10 16:31:35 +08:00 |
|
yuxianghui
|
826d5b1d58
|
1、优化工单子页签可全量配置处理方法；
|
2025-03-06 13:37:52 +08:00 |
|
yuxianghui
|
7d4314abc7
|
完成 工单子页签可全量配置
|
2025-03-05 11:24:48 +08:00 |
|
mgw
|
7e93586f69
|
人工建立销售单取第一份bom
|
2025-03-04 11:40:39 +08:00 |
|
胡尧
|
e8fc38e6ed
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-04 09:32:07 +08:00 |
|
mgw
|
2035dd6857
|
切割工单隐藏编程相关
|
2025-02-26 12:42:42 +08:00 |
|
mgw
|
dca6f9fb53
|
sf-工厂取消接单-坯料的制造订单未取消
|
2025-02-26 09:40:18 +08:00 |
|
mgw
|
2a8791b9a9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-26 09:10:04 +08:00 |
|
mgw
|
def9bd2c6e
|
坯料自加工的切割工序状态也判断了编程状态
|
2025-02-26 09:09:26 +08:00 |
|
yuxianghui
|
fb4f08a24a
|
1、处理销售订单确认供货路线报错-坯料获取方式是自加工 问题；2、质检完成的消息通知添加超链接；3、添加 库存作业单据没有质检单时-会发送待处理消息通知-不用发送判断条件
|
2025-02-25 15:05:30 +08:00 |
|
胡尧
|
52e585e637
|
解决冲突
|
2025-02-20 13:51:24 +08:00 |
|
胡尧
|
05dac9fb0c
|
调整模型上传的流程
|
2025-02-20 13:36:05 +08:00 |
|
mgw
|
5d2cadc3d0
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-02-17 15:37:58 +08:00 |
|
mgw
|
567ea84b00
|
完善人工编程功能
|
2025-02-17 15:37:30 +08:00 |
|
mgw
|
e98a9a3788
|
增加取消订单其他功能
|
2025-02-14 17:29:33 +08:00 |
|
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 |
|
yuxianghui
|
bc4806b303
|
1、销售订单详情界面列表优化；2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求
|
2025-02-08 16:47:06 +08:00 |
|
mgw
|
976d75973d
|
调整程序写入逻辑
|
2025-02-08 16:00:07 +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 |
|
mgw
|
dbcf8b1089
|
申请编程状态控制
|
2025-01-20 14:02:54 +08:00 |
|
yuxianghui
|
41cdeb7fd9
|
制造订单状态优化
|
2025-01-17 11:06:17 +08:00 |
|
yuxianghui
|
39d6c8ae24
|
处理制造订单再次返工时，点击返工按钮报错
|
2025-01-16 15:41:07 +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 |
|
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 |
|
廖丹龙
|
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 |
|