Commit Graph

1798 Commits

Author SHA1 Message Date
yuxianghui
eb11e71d0d 1、入库单据优化:单据就绪自动分配序列号;分配序列号时,流水号取值=MAX(产品序列号模型最大序号,预分配最大序号),界面优化。2、客供料入库单批量调拨有待质检的单子时-提示语显示重复了优化 2025-02-24 16:27:09 +08:00
mgw
064af3b884 调整名称 2025-02-19 15:34:42 +08:00
mgw
0969967570 修复完善取消订单问题 2025-02-19 15:14:05 +08:00
mgw
dc29671f1a 增加状态映射 2025-02-17 17:59:38 +08:00
mgw
9fce93e1ef 调整工单状态改变逻辑 2025-02-17 17:34:54 +08:00
mgw
09f8f5c0fd 调整状态 2025-02-17 17:30:02 +08:00
mgw
f24c5ff75a 调整字段名称 2025-02-17 16:21:01 +08:00
mgw
8d9aee497a 完善取消订单功能 2025-02-17 16:11:48 +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
胡尧
d25022204b Accept Merge Request #1808: (feature/mrp_bug_fixed -> develop)
Merge Request: 修改配送类型的字段关联形式,修改工件配送列表页的默认筛选条件

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1808?initial=true
2025-02-17 13:24:31 +08:00
胡尧
8095a8a972 修改配送类型的字段关联形式,修改工件配送列表页的默认筛选条件 2025-02-17 13:23:32 +08:00
yuxianghui
f556e45102 Merge branch 'feature/同步接口优化' into feature/库存优化_1 2025-02-17 12:42:55 +08:00
yuxianghui
fc4eae0488 完成 入库优化:自动确认序列号 需求 2025-02-17 12:42:07 +08:00
mgw
3e9b6f808d 优化取消接单功能 2025-02-17 10:00:40 +08:00
hyyy
b117fde8c3 删除模块,移到efms里面,修改样式 2025-02-14 17:31:19 +08:00
mgw
e98a9a3788 增加取消订单其他功能 2025-02-14 17:29:33 +08:00
mgw
3ac096e9a7 取消接单需求进行中 2025-02-13 17:41:18 +08:00
胡尧
3130ef4983 增加工单的开始时间已经leave_id字段的监控,异常则发送企业微信消息 2025-02-13 15:48:41 +08:00
胡尧
68e9537cdb Accept Merge Request #1802: (feature/mrp_bug_fixed -> develop)
Merge Request: 修改客供料的供货路线不能选择外购

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1802?initial=true
2025-02-12 15:34:34 +08:00
胡尧
2411d8334c 修改客供料的供货路线不能选择外购 2025-02-12 15:33:57 +08:00
yuxianghui
c223869bbd Merge branch 'feature/销售视图优化' into feature/库存优化 2025-02-12 11:30:27 +08:00
mgw
6b9428c8bf 多种状态下显示拒绝接单/取消按钮 2025-02-10 16:38:34 +08:00
mgw
027be2b021 调整工单处人工编程可见 2025-02-10 13:33:46 +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
44f29d001e 调整人工线下加工页面内容 2025-02-08 14:08:53 +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
mgw
88840abf9f 制造订单编程状态搜索的优化需求 2025-02-08 13:32:40 +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
guanhuan
dc843588e9 制造列表新增编程状态显示 2025-01-20 14:09:23 +08:00
mgw
dbcf8b1089 申请编程状态控制 2025-01-20 14:02:54 +08:00
yuxianghui
a96a9f5b75 1、修改工单检测结果只读条件;2、修改质检单完成时同步完成工单判断条件;3、去除只有配置后置三元检测的工单才能看到质检单对应字段、页签的判断条件 2025-01-20 12:47:11 +08:00
yuxianghui
9e2704f726 新增工单送检按钮显示的时候隐藏完成按钮 2025-01-20 10:34:32 +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
mgw
f3e64b007e 调整扫码字段位置 2025-01-17 09:59:46 +08:00