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

2097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jinling.yang
abdc522f9f 修复分配工厂创建订单和质检接口 2024-02-29 14:42:10 +08:00
jinling.yang
ec5297937d Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-29 11:23:29 +08:00
jinling.yang
ff768a6e5d Merge branch 'feature/修复质检接口' into develop 2024-02-29 11:22:35 +08:00
杨金灵
e0ffe68446 Accept Merge Request #873: (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/873?initial=true
 2024-02-29 11:22:21 +08:00
jinling.yang
0bc055b1a7 优化加工订单接口日志 2024-02-29 11:09:20 +08:00
jinling.yang
6b8789a54b 修复产品页面涉及到其他模型的访问权限 2024-02-29 11:03:02 +08:00
jinling.yang
d270eaefd0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复质检接口 2024-02-29 10:35:38 +08:00
jinling.yang
5dd89d3afc 修复质检接口 2024-02-29 10:34:18 +08:00
马广威
556e6ba261 Accept Merge Request #872: (feature/修改机床参数bug -> develop) 
Merge Request: 修改设备oee自动生成，设备刀库编码规则

Created By: @龚启豪
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/872#mr-872-review-128778
 2024-02-28 17:15:56 +08:00
qihao.gong@jikimo.com
75354c67db 修改设备oee自动生成，设备刀库编码规则 2024-02-28 17:14:42 +08:00
禹翔辉
cf7da65ff9 Accept Merge Request #871: (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/871?initial=true
 2024-02-28 16:55:34 +08:00
yuxianghui
17b167f1de Merge branch 'feature/必填字段添加红星样式' into feature/刀具物料序列号优化 2024-02-28 16:53:43 +08:00
yuxianghui
6937d59b9f 1、优化采购刀具物料时刀具物料的序列号生成规则 2024-02-28 16:52:27 +08:00
杨金灵
e2e8b0a287 Accept Merge Request #870: (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/870?initial=true
 2024-02-28 16:47:00 +08:00
jinling.yang
c89f3623f6 修复质检接口 2024-02-28 16:45:50 +08:00
马广威
a5122e2e18 Accept Merge Request #869: (feature/优化cnc程序和检测文件 -> develop) 
Merge Request: 优化cnc程序和检测文件及质量检测

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/869
 2024-02-28 16:08:57 +08:00
jinling.yang
7d96963b60 修复cnc程序排序 2024-02-28 16:03:26 +08:00
jinling.yang
b6acb48dbf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化cnc程序和检测文件 2024-02-28 15:54:10 +08:00
jinling.yang
0538763059 1.修复及优化质检接口2.质量检查新增检测报告和检测结果2个字段 2024-02-28 15:53:46 +08:00
黄焱
6a07c09686 Accept Merge Request #868: (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/868?initial=true
 2024-02-28 14:45:54 +08:00
黄焱
1c6544ffbf 修改，增加强制必填字段方法 2024-02-28 14:42:57 +08:00
黄焱
ab6a3f8b6b Accept Merge Request #867: (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/867?initial=true
 2024-02-27 17:58:21 +08:00
黄焱
f2c8bd7333 修改*样式，增加扫码枪判断 2024-02-27 17:57:00 +08:00
马广威
9d2e8d020b Accept Merge Request #866: (feature/制造代码优化 -> develop) 
Merge Request: 处理排程处按钮的显隐规则

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/866?initial=true
 2024-02-27 17:33:50 +08:00
mgw
586216fa01 代码优化 2024-02-27 17:33:08 +08:00
mgw
70038e05c8 处理排程处按钮的显隐规则 2024-02-27 17:23:15 +08:00
禹翔辉
e301a4d211 Accept Merge Request #865: (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/865
 2024-02-27 17:22:31 +08:00
yuxianghui
659f869d63 取消刀具安全库存的tree视图必填样式 2024-02-27 17:20:42 +08:00
yuxianghui
0952bc9b70 Merge branch 'feature/工单rfid解绑' into feature/必填字段添加红星样式 2024-02-27 17:17:19 +08:00
yuxianghui
0f8bee120b 1、新增必填字段前添加 * 的样式；2、给刀具管理模块的必填字段添加红星样式； 2024-02-27 17:15:22 +08:00
马广威
e4e03e1765 Accept Merge Request #864: (feature/制造代码优化 -> develop) 
Merge Request: 增加中控接口返回对工单、计划单属性的改变（状态，时间等）

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/864
 2024-02-27 15:52:08 +08:00
mgw
27c83f7d3c Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造代码优化 2024-02-27 15:49:34 +08:00
mgw
391dedc7b1 产品加工进度反馈给销售订单 2024-02-27 15:47:16 +08:00
mgw
fdddf19d13 增加中控接口返回对工单、计划单属性的改变（状态，时间等） 2024-02-27 11:42:59 +08:00
杨金灵
46f74405a1 Accept Merge Request #863: (feature/去掉多余定义的bfm_url -> develop) 
Merge Request: 去掉多余定义的bfm_url

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/863?initial=true
 2024-02-27 11:24:43 +08:00
jinling.yang
de6db3c313 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/去掉多余定义的bfm_url 2024-02-27 11:21:18 +08:00
jinling.yang
2ddff54311 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-27 11:21:05 +08:00
jinling.yang
a423d0c3bf 去掉多余定义的bfm_url 2024-02-27 11:20:32 +08:00
龚启豪
d684dfe8d0 Accept Merge Request #862: (feature/修改机床参数bug -> 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/862?initial=true
 2024-02-27 10:52:51 +08:00
qihao.gong@jikimo.com
e22e4801c1 修改工单布局 2024-02-27 10:51:50 +08:00
jinling.yang
8b7de5ec25 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-27 10:50:17 +08:00
jinling.yang
a1afcc517a Merge branch 'feature/优化工单搜索' into develop 2024-02-27 10:49:34 +08:00
杨金灵
25eab5c203 Accept Merge Request #861: (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/861?initial=true
 2024-02-27 10:49:20 +08:00
jinling.yang
545c1a0407 修复销售总监审核未通过审核按钮未隐藏 2024-02-27 10:46:41 +08:00
jinling.yang
42acd22978 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop 2024-02-27 10:38:43 +08:00
jinling.yang
3ff8e6d0f8 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化工单搜索 2024-02-27 10:38:32 +08:00
jinling.yang
424754db1a 1.工单查询页面新增工序类型和状态搜索面板 
2.销售模块新增delivery依赖
 2024-02-27 10:37:59 +08:00
禹翔辉
dfada55cf7 Accept Merge Request #860: (feature/工单rfid解绑 -> develop) 
Merge Request: 解除装夹工单时解除RFID码和工单的绑定关系

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/860
 2024-02-26 17:22:08 +08:00
yuxianghui
7f50a3f1d3 Merge branch 'feature/刀具物料搜索计算方法优化' into feature/工单rfid解绑 2024-02-26 17:19:45 +08:00
龚启豪
ed1a528fa7 Accept Merge Request #859: (feature/修改机床参数bug -> 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/859?initial=true
 2024-02-26 17:12:03 +08:00