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

4417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinling.yang
38c4aba45c 根据工序生成工单 2024-11-08 18:01:23 +08:00
jinling.yang
e981d68805 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 
# Conflicts:
#	sf_manufacturing/models/stock.py
#	sf_manufacturing/security/ir.model.access.csv
 2024-11-08 09:27:45 +08:00
jinling.yang
d419efa3c3 优化工艺确认 2024-11-07 17:59:28 +08:00
马广威
8b4eb325ef Accept Merge Request #1493: (feature/制造功能优化 -> develop) 
Merge Request: 询价单区分类型

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1493?initial=true
 2024-11-07 16:40:11 +08:00
mgw
4d7b1f557b 询价单区分类型 2024-11-07 14:26:33 +08:00
禹翔辉
1699f61d3f Accept Merge Request #1492: (feature/客供料入库单优化_1 -> 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/1492?initial=true
 2024-11-07 11:24:19 +08:00
yuxianghui
a0eec00749 暂时删除权限 2024-11-07 11:22:31 +08:00
禹翔辉
f5365b4a3a Accept Merge Request #1491: (feature/客供料入库单优化_1 -> develop) 
Merge Request: 1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法；

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1491?initial=true
 2024-11-07 10:45:30 +08:00
yuxianghui
8b9aa1c454 Merge branch 'feature/客供料入库单优化' into feature/客供料入库单优化_1 2024-11-07 10:43:58 +08:00
yuxianghui
9a4d7e87ec 1、处理销售单的依赖导致的更新报错问题；2、优化客供料单据获取销售单字段信息和成品信息方法； 2024-11-07 10:43:08 +08:00
jinling.yang
01df55ef35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 
# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv
 2024-11-06 17:54:29 +08:00
杨金灵
b434329fc4 Accept Merge Request #1490: (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/1490
 2024-11-06 17:50:43 +08:00
jinling.yang
72998f04c6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/添加工艺工程师权限组 2024-11-06 17:49:01 +08:00
jinling.yang
23db164452 制造模块添加工艺工程师权限组 2024-11-06 17:48:27 +08:00
jinling.yang
1f11d188c1 添加工艺工程师权限组 2024-11-06 17:46:14 +08:00
jinling.yang
fa30e0c1da 添加工艺设计 2024-11-06 17:44:13 +08:00
禹翔辉
5106768330 Accept Merge Request #1489: (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/1489?initial=true
 2024-11-06 17:27:52 +08:00
yuxianghui
6c0d9486fc Merge branch 'feature/报价单优化' into feature/客供料入库单优化 2024-11-06 17:24:57 +08:00
yuxianghui
211d74d9ff 处理 客供料入库单优化 需求 2024-11-06 17:24:10 +08:00
jinling.yang
84db3a92be 表面工艺外协采购单添加“采购类型",默认consignment（委外加工） 2024-11-06 10:46:21 +08:00
jinling.yang
487a2936c3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 2024-11-06 10:41:27 +08:00
jinling.yang
aa9bdfe372 添加工艺设计 2024-11-06 10:40:11 +08:00
马广威
6134ac3b4c Accept Merge Request #1488: (feature/制造功能优化 -> develop) 
Merge Request: 添加采购类型字段

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1488
 2024-11-06 09:24:43 +08:00
mgw
85c24e3d94 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-11-06 09:23:42 +08:00
mgw
106945fba7 添加采购类型字段 2024-11-06 09:23:14 +08:00
yuxianghui
8ea72198ea 1、完成报价单优化需求；2、修改制造订单内装夹工单的‘返工’按钮为’异常反馈‘ 2024-11-05 17:52:18 +08:00
禹翔辉
41cd76ad14 Accept Merge Request #1486: (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/1486?initial=true
 2024-11-05 09:53:48 +08:00
yuxianghui
e20510bc4f Merge branch 'feature/工单优化_返工' into feature/部分警告信息处理 2024-11-05 09:52:07 +08:00
yuxianghui
1d14ab27af 警告信息处理 2024-11-05 09:50:24 +08:00
jinling.yang
7d6699fe7a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作 2024-11-01 16:00:53 +08:00
胡尧
fd55abec72 Accept Merge Request #1485: (release/release_2.5 -> develop) 
Merge Request: 在下发编程单时，如果已经排程，在修改工单起止时间时先设置大的结束时间，避免设置时间出错

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1485
 2024-10-31 11:34:46 +08:00
胡尧
76597f6ccb 在下发编程单时，如果已经排程，在修改工单起止时间时先设置大的结束时间，避免设置时间出错 2024-10-31 11:15:06 +08:00
管欢
d7779e969d Accept Merge Request #1483: (feature/weid_sync_update -> develop) 
Merge Request: 用户创建员工同时修改用户的企微id

Created By: @管欢
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1483
 2024-10-29 15:55:39 +08:00
guanhuan
9d28eccd1b 用户创建员工同时修改用户的企微id 2024-10-29 15:50:38 +08:00
管欢
27339afaae Accept Merge Request #1482: (feature/weid_sync_update -> develop) 
Merge Request: 修改员工绑定用户同时修改用户的企微id

Created By: @管欢
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1482
 2024-10-29 15:05:59 +08:00
guanhuan
8dc3f2698b 修改员工绑定用户同时修改用户的企微id 2024-10-29 14:50:00 +08:00
马广威
4fd7ad8d03 Accept Merge Request #1481: (feature/制造功能优化 -> develop) 
Merge Request: rfid手动输入推送

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1481?initial=true
 2024-10-29 14:30:06 +08:00
mgw
3bc33fe2fc Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-10-29 14:28:44 +08:00
mgw
c21319a127 rfid手动输入推送 2024-10-29 14:28:24 +08:00
管欢
02e21a8fde Accept Merge Request #1480: (feature/weid_sync_update -> develop) 
Merge Request: 修改和新增员工时根据邮箱获取企微id

Created By: @管欢
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @管欢
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1480
 2024-10-29 11:10:47 +08:00
管欢
2cf578de65 Accept Merge Request #1479: (feature/message_update -> 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/1479
 2024-10-29 09:02:03 +08:00
guanhuan
9665cdfc84 发送消息添加权限 2024-10-29 08:58:33 +08:00
胡尧
bef7376827 Accept Merge Request #1478: (feature/plan_slow -> develop) 
Merge Request: 增加日志

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1478?initial=true
 2024-10-28 17:43:21 +08:00
胡尧
e73e9d6960 增加日志 2024-10-28 17:42:44 +08:00
胡尧
892f5d0e70 Accept Merge Request #1477: (feature/plan_slow -> develop) 
Merge Request: 增加销售订单确认日志

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1477?initial=true
 2024-10-28 17:26:58 +08:00
胡尧
61339da204 增加销售订单确认日志 2024-10-28 17:26:27 +08:00
胡尧
25db392864 Accept Merge Request #1476: (feature/plan_slow -> develop) 
Merge Request: 增加销售订单确认日志

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1476?initial=true
 2024-10-28 17:23:00 +08:00
胡尧
745fd429c2 增加销售订单确认日志 2024-10-28 17:21:51 +08:00
胡尧
5c59a27a81 增加采购总监消息推送权限 2024-10-28 16:30:46 +08:00
管欢
9bac3675f6 Accept Merge Request #1475: (feature/message_update -> 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/1475
 2024-10-28 11:54:04 +08:00