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

4033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
guanhuan
45b6214ddd 消息模板初始数据 2024-09-27 09:33:17 +08:00
mgw
c96ff3f5b4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-09-27 09:20:36 +08:00
mgw
d84758232e 优化值为空时的逻辑 2024-09-27 09:20:19 +08:00
廖丹龙
479953e082 Accept Merge Request #1364: (feature/销售和排程添加消息推送 -> develop) 
Merge Request: r角默认值

Created By: @廖丹龙
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @廖丹龙
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1364?initial=true
 2024-09-27 09:12:03 +08:00
jinling.yang
27881589d4 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_message/__manifest__.py
#	sf_message/models/sf_message_workorder.py
 2024-09-27 09:10:19 +08:00
liaodanlong
79ec3f2c91 r角默认值 2024-09-27 09:09:48 +08:00
管欢
715b4181be Accept Merge Request #1363: (feature/销售和排程添加消息推送 -> develop) 
Merge Request: 删除重复we_employee_id

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1363
 2024-09-26 18:05:49 +08:00
liaodanlong
0ccda10c65 Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 2024-09-26 17:58:20 +08:00
liaodanlong
5b4376b5f9 r角默认值 2024-09-26 17:58:04 +08:00
guanhuan
1050f7616b 删除重复we_employee_id 2024-09-26 17:57:17 +08:00
禹翔辉
3a9cc0c09c Accept Merge Request #1362: (feature/下发编程优化 -> develop) 
Merge Request: 屏蔽重新下发编程单时调用删除CAM程序用刀计划记录方法

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1362?initial=true
 2024-09-26 16:38:07 +08:00
yuxianghui
4d63b90373 屏蔽重新下发编程单时调用删除CAM程序用刀计划记录方法 2024-09-26 16:36:49 +08:00
胡尧
43c4614650 Accept Merge Request #1361: (feature/程序用刀异常提醒 -> develop) 
Merge Request: 屏蔽title写死JIKIMO的代码

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1361
 2024-09-26 15:34:46 +08:00
胡尧
eba9ccf083 屏蔽title写死JIKIMO的代码 2024-09-26 15:33:39 +08:00
廖丹龙
947100a9d4 Accept Merge Request #1360: (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/1360?initial=true
 2024-09-26 14:57:11 +08:00
liaodanlong
ed4924651a Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 2024-09-26 14:55:32 +08:00
liaodanlong
3cc2bb94fe 刀具拆解消息推送 2024-09-26 14:54:43 +08:00
管欢
8ecb3eb50a Accept Merge Request #1358: (feature/销售和排程添加消息推送 -> develop) 
Merge Request: 消息通知url修改

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1358
 2024-09-26 14:09:10 +08:00
禹翔辉
819d89c278 Accept Merge Request #1359: (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/1359?initial=true
 2024-09-26 14:06:53 +08:00
yuxianghui
66d47c60bc Merge branch 'feature/CAM优化' into feature/刀具标准库同步接口优化 2024-09-26 14:05:09 +08:00
mgw
0340563749 筛选加工时间不为空的24h数据 2024-09-26 14:04:35 +08:00
yuxianghui
271e23a67f 1、刀具标准库数据同步接口优化 2024-09-26 14:01:03 +08:00
guanhuan
de42382f58 Merge branch 'refs/heads/feature/程序用刀异常提醒' into feature/销售和排程添加消息推送 
# Conflicts:
#	sf_message/models/sf_message_workorder.py
 2024-09-26 13:54:28 +08:00
guanhuan
3728809d10 消息通知url修改 2024-09-26 13:43:47 +08:00
guanhuan
d4e2ace8a6 消息通知url修改 2024-09-26 12:36:00 +08:00
mgw
1d4188df7e 增加24h的故障时间返回 2024-09-26 11:11:46 +08:00
胡尧
a2323293ca Accept Merge Request #1357: (feature/程序用刀异常提醒 -> develop) 
Merge Request: 无效刀判断后调用cloud发送消息推送接口

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1357
 2024-09-26 10:31:26 +08:00
胡尧
29bd1c2968 解决冲突 2024-09-26 10:30:40 +08:00
胡尧
6c35ec13fd 无效刀判断后调用cloud发送消息推送接口 2024-09-26 10:28:38 +08:00
廖丹龙
83107b05e2 Accept Merge Request #1356: (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/1356?initial=true
 2024-09-26 09:38:52 +08:00
liaodanlong
5fb7165306 调拨入库消息推送 2024-09-26 09:22:02 +08:00
liaodanlong
c569b60d5c 手动创建的拆解单不生成消息推送 2024-09-26 09:21:04 +08:00
mgw
bd2748659a 去掉关机率 2024-09-25 17:57:24 +08:00
jinling.yang
3ee233c0bc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-09-25 17:45:34 +08:00
jinling.yang
d63081dffa 优化销售订单+工单逾期 2024-09-25 17:45:15 +08:00
马广威
0932ec95bf Accept Merge Request #1355: (feature/制造功能优化 -> develop) 
Merge Request: 调整设备故障日志；增加24小时的运行数据

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1355?initial=true
 2024-09-25 16:32:12 +08:00
mgw
7361da0e5d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-09-25 16:29:05 +08:00
mgw
2dbddf532c 增加24小时的运行数据 2024-09-25 16:28:45 +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
d75504960a Merge remote-tracking branch 'origin/feature/销售和排程添加消息推送' into feature/销售和排程添加消息推送 2024-09-25 14:37:05 +08:00
liaodanlong
93efbf742e 产品刀具参数物料与物料号数据关联 2024-09-25 14:36:32 +08:00
guanhuan
7c3ac138b5 工单已下发通知 2024-09-25 14:31:31 +08:00
mgw
63444d3dd1 调整默认值 2024-09-25 14:10:11 +08:00
mgw
2fcad742b8 调整alarm logs的返回数据 2024-09-25 14:08:05 +08:00
mgw
f341ef5e83 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-09-25 13:51:09 +08:00
mgw
d488824e3d 增加分页接口；合并日志状态相同数据 2024-09-25 13:50:50 +08:00
杨金灵
0c28700f75 Accept Merge Request #1353: (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/1353
 2024-09-25 13:35:56 +08:00
禹翔辉
48d97f3e57 Accept Merge Request #1352: (feature/CAM优化 -> develop) 
Merge Request: 添加CNC缺刀创建CAM日志

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1352?initial=true
 2024-09-25 12:27:10 +08:00
jinling.yang
ef17c9920c 修复销售+排程消息推送 2024-09-25 12:00:46 +08:00
yuxianghui
ef643a5a72 Merge branch 'feature/程序用刀校验优化' into feature/CAM优化 2024-09-25 11:53:10 +08:00