胡尧
|
c80e12d731
|
回退工艺外协代码
|
2025-05-15 11:07:22 +08:00 |
|
胡尧
|
11ecad5ef2
|
解决冲突
|
2025-05-12 08:41:12 +08:00 |
|
胡尧
|
e5b730b2ef
|
人工线下返工在不选择重新编程时复制加工图纸
|
2025-05-08 21:21:51 +08:00 |
|
liaodanlong
|
95c25ac7b8
|
工艺外协代码
|
2025-04-29 13:39:36 +08:00 |
|
liaodanlong
|
ce79016bef
|
返工未申请重新编程，新工单复制程序文件问题处理
|
2025-04-27 17:20:15 +08:00 |
|
liaodanlong
|
defd779279
|
返工 不重新编程 cnc加工工单没有数据问题
|
2025-04-27 11:35:29 +08:00 |
|
liaodanlong
|
e2e820267e
|
字符串拼接问题处理
|
2025-04-27 11:04:09 +08:00 |
|
liaodanlong
|
94f179a6d6
|
工艺外协代码回退
|
2025-04-27 10:46:48 +08:00 |
|
liaodanlong
|
9cf70cc54c
|
工艺外协代码回退
|
2025-04-26 14:42:38 +08:00 |
|
liaodanlong
|
7ecdc31db4
|
空值处理
|
2025-04-22 15:00:54 +08:00 |
|
liaodanlong
|
53a676bc93
|
查询条件修改
|
2025-04-22 14:22:31 +08:00 |
|
liaodanlong
|
397c35867b
|
产品设置默认供应商数据
|
2025-04-22 13:41:22 +08:00 |
|
liaodanlong
|
f843610872
|
采购申请处理
|
2025-04-22 13:40:15 +08:00 |
|
liaodanlong
|
ea0f9d6ee2
|
sf-制造-作业-表单详情内，可选工艺参数手动新增编码规则跟外协服务产品名称不正确
|
2025-04-18 15:45:00 +08:00 |
|
liaodanlong
|
962931bc9d
|
外协流程更改
|
2025-04-17 14:29:06 +08:00 |
|
胡尧
|
10bea40159
|
增加不同工作中心配置相同接驳站的功能
|
2025-04-08 10:29:29 +08:00 |
|
mgw
|
30b01b6e2c
|
增加已批准为无异动
|
2025-03-21 18:15:37 +08:00 |
|
mgw
|
ae1028972c
|
sf-坯料的获取方式是自加工，生成的坯料制造订单的排程单不在取消列表中
|
2025-03-20 16:19:55 +08:00 |
|
mgw
|
e4ed431167
|
Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-19 15:32:07 +08:00 |
|
mgw
|
1a511b93cf
|
调整名称及总数量逻辑
|
2025-03-19 15:31:34 +08:00 |
|
hyyy
|
9093770ce1
|
修改取消列表，修改出厂检验报告
|
2025-03-19 14:45:04 +08:00 |
|
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 |
|