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

6081 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
黄焱
ec3d2a9239 Accept Merge Request #2026: (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/2026?initial=true
 2025-04-21 16:04:32 +08:00
hyyy
a55da93dc4 修复样式问题 2025-04-21 16:01:04 +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
廖丹龙
5886b4e132 Accept Merge Request #2024: (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/2024
 2025-04-21 13:18:49 +08:00
liaodanlong
77478fd173 制造订单报错问题 2025-04-21 13:16:15 +08:00
胡尧
2154533ad5 Accept Merge Request #2023: (feature/6694 -> develop) 
Merge Request: 去掉打印模块的type字段

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2023?initial=true
 2025-04-21 13:15:22 +08:00
胡尧
eab7bf04c3 去掉打印模块的type字段 2025-04-21 13:15:02 +08:00
马广威
ba910f011e Accept Merge Request #2022: (feature/制造功能优化 -> develop) 
Merge Request: sf-质量检查-上传报告校验必填，及上传时检查图号跟产品的零件图号是否一致

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2022?initial=true
 2025-04-21 12:22:20 +08:00
mgw
c43d8ee280 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-04-21 12:20:56 +08:00
mgw
acc04f396d sf-质量检查-上传报告校验必填，及上传时检查图号跟产品的零件图号是否一致 2025-04-21 12:20:37 +08:00
胡尧
3425376705 Accept Merge Request #2021: (feature/6763 -> develop) 
Merge Request: 工单列表增加模型ID搜索

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2021?initial=true
 2025-04-21 11:26:29 +08:00
胡尧
7849ce6342 工单列表增加模型ID搜索 2025-04-21 11:25:37 +08:00
liaodanlong
69e8bf67d1 sf-制造-表面工艺可选参数-从cloud同步过来的数据，获取方式方式=外协 2025-04-21 10:04:59 +08:00
廖丹龙
722bdc251d Accept Merge Request #2020: (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/2020
 2025-04-21 09:53:27 +08:00
liaodanlong
0403a2d223 开放分组类型限制工艺参数字段显示 2025-04-21 09:52:52 +08:00
liaodanlong
7a4c3f155c 开放分组类型限制工艺参数字段显示 2025-04-21 09:52:24 +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
廖丹龙
d33a801f89 Accept Merge Request #2018: (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/2018
 2025-04-21 09:20:29 +08:00
liaodanlong
a74c07f0bb 字段名写错 2025-04-21 09:19:36 +08:00
胡尧
9f1cac0789 去掉多余的代码 2025-04-21 09:10:20 +08:00
廖丹龙
fcd0319a9c Accept Merge Request #2017: (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/2017
 2025-04-18 17:29:28 +08:00
liaodanlong
ed2c76adf1 工厂日历独立菜单到计划模块 2025-04-18 17:24:41 +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
liaodanlong
d209d40356 sf-制造-表面工艺-菜单名称修改 2025-04-18 16:39:09 +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
e5566edd7c sf_同步cloud表面工艺可选参数创建产品，修改产品名命名规则 2025-04-18 15:45:32 +08:00
liaodanlong
ea0f9d6ee2 sf-制造-作业-表单详情内，可选工艺参数手动新增编码规则跟外协服务产品名称不正确 2025-04-18 15:45:00 +08:00
liaodanlong
79006e062a 1.限制工序-作业配置 产品只能选中一个 
2.添加产品下拉框查询过滤
3.产品选择框可以跳转到产品页面
 2025-04-18 15:44:13 +08:00
胡尧
ee9783d4a6 增加打印模块,增加工单下发后打印程序单 2025-04-18 14:50:03 +08:00
马广威
ff7c4a9ce7 Accept Merge Request #2014: (feature/制造功能优化 -> develop) 
Merge Request: 调整设备可用率接口

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2014?initial=true
 2025-04-18 14:40:31 +08:00
mgw
48b94e8d84 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-04-18 14:39:11 +08:00
mgw
a395994a1c 调整设备可用率接口 2025-04-18 14:38:39 +08:00
mgw
43c29e30b0 暂时注释稼动率接口 2025-04-18 14:18:41 +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
mgw
29ee275840 增加上传支持格式 2025-04-18 13:00:45 +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
廖丹龙
63870ed7a9 Accept Merge Request #2011: (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/2011
 2025-04-18 09:07:24 +08:00
liaodanlong
558c99f48b 产品表面工艺参数更名为工艺参数 2025-04-18 09:00:06 +08:00
廖丹龙
1264a4305e Accept Merge Request #2010: (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/2010
 2025-04-17 17:13:54 +08:00
liaodanlong
a4f8183654 更新工艺外协流程的采购单查询逻辑 2025-04-17 17:02:43 +08:00
廖丹龙
3ea8e9d35f Accept Merge Request #2009: (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/2009
 2025-04-17 16:34:27 +08:00
liaodanlong
3fb2890bf1 更新工艺外协流程的报错问题 2025-04-17 16:32:18 +08:00
廖丹龙
0c3ba5c172 Accept Merge Request #2008: (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/2008
 2025-04-17 14:39: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