jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,711 Commits 134 Branches 31 Tags
f8bfb7ba4060da0cdd6407385f54b2cfa196efc3
Commit Graph

5711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
7755cc3982 优化接口;质量检查wizard添加发布按钮 2025-03-14 15:45:45 +08:00
管欢
34565c5d79 Accept Merge Request #1906: (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/1906
 2025-03-14 15:43:18 +08:00
mgw
0f537a3158 增加文件下载功能 2025-03-14 14:54:13 +08:00
mgw
7f99b4ba8b 记录历史报告名字、增加状态修改 2025-03-14 14:22:25 +08:00
mgw
4138903bff 调整向导提示语逻辑 2025-03-14 14:02:14 +08:00
mgw
4200fdbf3b 限制可上传文件类型 2025-03-14 13:52:54 +08:00
mgw
214f45850e 增加对新增删除行的控制 2025-03-14 12:58:26 +08:00
mgw
c23aa4de75 调整报告样式 2025-03-14 11:13:50 +08:00
hyyy
f66ff6339d 修改 2025-03-14 10:52:50 +08:00
mgw
f9525beb65 调整发布业务逻辑 2025-03-14 10:44:54 +08:00
mgw
35bcfa6fa1 调整按钮 2025-03-14 09:50:13 +08:00
mgw
7b6dda3d75 重新发布按钮也增加二次确认 2025-03-13 19:17:49 +08:00
mgw
954ff6b848 对发布按钮进行二次确认控制 2025-03-13 19:13:57 +08:00
mgw
af3a2880e8 添加发布前校验数据 2025-03-13 18:55:59 +08:00
mgw
424a496046 调整预览报表model名字 2025-03-13 18:33:26 +08:00
mgw
bd2ba3bb49 添加合格图章 2025-03-13 17:55:13 +08:00
mgw
2d4926f8b7 优化上传逻辑 2025-03-13 17:23:26 +08:00
hyyy
9d84b68525 修改报错问题 2025-03-13 17:21:22 +08:00
guanhuan
3baf3e60e8 修复外协入库单根据图号查询不到 2025-03-13 17:21:05 +08:00
mgw
16dbfc3867 限制测量列数 2025-03-13 17:13:51 +08:00
hyyy
6de31608d1 Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-13 17:07:26 +08:00
hyyy
73ce21ef99 优化，修复bug 2025-03-13 17:07:19 +08:00
mgw
c632926348 调整报表展示 2025-03-13 17:07:07 +08:00
禹翔辉
a421055348 Accept Merge Request #1903: (feature/工单Rfid优化 -> develop) 
Merge Request: 1、完成 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1903
 2025-03-13 16:47:39 +08:00
yuxianghui
cd114d183b 处理质检单控制方式为非数量时，调拨单验证时存在不合格质检单的提示信息数量问题 2025-03-13 16:45:09 +08:00
mgw
20efa0bdab 去除重复声明 2025-03-13 16:44:03 +08:00
mgw
839b3c981d 配合前端列数修改 2025-03-13 16:39:10 +08:00
廖丹龙
395db2cf5f Accept Merge Request #1904: (feature/tool_standard_library_process -> 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/1904
 2025-03-13 16:21:00 +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
mgw
061714413c Merge branch 'feature/制造功能优化' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-13 16:13:09 +08:00
mgw
f780d47562 发布相关 2025-03-13 16:12:48 +08:00
hyyy
082e25feae 增加添加删除列 2025-03-13 16:10:43 +08:00
liaodanlong
ef5eea1845 删除无用代码 2025-03-13 15:32:54 +08:00
yuxianghui
359eae14cc 1、完成 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 2025-03-13 15:32:12 +08:00
廖丹龙
528d63123f Accept Merge Request #1901: (feature/tool_standard_library_process -> 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/1901
 2025-03-13 15:27:59 +08:00
禹翔辉
b94adc9704 Accept Merge Request #1902: (feature/工单Rfid优化 -> develop) 
Merge Request: Merge branch 'feature/制造工单优化' into feature/工单Rfid优化

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1902
 2025-03-13 14:42:06 +08:00
yuxianghui
2568e63712 Merge branch 'feature/制造工单优化' into feature/工单Rfid优化 2025-03-13 14:40:12 +08:00
yuxianghui
7ddcfc6226 1、处理 制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 ；2、处理 工单Rfid绑定解绑是数据不正确问题 2025-03-13 14:39:04 +08:00
liaodanlong
3543531f61 表面工艺添加零件图号零件名称 2025-03-13 14:13:28 +08:00
mgw
04b255d5c6 检测报告发布流程 2025-03-13 14:10:06 +08:00
禹翔辉
326dcc8b87 Accept Merge Request #1900: (feature/制造工单优化 -> develop) 
Merge Request: 1、处理调拨单二次验证时其他提示信息窗口直接关闭问题；2、处理特殊途径-制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 问题

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1900
 2025-03-13 13:05:44 +08:00
yuxianghui
9d042dc61e 1、处理调拨单二次验证时其他提示信息窗口直接关闭问题；2、处理特殊途径-制造订单内外协调拨单质量检查不通过，点击跳转质量检查页面报错 问题 2025-03-13 13:02:22 +08:00
禹翔辉
7ba415968b Accept Merge Request #1899: (feature/制造工单优化 -> develop) 
Merge Request: Merge branch 'feature/功能刀具组装提示优化' into feature/制造工单优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1899
 2025-03-13 11:13:35 +08:00
yuxianghui
e10483b87b Merge branch 'feature/功能刀具组装提示优化' into feature/制造工单优化 2025-03-13 11:12:06 +08:00
yuxianghui
83699fcae6 1、修改质检提示翻译；2、处理单据合并原单据数据不全问题；3、处理制造订单返工报错 2025-03-13 11:11:22 +08:00
廖丹龙
b2b8762138 Accept Merge Request #1898: (feature/tool_standard_library_process -> 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/1898
 2025-03-13 10:12:56 +08:00
liaodanlong
7c48e6b186 同一个销售订单的不同产品的坯料获取方式不一样，生成的采购订单问题 2025-03-13 09:49:17 +08:00
管欢
e87689da33 Accept Merge Request #1896: (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/1896
 2025-03-13 08:48:04 +08:00
禹翔辉
dff0841317 Accept Merge Request #1897: (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/1897
 2025-03-13 08:43:43 +08:00
yuxianghui
0d8445e444 处理工单的Rfid扫码绑定解绑问题 2025-03-13 08:36:10 +08:00