jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,644 Commits 134 Branches 31 Tags
795b4d43a83dab15737f48ffec377999b151912c
Commit Graph

2644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
马广威
795b4d43a8 Accept Merge Request #1025: (feature/制造代码优化 -> develop) 
Merge Request: 修复仓储岗位权限遗留问题，暂时去掉根据CNC工单是否有编程单来控制装夹预调工单状态的功能，待重议此需求逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1025?initial=true
 2024-05-18 15:15:46 +08:00
mgw
d9d1f86407 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-05-18 15:14:38 +08:00
mgw
337fecb4cb 暂时去掉根据CNC工单是否有编程单来控制装夹预调工单状态的功能，待重议此需求逻辑 2024-05-18 15:01:09 +08:00
马广威
4be83d8aab Accept Merge Request #1024: (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/1024#mr-1024-review-151348
 2024-05-18 11:57:27 +08:00
yuxianghui
049521064b Merge branch 'feature/oca审批修改' into feature/刀具模块优化 2024-05-18 11:55:20 +08:00
yuxianghui
9e2091597b 1、注释action_apply_inventory()方法；2、功能刀具安全库存添加one2many类型的功能刀具废弃many2many类型的关联字段并优化代码，并在功能刀具模型添加功能按钮用来绑定功能刀具和对应的功能刀具安全库存；3、优化根据库存创建功能刀具组装单的方法断定条件；4、优化刀具注册接口的报错处理；5、优化组装流程 2024-05-18 11:54:23 +08:00
杨金灵
01f82fcb5d Accept Merge Request #1023: (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/1023?initial=true
 2024-05-18 11:18:46 +08:00
jinling.yang
939aa974e6 修复外协位置 2024-05-18 11:17:11 +08:00
jinling.yang
829c971848 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-05-18 10:29:43 +08:00
mgw
a4b2d5bb42 修复仓储岗位权限遗留问题 2024-05-18 10:29:02 +08:00
jinling.yang
ebdc1ec2ff Merge branch 'feature/修改表面工艺外协位置' into develop 2024-05-18 10:27:50 +08:00
杨金灵
f0d66b7730 Accept Merge Request #1022: (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/1022
 2024-05-18 10:27:18 +08:00
jinling.yang
a935112134 外协代码还原 2024-05-18 10:24:31 +08:00
jinling.yang
70bc2ed718 修改表面工艺外协位置 2024-05-18 10:21:09 +08:00
jinling.yang
c230e550a9 Merge branch 'feature/修复表面工艺工单完成问题' into develop 2024-05-17 17:26:20 +08:00
jinling.yang
297bf76809 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成问题 2024-05-17 16:34:23 +08:00
jinling.yang
2dc9866735 1.修复表面工艺工单完成报错2.外协位置改为供应商位置3.采购总监添加创建制造订单权限 2024-05-17 16:26:15 +08:00
禹翔辉
305e91e7f1 Accept Merge Request #1020: (feature/oca审批修改 -> develop) 
Merge Request: 1、优化组装流程；2、添加权限；3、oca审批优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1020?initial=true
 2024-05-17 15:00:58 +08:00
yuxianghui
a5b9b63b41 Merge branch 'feature/主流程bug处理' into feature/oca审批修改 2024-05-17 14:57:46 +08:00
yuxianghui
1a0e96bbdd 1、采购审批流程中的英文提示信息改为中文提示；当审批完成后隐藏取消审批按键；2、刀具注册接口添加调用接口提示； 2024-05-17 14:56:15 +08:00
马广威
095c15cba4 Accept Merge Request #1019: (feature/制造代码优化 -> develop) 
Merge Request: 显示优化，物流下单增补逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1019?initial=true
 2024-05-17 11:48:21 +08:00
mgw
fe6bb46d54 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-05-17 11:47:44 +08:00
mgw
432a012596 显示优化，物流下单增补逻辑 2024-05-17 11:47:26 +08:00
杨金灵
27b5e92563 Accept Merge Request #1018: (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/1018?initial=true
 2024-05-17 11:32:45 +08:00
