Commit Graph

5625 Commits

Author SHA1 Message Date
mgw
7755cc3982 优化接口;质量检查wizard添加发布按钮 2025-03-14 15:45:45 +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
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
mgw
20efa0bdab 去除重复声明 2025-03-13 16:44:03 +08:00
mgw
839b3c981d 配合前端列数修改 2025-03-13 16:39:10 +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
mgw
04b255d5c6 检测报告发布流程 2025-03-13 14:10:06 +08:00
mgw
c6ae4d933c 计算总数量 2025-03-12 14:14:21 +08:00
mgw
d577630657 增加报告相关结构 2025-03-12 14:06:03 +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
mgw
e6e740a6c7 质量检查优化-界面部分 2025-03-11 12:54:59 +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
mgw
1541326dfc 增加排程单取消 2025-03-10 14:56:42 +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
禹翔辉
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
禹翔辉
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
马广威
aa1517ebce Accept Merge Request #1887: (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/1887?initial=true
2025-02-28 16:06:04 +08:00