Commit Graph

192 Commits

Author SHA1 Message Date
mgw
92adde7909 处理空值情况 2025-02-27 14:00:41 +08:00
mgw
ed17444f21 统一处理质检单 2025-02-27 13:54:28 +08:00
mgw
b693252a7b Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-27 11:32:29 +08:00
mgw
88fceb016f 调整单据状态 2025-02-27 11:26:26 +08:00
mgw
d1a71e1a05 完善单据 2025-02-27 10:58:06 +08:00
mgw
7af9b25eee 取消列表单据只读 2025-02-27 09:58:12 +08:00
mgw
f234943104 调整行号 2025-02-27 09:16:50 +08:00
mgw
d608b78f8c 坯料外协单据 2025-02-27 09:04:38 +08:00
mgw
513daa7c2b 补全单据 2025-02-26 17:39:34 +08:00
mgw
a4bfda0a41 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 14:47:28 +08:00
mgw
2035dd6857 切割工单隐藏编程相关 2025-02-26 12:42:42 +08:00
mgw
e9226a87f5 调整判断逻辑 2025-02-26 10:41:05 +08:00
mgw
0be9afcdfe 修改变量名 2025-02-26 10:13:26 +08:00
mgw
e3b2dade15 调整判断逻辑 2025-02-26 10:06:27 +08:00
mgw
f89b52bad1 修改状态名称 2025-02-26 09:58:16 +08:00
mgw
f06951958d sf-工厂取消接单-取消列表展示数据问题 2025-02-26 09:54:08 +08:00
mgw
dca6f9fb53 sf-工厂取消接单-坯料的制造订单未取消 2025-02-26 09:40:18 +08:00
liaodanlong
c400553294 工艺确认时的工单空值处理 2025-02-25 16:35:40 +08:00
mgw
3745125990 编程单去重 2025-02-24 16:59:12 +08:00
mgw
28a16ca08e 调整工单名称、编程单去重 2025-02-24 15:29:02 +08:00
mgw
74442c6539 改正语法问题 2025-02-24 15:15:27 +08:00
mgw
4e7bf40d91 调整领料单生成次数 2025-02-24 15:12:23 +08:00
mgw
7ab90143b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-24 14:59:53 +08:00
mgw
8bf788e39c 调整行号取值 2025-02-24 14:57:19 +08:00
mgw
9e25657fea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-24 14:46:35 +08:00
mgw
555802b271 调整下游单据内容 2025-02-24 14:46:18 +08:00
mgw
91061b1eec 调整调拨产品名称等 2025-02-21 17:34:57 +08:00
胡尧
70855a4936 Accept Merge Request #1830: (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/1830?initial=true
2025-02-21 14:29:46 +08:00
胡尧
1bbdf2bd44 取消配送路线关联字段修改 2025-02-21 14:29:15 +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
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
胡尧
8095a8a972 修改配送类型的字段关联形式,修改工件配送列表页的默认筛选条件 2025-02-17 13:23:32 +08:00
mgw
3e9b6f808d 优化取消接单功能 2025-02-17 10:00:40 +08:00
mgw
e98a9a3788 增加取消订单其他功能 2025-02-14 17:29:33 +08:00
mgw
3ac096e9a7 取消接单需求进行中 2025-02-13 17:41:18 +08:00
yuxianghui
bc4806b303 1、销售订单详情界面列表优化;2、完成 人工线下加工制造订单提交返工时-建议隐藏【保留装夹预调测量数据】 需求 2025-02-08 16:47:06 +08:00
yuxianghui
39d6c8ae24 处理制造订单再次返工时,点击返工按钮报错 2025-01-16 15:41:07 +08:00
yuxianghui
e3562e7ae3 1、制造订单状态优化 2025-01-16 09:01:11 +08:00
yuxianghui
5ff6fe73d4 点击制造订单触发返工的过滤条件优化 2025-01-15 15:40:19 +08:00
yuxianghui
5297bf05d1 1、制造订单返工按钮添加新的显示条件;2、优化返工流程 2025-01-15 14:36:49 +08:00
mgw
40603fea6a 调整编程记录生成 2025-01-14 11:12:07 +08:00
yuxianghui
3de86cf538 Merge branch 'feature/工单-质检优化' into feature/工单-质检优化_1 2025-01-13 15:08:04 +08:00
yuxianghui
186dca4618 1、取消质量检查页面根据指令检查自动筛选;2、修改送检按钮隐藏条件;3、优化工单后置三元检测page页显示时,检测结果选择返工时制造订单没有生成检测结果记录问题 2025-01-13 15:07:08 +08:00
mgw
6b6f091da8 更新编程记录相关 2025-01-13 11:11:09 +08:00