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

5411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
胡尧
52e585e637 解决冲突 2025-02-20 13:51:24 +08:00
胡尧
05dac9fb0c 调整模型上传的流程 2025-02-20 13:36:05 +08:00
黄焱
cb2777ba3e Accept Merge Request #1825: (feature/前端样式修改 -> develop) 
Merge Request: sf-制造-功能刀具标准库字段样式调整

Created By: @黄焱
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1825?initial=true
 2025-02-20 11:37:34 +08:00
hyyy
e6ab17ca0d sf-制造-功能刀具标准库字段样式调整 2025-02-20 11:34:19 +08:00
禹翔辉
1ca61b2346 Accept Merge Request #1824: (feature/库存功能优化 -> develop) 
Merge Request: Merge branch 'feature/调拨质检完成消息通知' into feature/库存功能优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1824?initial=true
 2025-02-20 10:06:34 +08:00
yuxianghui
087896aa1c Merge branch 'feature/调拨质检完成消息通知' into feature/库存功能优化 2025-02-20 10:05:05 +08:00
yuxianghui
7ff1fed4b6 调拨单批量调拨功能，新增调拨单的质检单是否完成校验 2025-02-20 10:04:22 +08:00
禹翔辉
74c747b3ef Accept Merge Request #1823: (feature/调拨质检完成消息通知 -> develop) 
Merge Request: Merge branch 'feature/质检返工优化' into feature/调拨质检完成消息通知

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1823
 2025-02-19 16:24:26 +08:00
yuxianghui
996f25232b Merge branch 'feature/质检返工优化' into feature/调拨质检完成消息通知 2025-02-19 16:22:51 +08:00
yuxianghui
cddcec4225 添加调拨单的质检完成的消息通知 2025-02-19 16:22:00 +08:00
马广威
045faeae89 Accept Merge Request #1822: (feature/制造功能优化 -> develop) 
Merge Request: 调整名称

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1822?initial=true
 2025-02-19 15:35:29 +08:00
mgw
064af3b884 调整名称 2025-02-19 15:34:42 +08:00
马广威
a783d54836 Accept Merge Request #1821: (feature/制造功能优化 -> develop) 
Merge Request: 修复完善取消订单问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1821
 2025-02-19 15:15:39 +08:00
mgw
55a118f19a Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-19 15:14:24 +08:00
mgw
0969967570 修复完善取消订单问题 2025-02-19 15:14:05 +08:00
管欢
85f19defa8 Accept Merge Request #1820: (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/1820
 2025-02-19 14:50:15 +08:00
guanhuan
a628826b52 采购协议 2025-02-19 11:34:58 +08:00
guanhuan
bdccce07d4 采购协议 2025-02-19 11:31:46 +08:00
guanhuan
4dc19cab81 采购协议 2025-02-19 10:42:48 +08:00
黄焱
986b727d9b Accept Merge Request #1818: (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/1818?initial=true
 2025-02-19 10:36:52 +08:00
hyyy
9e6fc3bacb 增加样式权重 2025-02-19 10:29:25 +08:00
黄焱
201bab304d Accept Merge Request #1817: (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/1817
 2025-02-18 16:24:30 +08:00
hyyy
6984f31547 删除多余代码 2025-02-18 16:23:25 +08:00
hyyy
6f4f0ab0fb 增加刀具管理的展开列 2025-02-18 15:44:40 +08:00
马广威
a4b40bee16 Accept Merge Request #1816: (feature/制造功能优化 -> develop) 
Merge Request: 增加状态映射

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1816?initial=true
 2025-02-17 18:00:29 +08:00
mgw
dc29671f1a 增加状态映射 2025-02-17 17:59:38 +08:00
马广威
1ca68d9ff2 Accept Merge Request #1815: (feature/制造功能优化 -> develop) 
Merge Request: 调整工单状态改变逻辑

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1815?initial=true
 2025-02-17 17:35:57 +08:00
mgw
9fce93e1ef 调整工单状态改变逻辑 2025-02-17 17:34:54 +08:00
mgw
732c2089b9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-17 17:30:21 +08:00
mgw
09f8f5c0fd 调整状态 2025-02-17 17:30:02 +08:00
禹翔辉
74290a060e Accept Merge Request #1814: (feature/质检返工优化 -> develop) 
Merge Request: Merge branch 'feature/库存优化_2' into feature/质检返工优化

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1814
 2025-02-17 17:17:18 +08:00
yuxianghui
6388072bed Merge branch 'feature/库存优化_2' into feature/质检返工优化 2025-02-17 17:16:11 +08:00
yuxianghui
71cbd7ac36 1、优化由质检返工生成的制造订单检测结果数据不全的问题；2、 发票账单：增加字段及优化 2025-02-17 17:15:30 +08:00
马广威
c77c6310a2 Accept Merge Request #1813: (feature/制造功能优化 -> develop) 
Merge Request: 调整字段名称

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1813?initial=true
 2025-02-17 16:21:54 +08:00
mgw
5d13c09468 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-17 16:21:20 +08:00
mgw
f24c5ff75a 调整字段名称 2025-02-17 16:21:01 +08:00
马广威
902857444b Accept Merge Request #1812: (feature/制造功能优化 -> develop) 
Merge Request: 完善取消订单功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1812?initial=true
 2025-02-17 16:16:14 +08:00
mgw
fafa12dd23 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-17 16:12:20 +08:00
mgw
8d9aee497a 完善取消订单功能 2025-02-17 16:11:48 +08:00
黄焱
27820837c4 Accept Merge Request #1811: (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/1811?initial=true
 2025-02-17 16:06:47 +08:00
hyyy
69c5996db7 合并销售订单列，修改必填*展示方法， 2025-02-17 16:03:14 +08:00
马广威
1e3f8f005e Accept Merge Request #1810: (feature/制造功能优化 -> develop) 
Merge Request: 完善人工编程功能

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1810?initial=true
 2025-02-17 15:41:32 +08:00
mgw
5d2cadc3d0 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-17 15:37:58 +08:00
mgw
567ea84b00 完善人工编程功能 2025-02-17 15:37:30 +08:00
禹翔辉
006152edd9 Accept Merge Request #1809: (feature/库存优化_2 -> develop) 
Merge Request: Merge branch 'feature/库存优化_1' into feature/库存优化_2

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1809
 2025-02-17 15:19:55 +08:00
yuxianghui
60f525e228 Merge branch 'feature/库存优化_1' into feature/库存优化_2 2025-02-17 15:18:49 +08:00
yuxianghui
3d2e383330 1、处理 sf-制造订单-通过质量检查对装夹预调进行返工-制造订单未记录检测结果 问题；2、处理 手动创建调拨单右上角会关联坯料采购单和坯料委外单 问题 2025-02-17 15:17:54 +08:00
胡尧
d25022204b Accept Merge Request #1808: (feature/mrp_bug_fixed -> develop) 
Merge Request: 修改配送类型的字段关联形式，修改工件配送列表页的默认筛选条件

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1808?initial=true
 2025-02-17 13:24:31 +08:00
胡尧
8095a8a972 修改配送类型的字段关联形式，修改工件配送列表页的默认筛选条件 2025-02-17 13:23:32 +08:00
禹翔辉
781e1d616f Accept Merge Request #1807: (feature/库存优化_1 -> develop) 
Merge Request: Merge branch 'feature/同步接口优化' into feature/库存优化_1

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1807?initial=true
 2025-02-17 12:44:29 +08:00