jinling.yang
e5164454f2 修复销售确认按钮 2024-05-17 11:31:07 +08:00
jinling.yang
b79cdea926 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-05-17 11:10:49 +08:00
jinling.yang
836a598cf8 Merge branch 'feature/表面工艺外协修复' into develop 2024-05-17 11:10:02 +08:00
杨金灵
3a0a4b0f15 Accept Merge Request #1017: (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/1017?initial=true
 2024-05-17 11:07:46 +08:00
jinling.yang
cda0b6d345 还原OCC代码 2024-05-17 11:04:35 +08:00
jinling.yang
7e31869d1f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复 
# Conflicts:
#	sf_sale/views/sale_order_view.xml
 2024-05-17 11:00:58 +08:00
jinling.yang
ea1ed43c92 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复 2024-05-17 11:00:00 +08:00
yuxianghui
eb83114e54 1、优化组装流程；2、添加权限 2024-05-16 17:34:38 +08:00
禹翔辉
af45775040 Accept Merge Request #1016: (feature/主流程bug处理 -> develop) 
Merge Request: 主流程bug处理

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1016
 2024-05-16 14:16:06 +08:00
yuxianghui
03f5027f49 Merge branch 'feature/优化产品' into feature/主流程bug处理 2024-05-16 14:13:40 +08:00
yuxianghui
20ecd9d949 1、将和刀具相关的模型的刀具直径字段类型从int改为float；2、标准刀库tree视图添加Rfid字段；优化从中控获取标准刀库信息接口； 2024-05-16 14:04:35 +08:00
马广威
ed2c119803 Accept Merge Request #1015: (feature/制造代码优化 -> develop) 
Merge Request: 处理物流处修改销售订单状态问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1015?initial=true
 2024-05-16 09:44:13 +08:00
yuxianghui
37cf4ca435 1、新增sf_oca模块 2024-05-16 09:42:35 +08:00
yuxianghui
1c441d388f 1、序列号模型添加Rfid字段的重复校验；功能刀具模型优化搜索视图的字段；优功能刀具组装流程的值 2024-05-16 09:41:57 +08:00
mgw
d244409d9c 处理物流处修改销售订单状态问题 2024-05-15 14:09:44 +08:00
禹翔辉
1a66d6728e Accept Merge Request #1014: (feature/优化产品 -> develop) 
Merge Request: 1、优化CNC加工流程

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1014
 2024-05-14 15:57:26 +08:00
yuxianghui
002c5c06b4 1、优化CNC加工流程 2024-05-14 15:55:34 +08:00
禹翔辉
de62801ef1 Accept Merge Request #1013: (feature/优化产品 -> 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/1013
 2024-05-14 14:20:10 +08:00
yuxianghui
62ec721c69 1 2024-05-14 14:19:44 +08:00
yuxianghui
2194374aa2 Merge branch 'feature/解决bug、优化权限' into feature/优化产品 2024-05-14 14:11:39 +08:00
yuxianghui
eff6ce9f1b 1、关闭产品、采购单中关联字段的创建功能；2、优化采购入库验证条件； 2024-05-14 14:09:42 +08:00
杨金灵
9fcfaee8d1 Accept Merge Request #1012: (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/1012?initial=true
 2024-05-14 11:02:27 +08:00
jinling.yang
90aae4dad9 销售订单按创建时间倒序 2024-05-14 10:59:35 +08:00
jinling.yang
934b59d213 坯料新增路线 2024-05-14 10:51:38 +08:00
jinling.yang
ed9b575fb5 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-05-13 14:04:30 +08:00
禹翔辉
bcd7ae9dd1 Accept Merge Request #1011: (feature/解决bug、优化权限 -> develop) 
Merge Request: 1、添加权限；2、设备的设备检修标准字段关闭创建功能；3、解决 销售经理创建报价单选择产品后没有把模型和价格带过去 的bug；4、关闭仓库创建按钮

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1011
 2024-05-13 12:01:16 +08:00