mgw
|
f011c1efda
|
调整报告样式
|
2025-03-25 15:00:18 +08:00 |
|
mgw
|
fe9548a0d1
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-25 14:08:06 +08:00 |
|
马广威
|
ac2d81285e
|
Accept Merge Request #1966: (feature/制造功能优化 -> develop)
Merge Request: 补充下载链接
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1966?initial=true
|
2025-03-25 14:06:49 +08:00 |
|
mgw
|
73ae2cd5c3
|
补充下载链接
|
2025-03-25 14:06:23 +08:00 |
|
胡尧
|
0347eb48e4
|
销售订单行增加交期字段，销售订单列表默认值修改为供货方式待确认
|
2025-03-25 13:48:17 +08:00 |
|
mgw
|
0aae15cbce
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-25 13:32:55 +08:00 |
|
禹翔辉
|
d888be06c4
|
Accept Merge Request #1965: (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/1965
|
2025-03-25 13:29:48 +08:00 |
|
yuxianghui
|
2275f7a384
|
制造订单详情页添加对应采购申请跳转链接
|
2025-03-25 13:28:31 +08:00 |
|
mgw
|
5a7d70fb6b
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-25 13:27:51 +08:00 |
|
马广威
|
1256f5ecb5
|
Accept Merge Request #1964: (feature/制造功能优化 -> develop)
Merge Request: 修改报告二维码指向
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1964?initial=true
|
2025-03-25 13:26:49 +08:00 |
|
mgw
|
4dfac9e96f
|
修改报告二维码指向
|
2025-03-25 13:26:12 +08:00 |
|
mgw
|
8ea8bf1f48
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-25 10:40:48 +08:00 |
|
马广威
|
29f143a547
|
Accept Merge Request #1963: (feature/制造功能优化 -> develop)
Merge Request: 恢复旧报告名称字段
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1963?initial=true
|
2025-03-25 10:39:48 +08:00 |
|
mgw
|
2eaf8aef8f
|
恢复旧报告名称字段
|
2025-03-25 10:39:24 +08:00 |
|
liaodanlong
|
df78019226
|
Merge remote-tracking branch 'origin/feature/commercially_launched' into feature/commercially_launched
|
2025-03-25 10:39:22 +08:00 |
|
liaodanlong
|
6ad945b720
|
产品加工面板空值处理
|
2025-03-25 10:39:02 +08:00 |
|
mgw
|
3285d4da57
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-25 10:35:00 +08:00 |
|
马广威
|
8d1466485a
|
Accept Merge Request #1962: (feature/制造功能优化 -> develop)
Merge Request: 调整报告编号
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1962?initial=true
|
2025-03-25 10:33:14 +08:00 |
|
mgw
|
b39281d057
|
调整报告编号
|
2025-03-25 10:32:12 +08:00 |
|
liaodanlong
|
60539462a0
|
报错处理
|
2025-03-25 10:02:39 +08:00 |
|
mgw
|
fd9018a4c8
|
调整完成逻辑取值
|
2025-03-25 09:56:40 +08:00 |
|
liaodanlong
|
81b425ae0c
|
调拨单零件图号零件名称处理
|
2025-03-24 17:28:16 +08:00 |
|
mgw
|
f8e8615dc8
|
适配索引
|
2025-03-24 17:25:23 +08:00 |
|
mgw
|
2b2da79e33
|
调整筛选逻辑
|
2025-03-24 17:18:19 +08:00 |
|
马广威
|
01ac8a19b6
|
Accept Merge Request #1961: (feature/制造功能优化 -> develop)
Merge Request: 优化数采查询代码
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1961?initial=true
|
2025-03-24 16:51:02 +08:00 |
|
mgw
|
20a8ca6146
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-24 16:50:20 +08:00 |
|
mgw
|
62cd60ec06
|
优化数采查询代码
|
2025-03-24 16:49:49 +08:00 |
|
liaodanlong
|
33fabc068a
|
报错处理
|
2025-03-24 16:06:11 +08:00 |
|
liaodanlong
|
db4dd33709
|
报错处理
|
2025-03-24 15:54:59 +08:00 |
|
liaodanlong
|
4acb0fa0ba
|
Merge branch 'refs/heads/develop' into feature/commercially_launched
|
2025-03-24 15:39:26 +08:00 |
|
廖丹龙
|
c9ba3a07bf
|
Accept Merge Request #1960: (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/1960
|
2025-03-24 15:38:07 +08:00 |
|
liaodanlong
|
89a2260adc
|
日志修改
|
2025-03-24 15:16:55 +08:00 |
|
胡尧
|
c5ad94c5f3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-24 14:56:16 +08:00 |
|
廖丹龙
|
02e0a792d4
|
Accept Merge Request #1959: (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/1959
|
2025-03-24 14:55:24 +08:00 |
|
liaodanlong
|
e6d54a3eba
|
调拨单零件图号零件名称计算逻辑 错误处理
|
2025-03-24 14:53:33 +08:00 |
|
胡尧
|
43c6686240
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-24 14:29:47 +08:00 |
|
廖丹龙
|
9b73ae26e8
|
Accept Merge Request #1958: (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/1958
|
2025-03-24 14:28:44 +08:00 |
|
liaodanlong
|
a0606842e5
|
过滤错误
|
2025-03-24 14:26:53 +08:00 |
|
liaodanlong
|
d014ba980b
|
过滤错误
|
2025-03-24 14:25:19 +08:00 |
|
mgw
|
5c35eae859
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-24 14:03:21 +08:00 |
|
马广威
|
9df76253de
|
Accept Merge Request #1957: (feature/制造功能优化 -> develop)
Merge Request: 恢复按钮控制
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1957?initial=true
|
2025-03-24 14:02:16 +08:00 |
|
mgw
|
8ba71ea8af
|
恢复按钮控制
|
2025-03-24 14:01:35 +08:00 |
|
mgw
|
fde28bed8a
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-24 13:54:14 +08:00 |
|
马广威
|
8fed12f7bb
|
Accept Merge Request #1956: (feature/制造功能优化 -> develop)
Merge Request: 调整按钮显隐逻辑
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1956?initial=true
|
2025-03-24 13:52:46 +08:00 |
|
mgw
|
489d7030f4
|
调整按钮显隐逻辑
|
2025-03-24 13:52:08 +08:00 |
|
mgw
|
16ae845ad9
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-24 13:41:39 +08:00 |
|
马广威
|
2c1d90ae63
|
Accept Merge Request #1955: (feature/制造功能优化 -> develop)
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1955?initial=true
|
2025-03-24 13:40:20 +08:00 |
|
mgw
|
8e21434fba
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化
|
2025-03-24 13:39:46 +08:00 |
|
mgw
|
956cefbd9f
|
调整按钮显隐
|
2025-03-24 13:39:19 +08:00 |
|
mgw
|
85789d137b
|
修复线上pdf版本报告变形
|
2025-03-24 13:35:43 +08:00 |
|