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

5969 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
4b5c3b383b 对工单的page页进行调整 2025-04-02 10:58:25 +08:00
黄焱
80f259651c Accept Merge Request #1986: (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/1986?initial=true
 2025-04-02 09:05:31 +08:00
hyyy
1c57ee0be1 修复没加引号字段 2025-04-02 09:04:38 +08:00
黄焱
c732bbad62 Accept Merge Request #1984: (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/1984?initial=true
 2025-04-02 08:54:03 +08:00
马广威
5285fcd066 Accept Merge Request #1985: (feature/制造功能优化 -> develop) 
Merge Request: 零件名称调为可写

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1985?initial=true
 2025-04-02 08:50:06 +08:00
mgw
d318d8cb32 零件名称调为可写 2025-04-02 08:49:24 +08:00
hyyy
5b9dc05653 还原代码 2025-04-02 08:48:27 +08:00
hyyy
a513592b21 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/前端样式修改 2025-04-02 08:36:23 +08:00
胡尧
e686ea9469 Accept Merge Request #1983: (feature/commercially_launched -> develop) 
Merge Request: Merge branch 'develop' into feature/commercially_launched

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1983
 2025-04-01 20:45:15 +08:00
胡尧
651918c51c Merge branch 'develop' into feature/commercially_launched 2025-04-01 20:42:36 +08:00
胡尧
7b13dfcc0e Accept Merge Request #1982: (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/1982
 2025-04-01 20:32:39 +08:00
liaodanlong
60e139d5e0 采购申请添加字段的翻译 2025-04-01 16:59:40 +08:00
胡尧
8d5ea0ae19 去掉采购申请不同补货组不能合并的检查 2025-04-01 11:07:08 +08:00
胡尧
d7597359ba 处理多个表面工艺，确认供货路线报错的问题 2025-03-31 16:50:50 +08:00
胡尧
f8309bfaba Merge branch 'develop' into feature/commercially_launched 2025-03-31 16:07:11 +08:00
胡尧
7ed756f922 修改报错翻译 2025-03-31 16:06:50 +08:00
禹翔辉
e837b84a50 Accept Merge Request #1981: (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/1981
 2025-03-31 15:57:51 +08:00
yuxianghui
e7cb100ab1 1、优化调拨单验证方法；2、隐藏请购明细列表视图字段 2025-03-31 15:55:37 +08:00
mgw
d00c9dd38c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-31 13:02:30 +08:00
胡尧
1d857be16a 修改获取编程文件根目录 2025-03-31 09:28:30 +08:00
马广威
5914e4ca6e Accept Merge Request #1980: (feature/制造功能优化 -> develop) 
Merge Request: 调整字段显隐

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1980?initial=true
 2025-03-31 09:12:35 +08:00
mgw
d96970fb96 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-31 09:11:44 +08:00
mgw
0af9064fce 调整字段显隐 2025-03-31 09:11:21 +08:00
胡尧
21148ae74b 屏蔽sf获取编程文件的逻辑 2025-03-31 09:06:36 +08:00
胡尧
1a3590b6b6 屏蔽物流下单的按钮 2025-03-30 15:03:18 +08:00
胡尧
b55c6c1fe7 修改前置三元检测文件根目录 2025-03-30 11:16:40 +08:00
mgw
8c61dcac29 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-28 14:25:58 +08:00
马广威
41d4e9785f Accept Merge Request #1979: (feature/制造功能优化 -> develop) 
Merge Request: 调整页脚布局

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1979?initial=true
 2025-03-28 14:24:14 +08:00
mgw
5bf86930e9 调整页脚布局 2025-03-28 14:23:41 +08:00
mgw
7ad9885377 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-28 14:05:29 +08:00
mgw
71433c18b7 Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-28 14:03:21 +08:00
马广威
4b60ad307b Accept Merge Request #1978: (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/1978?initial=true
 2025-03-28 14:02:11 +08:00
mgw
1a5c8e5f56 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-03-28 14:01:17 +08:00
mgw
8b1e12eb9f 质检报告优化 2025-03-28 14:00:55 +08:00
胡尧
dbf2257a88 Merge branch 'feature/commercially_launched' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched 2025-03-28 13:37:37 +08:00
胡尧
f34c01d1b0 解决表面工艺外协调拨单验证报错的问题 2025-03-28 13:37:29 +08:00
廖丹龙
9c73062593 Accept Merge Request #1977: (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/1977?initial=true
 2025-03-28 10:10:56 +08:00
liaodanlong
878fef18df 产品加工面部代码还原 2025-03-28 10:03:41 +08:00
liaodanlong
8348c4fc48 Merge branch 'refs/heads/develop' into feature/commercially_launched 2025-03-27 16:42:22 +08:00
廖丹龙
8643fb2385 Accept Merge Request #1976: (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/1976
 2025-03-27 16:41:19 +08:00
liaodanlong
77744e75d7 子制造订单零件图号零件名称问题 2025-03-27 16:38:57 +08:00
胡尧
4cbcf08da8 销售单默认筛选供货方式待确认 2025-03-27 16:10:07 +08:00
mgw
af2a589679 添加翻译文件 2025-03-27 15:59:39 +08:00
胡尧
4b6f04aa9d 修改字段显示位置 2025-03-27 15:51:16 +08:00
廖丹龙
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