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

5726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
禹翔辉
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
mgw
c6ae4d933c 计算总数量 2025-03-12 14:14:21 +08:00
mgw
d577630657 增加报告相关结构 2025-03-12 14:06:03 +08:00
liaodanlong
5b084624df 不送检的质量检查单状态更新：等待、待处理 2025-03-12 13:46:07 +08:00
mgw
5e51ee8db3 控制字段、page显隐逻辑 2025-03-12 12:43:13 +08:00
mgw
de1bdbe18b 准备前端开发用结构 2025-03-12 09:08:41 +08:00
mgw
78738ed8aa 检查文件上传 2025-03-11 16:19:00 +08:00
yuxianghui
8237d04f32 功能刀具组装扫码验证物料提示信息优化 2025-03-11 16:12:04 +08:00
mgw
e6e740a6c7 质量检查优化-界面部分 2025-03-11 12:54:59 +08:00
禹翔辉
003a115084 Accept Merge Request #1895: (feature/调拨单优化 -> develop) 
Merge Request: Merge branch 'feature/工单页签优化_1' into feature/调拨单优化

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1895
 2025-03-11 08:59:33 +08:00
yuxianghui
9ca7f75ef7 Merge branch 'feature/工单页签优化_1' into feature/调拨单优化 2025-03-11 08:55:59 +08:00
胡尧
7654a60f2f Accept Merge Request #1892: (feature/tool_standard_library_process -> develop) 
Merge Request: sf 材料型号页面修改字段信息

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1892#mr-1892-review-228565
 2025-03-11 08:55:02 +08:00
mgw
bd43de74dd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-10 17:10:46 +08:00
mgw
2cc7386027 质量检查优化 2025-03-10 17:10:27 +08:00
liaodanlong
4a92e39b0d Merge branch 'refs/heads/develop' into feature/tool_standard_library_process 2025-03-10 16:55:39 +08:00
yuxianghui
34456c3506 完成 验证调拨单时，校验不合格产品，如果存在不合格质检单则给与提示 2025-03-10 16:54:15 +08:00
yuxianghui
dc550d1be5 完成 调拨单取消后，关联取消质量检查单 2025-03-10 15:24:24 +08:00
mgw
1541326dfc 增加排程单取消 2025-03-10 14:56:42 +08:00
guanhuan
0d7f348194 调拨列表采购订单询价单页面优化 2025-03-07 11:29:32 +08:00
胡尧
307f1b221f Accept Merge Request #1894: (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/1894?initial=true
 2025-03-06 16:03:14 +08:00
胡尧
674af1d11d 成品，坯料复制模板中的采购申请字段模板 2025-03-06 16:02:19 +08:00
guanhuan
e12755783c 审批优化 2025-03-06 13:46:18 +08:00
禹翔辉
1215d62e76 Accept Merge Request #1893: (feature/工单页签优化_1 -> develop) 
Merge Request: Merge branch 'feature/工单页签优化' into feature/工单页签优化_1

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1893?initial=true
 2025-03-06 13:40:34 +08:00
yuxianghui
00c9ad423c Merge branch 'feature/工单页签优化' into feature/工单页签优化_1 2025-03-06 13:39:27 +08:00
yuxianghui
826d5b1d58 1、优化工单子页签可全量配置处理方法； 2025-03-06 13:37:52 +08:00
liaodanlong
9a67caca74 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process 2025-03-06 10:44:31 +08:00
liaodanlong
9c5ecdfe76 sf 材料型号页面修改字段信息 2025-03-06 10:25:56 +08:00
hyyy
0a65c29286 取消销售订单的下游清单界面优化 2025-03-05 17:24:42 +08:00
禹翔辉
f2415ae80d Accept Merge Request #1891: (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/1891?initial=true
 2025-03-05 11:26:11 +08:00
yuxianghui
7d4314abc7 完成 工单子页签可全量配置 2025-03-05 11:24:48 +08:00
马广威
28a3d52aea Accept Merge Request #1890: (feature/制造功能优化 -> develop) 
Merge Request: 人工建立销售单取第一份bom

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1890?initial=true
 2025-03-04 11:42:02 +08:00
mgw
7e93586f69 人工建立销售单取第一份bom 2025-03-04 11:40:39 +08:00
马广威
4bff6e4355 Accept Merge Request #1889: (release/release_2.9 -> develop) 
Merge Request: 调整名称与提示语

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1889?initial=true
 2025-02-28 17:45:56 +08:00
mgw
98b4c53213 调整名称与提示语 2025-02-28 17:35:32 +08:00
廖丹龙
ec1da84da0 Accept Merge Request #1888: (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/1888
 2025-02-28 16:38:23 +08:00
liaodanlong
4c8cf5caf8 制造订单状态为返工时限制表面工艺工单状态 2025-02-28 16:36:16 +08:00