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

5975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
廖丹龙
4634d43012 Accept Merge Request #1975: (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/1975
 2025-03-27 15:23:00 +08:00
liaodanlong
dd6e8b6707 调试信息 2025-03-27 15:21:15 +08:00
mgw
55337815c7 修改dashboard当日完成数据计算逻辑 2025-03-27 10:42:20 +08:00
廖丹龙
0ccb7cb3d1 Accept Merge Request #1974: (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/1974
 2025-03-26 17:24:40 +08:00
liaodanlong
d2155b17b4 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process 
# Conflicts:
#	sf_manufacturing/models/product_template.py
 2025-03-26 17:01:13 +08:00
liaodanlong
11a5217430 子制造订单零件图号与零件名称获取方式修改 2025-03-26 16:57:47 +08:00
管欢
855e0eb1c2 Accept Merge Request #1973: (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/1973
 2025-03-26 14:50:07 +08:00
guanhuan
6a70f3b88a 坯料冗余新增描述字段 2025-03-26 14:32:53 +08:00
guanhuan
236158d556 调拨单零件图号信息搜索 2025-03-26 13:35:28 +08:00
胡尧
1a67c5d1e3 Accept Merge Request #1971: (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/1971?initial=true
 2025-03-26 09:10:19 +08:00
胡尧
bdb8763fea 采购申请审批完成后状态变更 2025-03-26 09:07:01 +08:00
胡尧
78ed512699 Accept Merge Request #1970: (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/1970?initial=true
 2025-03-26 08:44:19 +08:00
胡尧
2e74c76e07 解决供货路线选择报错，采购申请审批状态编程已审批 2025-03-26 08:43:18 +08:00
胡尧
40dcd11da8 解决供货路线选择报错 2025-03-26 08:42:08 +08:00
胡尧
f9b40be428 Accept Merge Request #1969: (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/1969?initial=true
 2025-03-25 17:10:17 +08:00
胡尧
4ca655ad51 采购申请跳转到采购单，不默认筛选询价单 2025-03-25 17:09:22 +08:00
胡尧
a2ed102895 Accept Merge Request #1968: (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/1968?initial=true
 2025-03-25 16:27:55 +08:00
胡尧
8ec746858c 询价单行项目价格判断 2025-03-25 16:25:05 +08:00
胡尧
03539c7ed3 询价单行项目价格判断 2025-03-25 16:20:54 +08:00
胡尧
4d38a11c3c 修改询价单判断行项目价格不能为0 2025-03-25 15:58:24 +08:00
mgw
6312bb988a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-25 15:04:15 +08:00
马广威
2b082a0dd7 Accept Merge Request #1967: (feature/制造功能优化 -> develop) 
Merge Request: 调整报告样式；调整样式

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1967?initial=true
 2025-03-25 15:03:12 +08:00
mgw
3e9a11dd7b 调整样式 2025-03-25 15:02:26 +08:00
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