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

5813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
b39281d057 调整报告编号 2025-03-25 10:32:12 +08:00
mgw
fd9018a4c8 调整完成逻辑取值 2025-03-25 09:56:40 +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
廖丹龙
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
廖丹龙
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
廖丹龙
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
马广威
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
马广威
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
马广威
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
禹翔辉
6e731cfadc Accept Merge Request #1954: (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/1954
 2025-03-24 13:17:57 +08:00
yuxianghui
f51f8bebb2 新增按规格生成的采购申请订单跳过审核环节自动更新为已批准状态 2025-03-24 13:16:02 +08:00
胡尧
2bd18def8f Accept Merge Request #1953: (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/1953?initial=true
 2025-03-24 11:13:10 +08:00
胡尧
61b2b05367 修改采购单需要审批提醒的方式 2025-03-24 11:11:50 +08:00
马广威
e7b4f51736 Accept Merge Request #1952: (feature/制造功能优化 -> develop) 
Merge Request: 调整报告样式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1952
 2025-03-24 11:02:08 +08:00
mgw
8832b01408 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-24 11:01:11 +08:00
mgw
a5c5b499f1 调整报告样式 2025-03-24 11:00:49 +08:00
胡尧
4212ed763b Accept Merge Request #1951: (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/1951?initial=true
 2025-03-24 09:54:48 +08:00
胡尧
a6ac46617d 取消物流单屏蔽 2025-03-24 09:54:04 +08:00
胡尧
43ba241b42 增加采购申请翻译 2025-03-24 09:51:05 +08:00
马广威
d9d434d994 Accept Merge Request #1950: (feature/制造功能优化 -> develop) 
Merge Request: 调整报告样式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1950?initial=true
 2025-03-21 18:26:18 +08:00
mgw
08fa26d9c8 调整报告样式 2025-03-21 18:25:20 +08:00
马广威
4ba3a56794 Accept Merge Request #1949: (feature/制造功能优化 -> develop) 
Merge Request: 增加已批准为无异动

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1949?initial=true
 2025-03-21 18:17:32 +08:00
mgw
4c995d00d0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-21 18:16:18 +08:00
mgw
30b01b6e2c 增加已批准为无异动 2025-03-21 18:15:37 +08:00
胡尧
19a66d2c81 屏蔽物流下单按钮 2025-03-21 16:44:49 +08:00
禹翔辉
b2b9120577 Accept Merge Request #1948: (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/1948
 2025-03-21 16:14:32 +08:00
yuxianghui
ad8f63570d 请购明细添加供货方式搜索 2025-03-21 16:10:30 +08:00
禹翔辉
e8b22cedea Accept Merge Request #1947: (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/1947
 2025-03-21 15:39:00 +08:00
yuxianghui
d202e7ee93 零件名称字段计算方法修改 2025-03-21 15:37:10 +08:00
胡尧
2876d56803 Accept Merge Request #1946: (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/1946?initial=true
 2025-03-21 15:29:22 +08:00
胡尧
e1fd4c465e 销售订单自动确认 2025-03-21 15:27:11 +08:00
禹翔辉
31820dfef1 Accept Merge Request #1945: (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/1945
 2025-03-21 15:07:48 +08:00
yuxianghui
1cb46bb1e1 Merge branch 'feature/采购申请代码搬迁' into feature/采购申请字段调整 2025-03-21 15:06:29 +08:00
yuxianghui
80e9085e29 采购申请字段调整 2025-03-21 15:05:42 +08:00
马广威
d1f8bdb1f4 Accept Merge Request #1944: (feature/制造功能优化 -> develop) 
Merge Request: 调整原有质检单图纸获取逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1944
 2025-03-21 13:17:11 +08:00
mgw
08267ba1e6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-21 13:16:18 +08:00
mgw
c6f1bc80a7 调整原有质检单图纸获取逻辑 2025-03-21 13:15:59 +08:00