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

5378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
马广威
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
yuxianghui
f556e45102 Merge branch 'feature/同步接口优化' into feature/库存优化_1 2025-02-17 12:42:55 +08:00
yuxianghui
fc4eae0488 完成 入库优化：自动确认序列号 需求 2025-02-17 12:42:07 +08:00
mgw
3e9b6f808d 优化取消接单功能 2025-02-17 10:00:40 +08:00
黄焱
3f1c745ece Accept Merge Request #1806: (feature/前端样式修改 -> develop) 
Merge Request: 删除模块，移到efms里面；销售订单明细表的视图优化_1

Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1806?initial=true
 2025-02-17 08:39:25 +08:00
hyyy
b117fde8c3 删除模块，移到efms里面，修改样式 2025-02-14 17:31:19 +08:00
mgw
e98a9a3788 增加取消订单其他功能 2025-02-14 17:29:33 +08:00
mgw
3ac096e9a7 取消接单需求进行中 2025-02-13 17:41:18 +08:00
胡尧
3130ef4983 增加工单的开始时间已经leave_id字段的监控，异常则发送企业微信消息 2025-02-13 15:48:41 +08:00
禹翔辉
5463bff63b Accept Merge Request #1805: (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/1805
 2025-02-13 15:15:28 +08:00
yuxianghui
ea96ae2c55 Merge branch 'feature/库存优化' into feature/同步接口优化 2025-02-13 15:00:25 +08:00
yuxianghui
a05885936d 刀具标准库及关联模型同步接口优化 2025-02-13 14:26:01 +08:00
胡尧
32ead7fa07 去掉设置tree字段为隐藏的代码 2025-02-13 13:29:54 +08:00
胡尧
cf9095b51b Accept Merge Request #1804: (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/1804
 2025-02-13 13:04:40 +08:00
胡尧
827311a146 质量检查列表修改3个字段的隐藏默认值 2025-02-13 13:04:16 +08:00
胡尧
941b8c0be7 增加测试数据清理模块 2025-02-13 11:31:35 +08:00
胡尧
f0525355c4 Accept Merge Request #1803: (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/1803?initial=true
 2025-02-13 10:27:43 +08:00
胡尧
bb1012a15d 质量检查列表增加默认筛选项 2025-02-13 10:26:58 +08:00
胡尧
68e9537cdb Accept Merge Request #1802: (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/1802?initial=true
 2025-02-12 15:34:34 +08:00
胡尧
2411d8334c 修改客供料的供货路线不能选择外购 2025-02-12 15:33:57 +08:00
胡尧
97d4e03ef8 Accept Merge Request #1801: (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/1801?initial=true
 2025-02-12 15:23:19 +08:00
胡尧
b7a2a763ac 修改质量检查列表页 2025-02-12 15:14:27 +08:00
禹翔辉
7e0f392550 Accept Merge Request #1800: (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/1800?initial=true
 2025-02-12 11:32:03 +08:00
yuxianghui
c223869bbd Merge branch 'feature/销售视图优化' into feature/库存优化 2025-02-12 11:30:27 +08:00
yuxianghui
7a6538bcc1 完成 库存单据列表增加字段【需求数量】 需求 2025-02-12 11:29:46 +08:00
mgw
d3cfec2f35 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-12 09:49:54 +08:00
mgw
6b9428c8bf 多种状态下显示拒绝接单/取消按钮 2025-02-10 16:38:34 +08:00
马广威
f25d06e08f Accept Merge Request #1799: (feature/制造功能优化 -> develop) 
Merge Request: 调整工单处人工编程可见

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1799?initial=true
 2025-02-10 13:35:06 +08:00
mgw
62314d38b3 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-10 13:34:06 +08:00
mgw
027be2b021 调整工单处人工编程可见 2025-02-10 13:33:46 +08:00
马广威
372dfd99c4 Accept Merge Request #1798: (feature/制造功能优化 -> develop) 
Merge Request: 人工线下加工工单标识

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1798?initial=true
 2025-02-10 13:15:01 +08:00
mgw
c702d1f3be Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-10 13:14:25 +08:00
mgw
7e33ca44d0 人工线下加工工单标识 2025-02-10 13:13:57 +08:00
马广威
c7d9b15624 Accept Merge Request #1797: (feature/制造功能优化 -> develop) 
Merge Request: 增加人工线下加工工单的查找

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1797
 2025-02-10 11:30:52 +08:00