Commit Graph

201 Commits

Author SHA1 Message Date
mgw
6178ad0f8e 修改取消明细状态 2025-03-19 12:53:40 +08:00
mgw
dc5e70c118 调整名称 2025-03-19 11:33:59 +08:00
mgw
8634c1fc40 调整字段名 2025-03-19 11:21:28 +08:00
mgw
a556c21196 增加包名映射 2025-03-19 11:16:36 +08:00
mgw
5b979ffc34 取消列表增加采购申请明细 2025-03-19 11:00:48 +08:00
mgw
a2868a2581 修复按钮规则;修复排程单取消 2025-03-18 09:43:48 +08:00
mgw
221eb7c3a1 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
# Conflicts:
#	quality_control/security/ir.model.access.csv
#	quality_control/wizard/quality_check_wizard.py
#	sf_quality/__manifest__.py
#	sf_quality/models/__init__.py
#	sf_quality/models/stock.py
2025-03-17 13:46:40 +08:00
黄焱
1ca069b149 Accept Merge Request #1905: (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/1905
2025-03-13 16:14:31 +08:00
yuxianghui
7ddcfc6226 1、处理 制造订单内外协调拨单质量检查不通过,点击跳转质量检查页面报错 ;2、处理 工单Rfid绑定解绑是数据不正确问题 2025-03-13 14:39:04 +08:00
yuxianghui
83699fcae6 1、修改质检提示翻译;2、处理单据合并原单据数据不全问题;3、处理制造订单返工报错 2025-03-13 11:11:22 +08:00
yuxianghui
0d8445e444 处理工单的Rfid扫码绑定解绑问题 2025-03-13 08:36:10 +08:00
mgw
1541326dfc 增加排程单取消 2025-03-10 14:56:42 +08:00
hyyy
0a65c29286 取消销售订单的下游清单界面优化 2025-03-05 17:24:42 +08:00
mgw
98b4c53213 调整名称与提示语 2025-02-28 17:35:32 +08:00
mgw
c24f539197 取消销售订单时的下游单据清单【大类、单据名称、作业类型】显示错误 2025-02-28 16:04:49 +08:00
mgw
07c07ef37c 完善下游单据问题 2025-02-27 16:00:29 +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