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

150 Commits

Author SHA1 Message Date
胡尧
1224e0e094 修改工单通知筛选条件 2024-10-23 15:38:09 +08:00
胡尧
a571a870d3 修改工单通知筛选条件 2024-10-23 15:33:48 +08:00
jinling.yang
39579aef10 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化加工质检 
# Conflicts:
#	sf_message/models/sf_message_maintenance_logs.py
 2024-10-23 11:56:16 +08:00
jinling.yang
1fe8fd6933 优化定时器代码 2024-10-23 11:55:43 +08:00
胡尧
5d8e0bda08 Accept Merge Request #1432: (feature/workorder_exceptions -> develop) 
Merge Request: 处理设备故障的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1432?initial=true
 2024-10-21 15:41:06 +08:00
胡尧
e9dbbaedf4 处理设备故障的问题 2024-10-21 15:40:38 +08:00
yuxianghui
571fb29482 Merge branch 'feature/用刀校验优化' into feature/工单状态优化 2024-10-18 09:14:39 +08:00
yuxianghui
19509a3ce2 1 2024-10-17 17:54:08 +08:00
胡嘉莹
4d424e90d3 Accept Merge Request #1420: (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/1420?initial=true
 2024-10-17 17:49:26 +08:00
hujiaying
9bbf613bcb 修改生成完工入库提醒，订单发货提醒跳转到表单详情 2024-10-17 17:39:43 +08:00
yuxianghui
135b97d4f8 1 2024-10-17 16:00:44 +08:00
jinling.yang
53fad50af6 修复工单定时器 2024-10-17 14:22:43 +08:00
杨金灵
9b275536e9 Accept Merge Request #1406: (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/1406?initial=true
 2024-10-17 10:10:51 +08:00
jinling.yang
4adc3b700a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单定时器修复时区问题 2024-10-16 15:32:47 +08:00
jinling.yang
296e30e5fd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-10-16 14:59:16 +08:00
jinling.yang
37217b0dd9 修复工单write方法 2024-10-16 14:46:31 +08:00
胡尧
92c4bcb049 解决冲突 2024-10-15 15:25:31 +08:00
胡尧
ce5cb17e31 工单异常处理 2024-10-15 15:14:16 +08:00
jinling.yang
f4daf94f7b 还原代码 2024-10-15 09:29:23 +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
jinling.yang
d8bade64e1 优化质量：添加加工质检 2024-10-11 17:52:33 +08:00
胡尧
a7b98f1e5e 解决销售单不能新增的bug 2024-10-11 15:03:46 +08:00
hujiaying
c3e40fd3aa 修改消息发送前已入库或已发货消息发送内容为null 2024-10-11 09:52:42 +08:00
hujiaying
22da51729b 修改项目升级初始化数据问题 2024-10-11 08:47:56 +08:00
jinling.yang
351815ad91 优化销售订单+工单逾期预警和已1逾期代码 2024-10-10 17:36:35 +08:00
hujiaying
d1ff7c196d 解决合并冲突 2024-10-10 16:08:23 +08:00
hujiaying
298d2391de Merge remote-tracking branch 'origin/develop' into feature/临时分支 
# Conflicts:
#	sf_message/models/sf_message_stock_picking.py
 2024-10-10 15:54:07 +08:00
hujiaying
49cbeee261 编写sf生产完工入库提醒，订单发货提醒代码 2024-10-10 15:52:14 +08:00
jinling.yang
02467d5220 优化工单消息推送 2024-10-09 17:58:47 +08:00
jinling.yang
2639a6ac6b 优化销售订单逾期和预警消息推送 2024-10-09 16:42:53 +08:00
廖丹龙
52c1992814 Accept Merge Request #1383: (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/1383
 2024-10-09 16:35:27 +08:00
liaodanlong
cc5452d14c 消息推送url链接逻辑修改 2024-10-09 10:26:20 +08:00
liaodanlong
5aff8c1737 消息推送url链接逻辑修改 2024-10-09 10:14:48 +08:00
jinling.yang
a00f4af923 优化销售订单逾期 2024-10-08 17:50:59 +08:00
jinling.yang
ccd01c9c75 优化合并多条发送销售订单逾期预警 2024-09-29 17:51:50 +08:00
管欢
ea88d8284a Accept Merge Request #1380: (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/1380
 2024-09-29 17:09:47 +08:00
guanhuan
d2ec420f57 域名获取修改 2024-09-29 17:05:42 +08:00
guanhuan
97d33adabd 域名获取修改 2024-09-29 17:03:49 +08:00
廖丹龙
6b4a7e35a9 Accept Merge Request #1375: (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/1375
 2024-09-29 16:48:53 +08:00
guanhuan
11100c9260 域名获取修改 2024-09-29 16:47:35 +08:00
jinling.yang
c1dc28488a 修复待接单路径 2024-09-29 16:42:32 +08:00
jinling.yang
c6065653f0 优化逾期 2024-09-29 16:40:52 +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
jinling.yang
34e2a49bef 注释部分不上的代码 2024-09-29 15:30:18 +08:00
jinling.yang
ff4bdd2f2d 还原代码 2024-09-29 15:27:27 +08:00
jinling.yang
47feb4cf3c 消息模版初始化添加相关模版 2024-09-29 15:24:28 +08:00
jinling.yang
ccdcd01372 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 
# Conflicts:
#	sf_message/__manifest__.py
 2024-09-29 09:18:07 +08:00