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

1541 Commits

Author SHA1 Message Date
廖丹龙
c6f625fe44 Accept Merge Request #2027: (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/2027
 2025-04-22 13:49:59 +08:00
liaodanlong
41e4d2656a 采购申请单 2025-04-22 13:39:57 +08:00
liaodanlong
4272d2855f 坯料自动勾选工艺路线 2025-04-22 13:38:50 +08:00
liaodanlong
cbc73ee8e3 工艺相关展示调整 2025-04-21 16:04:36 +08:00
廖丹龙
73dce5e75e Accept Merge Request #2025: (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/2025
 2025-04-21 15:00:30 +08:00
liaodanlong
9b009ec5a3 外协工单采购申请查询问题 2025-04-21 14:55:52 +08:00
liaodanlong
7d70184a5d 外协工单采购申请查询问题 2025-04-21 14:55:20 +08:00
liaodanlong
9f9c08b1f0 制造订单采购申请查询问题 2025-04-21 14:35:57 +08:00
胡尧
7849ce6342 工单列表增加模型ID搜索 2025-04-21 11:25:37 +08:00
胡尧
acd8d9c758 Accept Merge Request #2019: (feature/6694 -> develop) 
Merge Request: 去掉多余的代码

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2019?initial=true
 2025-04-21 09:23:48 +08:00
胡尧
9f1cac0789 去掉多余的代码 2025-04-21 09:10:20 +08:00
廖丹龙
1d45486e20 Accept Merge Request #2016: (feature/tool_standard_library_process -> develop) 
Merge Request: sf-制造-表面工艺-菜单名称修改

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2016
 2025-04-18 16:46:38 +08:00
胡尧
3355731632 Accept Merge Request #2015: (feature/6694 -> develop) 
Merge Request: 增加打印模块,增加工单下发后打印程序单

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2015?initial=true
 2025-04-18 16:07:01 +08:00
liaodanlong
ddd902cad8 修改创建表面工艺产品时表面工艺参数不能为空的问题 2025-04-18 16:06:08 +08:00
liaodanlong
79006e062a 1.限制工序-作业配置 产品只能选中一个 
2.添加产品下拉框查询过滤
3.产品选择框可以跳转到产品页面
 2025-04-18 15:44:13 +08:00
胡尧
ee9783d4a6 增加打印模块,增加工单下发后打印程序单 2025-04-18 14:50:03 +08:00
管欢
be639d7631 Accept Merge Request #2013: (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/2013
 2025-04-18 14:08:29 +08:00
guanhuan
66c745af3c 排序优化 2025-04-18 13:22:25 +08:00
管欢
f92b844c16 Accept Merge Request #2012: (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/2012
 2025-04-18 09:50:58 +08:00
liaodanlong
a4f8183654 更新工艺外协流程的采购单查询逻辑 2025-04-17 17:02:43 +08:00
liaodanlong
3fb2890bf1 更新工艺外协流程的报错问题 2025-04-17 16:32:18 +08:00
liaodanlong
1b22d02700 Merge branch 'refs/heads/develop' into feature/tool_standard_library_process 
# Conflicts:
#	sf_manufacturing/models/__init__.py
 2025-04-17 14:35:24 +08:00
liaodanlong
962931bc9d 外协流程更改 2025-04-17 14:29:06 +08:00
guanhuan
9cfc8418ec 优化库存排序 2025-04-17 13:44:25 +08:00
胡尧
c67944f689 增加工单下发时打印编程文件pdf的功能 2025-04-17 13:15:48 +08:00
liaodanlong
61a3cf606e 表面工艺数据内置与数据同步调整 2025-04-14 15:23:47 +08:00
胡尧
10bea40159 增加不同工作中心配置相同接驳站的功能 2025-04-08 10:29:29 +08:00
胡尧
d7597359ba 处理多个表面工艺，确认供货路线报错的问题 2025-03-31 16:50:50 +08:00
胡尧
1d857be16a 修改获取编程文件根目录 2025-03-31 09:28:30 +08:00
胡尧
21148ae74b 屏蔽sf获取编程文件的逻辑 2025-03-31 09:06:36 +08:00
胡尧
b55c6c1fe7 修改前置三元检测文件根目录 2025-03-30 11:16:40 +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
胡尧
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
liaodanlong
878fef18df 产品加工面部代码还原 2025-03-28 10:03:41 +08:00
liaodanlong
77744e75d7 子制造订单零件图号零件名称问题 2025-03-27 16:38:57 +08:00
liaodanlong
dd6e8b6707 调试信息 2025-03-27 15:21:15 +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
guanhuan
236158d556 调拨单零件图号信息搜索 2025-03-26 13:35:28 +08:00
胡尧
40dcd11da8 解决供货路线选择报错 2025-03-26 08:42:08 +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
liaodanlong
6ad945b720 产品加工面板空值处理 2025-03-25 10:39:02 +08:00
liaodanlong
60539462a0 报错处理 2025-03-25 10:02:39 +08:00
liaodanlong
81b425ae0c 调拨单零件图号零件名称处理 2025-03-24 17:28:16 +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