jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,113 Commits 134 Branches 0 Tags
2af21bc4eed5e07c121b0911c9b2148f0240d9e3
Commit Graph

1219 Commits

Author SHA1 Message Date
胡尧
9ca9b337ef 解决sf_quality报错问题，增加单元测试 2024-10-16 10:19:41 +08:00
胡尧
92c4bcb049 解决冲突 2024-10-15 15:25:31 +08:00
杨金灵
284c66ad86 Merge branch refs/heads/develop into refs/heads/feature/销售订单和工单逾期消息推送 2024-10-15 09:17:21 +08:00
jinling.yang
8f2d5129b1 还原代码 2024-10-15 09:06:13 +08:00
jinling.yang
2a067778bc 优化质量检测(加工检测)及消息推送 2024-10-14 17:53:38 +08:00
胡尧
e2bd36ca16 工单异常处理 2024-10-14 15:18:27 +08:00
yuxianghui
e1af6ba2f5 1、完成 工件装夹工单详情页版面优化需求 2024-10-14 13:41:52 +08:00
yuxianghui
fdc2af4a39 Merge branch 'feature/销售订单按钮优化' into feature/制造订单功能刀具状态优化 2024-10-11 17:56:51 +08:00
jinling.yang
d8bade64e1 优化质量：添加加工质检 2024-10-11 17:52:33 +08:00
jinling.yang
351815ad91 优化销售订单+工单逾期预警和已1逾期代码 2024-10-10 17:36:35 +08:00
yuxianghui
25a90f3966 1、获取mrs编程接口优化，重新编程接口优化，创建CAM方法优化，cnc用刀校验逻辑优化 2024-10-10 17:31:56 +08:00
hujiaying
50bb50f5ab 修改计划排程，超过小时产能提示产线的小时产能以及超出的件数 2024-10-10 16:47:25 +08:00
mgw
f324453351 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-10-10 11:36:35 +08:00
mgw
d0f5aca707 调整24h开机时长为0的问题；去掉x偏差角度的控制 2024-10-10 11:36:18 +08:00
胡尧
f0cb047e8c Accept Merge Request #1387: (release/release_2.4 -> develop) 
Merge Request: 解决空料架配送的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1387
 2024-10-10 11:06:01 +08:00
胡尧
b74bc62804 处理下发AGV小车任务报错的问题 2024-10-10 10:49:16 +08:00
yuxianghui
f18c0e3eaf 1、重构cnc用刀校验方法，优化下发编程单后校验cnc用刀的逻辑；2、优化CAM创建方法；3、优化获取mrs编程单接口、优化编程单更新接口； 2024-10-09 17:52:20 +08:00
hujiaying
a1b9f2dd3b 产品看板新增品牌字段，如果产品没有品牌字段则不展示品牌字段 2024-10-09 16:21:14 +08:00
胡尧
e4c845a9f6 解决空料架配送不能正常下发AGV任务的问题 2024-10-09 14:08:38 +08:00
胡尧
d239509299 解决空料架配送不能正常下发AGV任务的问题 2024-10-09 13:53:49 +08:00
胡嘉莹
941c3ca43a Accept Merge Request #1379: (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/1379?initial=true
 2024-09-29 16:47:10 +08:00
hujiaying
05f9528ca9 修改计划排程代码 2024-09-29 16:44:48 +08:00
jinling.yang
fd0de5ae09 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送 
# Conflicts:
#	sf_message/__manifest__.py
#	sf_message/data/bussiness_node.xml
#	sf_message/models/sf_message_sale.py
 2024-09-29 15:43:19 +08:00
胡嘉莹
50d63c28d6 Accept Merge Request #1374: (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/1374?initial=true
 2024-09-29 10:36:32 +08:00
hujiaying
73b7ff7d1b 修改计划排程选择日期有生成量，不能排程问题 2024-09-29 10:33:19 +08:00
廖丹龙
54ed90e892 Accept Merge Request #1365: (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/1365?initial=true
 2024-09-27 10:32:56 +08:00
liaodanlong
f8060113d9 产品关联数据字段修改 2024-09-27 10:14:13 +08:00
jinling.yang
7235f242b2 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单和工单逾期消息推送 
# Conflicts:
#	sf_message/__manifest__.py
#	sf_message/data/bussiness_node.xml
 2024-09-27 09:11:56 +08:00
yuxianghui
4d63b90373 屏蔽重新下发编程单时调用删除CAM程序用刀计划记录方法 2024-09-26 16:36:49 +08:00
管欢
eb867e62d8 Accept Merge Request #1354: (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/1354
 2024-09-25 14:39:12 +08:00
liaodanlong
93efbf742e 产品刀具参数物料与物料号数据关联 2024-09-25 14:36:32 +08:00
jinling.yang
2e3a9a8b80 添加提醒时间 2024-09-25 11:18:37 +08:00
胡尧
ea7380288c Accept Merge Request #1347: (feature/流程用扫码完成 -> develop) 
Merge Request: 修改任务下发逻辑

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1347?initial=true
 2024-09-24 11:43:54 +08:00
胡尧
9beecab21d 修改任务下发逻辑 2024-09-24 11:42:58 +08:00
mgw
e9ab4270a9 调整记录匹配条件；优化排程单状态变化 2024-09-23 14:29:52 +08:00
mgw
e19cb52e70 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-09-23 12:08:30 +08:00
mgw
5269d09d0e 去掉工单明细处删除按钮；已完成工单取24小时内 2024-09-23 12:08:02 +08:00
yuxianghui
4cee5213bb 产品字段值优化 2024-09-23 10:48:48 +08:00
mgw
68f8c94332 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-09-23 08:55:40 +08:00
mgw
ddfb233452 修复按钮固定条件显示问题 2024-09-23 08:55:23 +08:00
yuxianghui
4558fc0336 Merge branch 'feature/库存优化' into feature/刀具优化 2024-09-20 16:51:39 +08:00
yuxianghui
4609ec442a 1、刀具标准库优化，整体式刀具物料产品优化；刀具同步接口优化；2、新增组装单扫描确认组装和获取测量值功能；组装单更换物料弹窗信息优化； 2024-09-20 16:50:55 +08:00
mgw
7d877a0cbb 处理提示词制造订单重复问题；处理获取数据按钮显隐问题 2024-09-20 11:45:23 +08:00
胡尧
72c9c9872e Accept Merge Request #1326: (feature/流程用扫码完成 -> develop) 
Merge Request: 修复扫码确认后接驳站点被清除的bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1326?initial=true
 2024-09-20 09:39:21 +08:00
胡尧
2b541fe041 修复扫码确认后接驳站点被清除的bug 2024-09-20 09:38:32 +08:00
jinling.yang
63ac4f2b44 返工工单添加标签字段 2024-09-19 17:23:01 +08:00
mgw
c4069995e0 解除装夹处，扫码同步打印成品条码 2024-09-19 14:38:24 +08:00
mgw
47ad2410cf 调整agv参数位置 2024-09-19 10:16:09 +08:00
mgw
fa2eb7b3cf 增加是否获取文件判断 2024-09-19 10:07:26 +08:00
mgw
739b7e600c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化制造功能 2024-09-19 09:04:20 +08:00