管欢
|
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 |
|
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 |
|
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 |
|
liaodanlong
|
a0606842e5
|
过滤错误
|
2025-03-24 14:26:53 +08:00 |
|
liaodanlong
|
d014ba980b
|
过滤错误
|
2025-03-24 14:25:19 +08:00 |
|
胡尧
|
3bb909c2ee
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-21 15:39:56 +08:00 |
|
yuxianghui
|
d202e7ee93
|
零件名称字段计算方法修改
|
2025-03-21 15:37:10 +08:00 |
|
mgw
|
311b95bca5
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-21 13:18:22 +08:00 |
|
廖丹龙
|
384761514b
|
Accept Merge Request #1943: (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/1943
|
2025-03-21 11:34:57 +08:00 |
|
liaodanlong
|
cf060d0d6c
|
自加工坯料制造订单的调拨单零件图号零件名称赋值
|
2025-03-20 10:24:34 +08:00 |
|
胡尧
|
0ff0cc5fbd
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-19 15:41:51 +08:00 |
|
廖丹龙
|
813939a6c2
|
Accept Merge Request #1936: (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/1936
|
2025-03-19 15:41:02 +08:00 |
|
liaodanlong
|
0b067f9999
|
原材料的调拨单缺少零件图号零件名称
|
2025-03-19 12:59:16 +08:00 |
|
mgw
|
da06688571
|
Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/commercially_launched
|
2025-03-19 11:02:40 +08:00 |
|
mgw
|
5b979ffc34
|
取消列表增加采购申请明细
|
2025-03-19 11:00:48 +08:00 |
|
胡尧
|
f6e87493d3
|
Merge branch 'develop' into feature/commercially_launched
|
2025-03-18 11:28:23 +08:00 |
|
廖丹龙
|
8c4c65a00f
|
Accept Merge Request #1919: (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/1919
|
2025-03-18 11:27:43 +08:00 |
|