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

5062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mgw
4937c3a812 修改展示名称 2024-12-30 20:27:57 +08:00
马广威
05469c71b8 Accept Merge Request #1683: (feature/制造功能优化 -> develop) 
Merge Request: 修改展示名称

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1683?initial=true
 2024-12-30 19:25:14 +08:00
mgw
210eea3b0b 修改展示名称 2024-12-30 19:24:45 +08:00
马广威
f58d1058f7 Accept Merge Request #1682: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1682?initial=true
 2024-12-30 18:00:08 +08:00
mgw
0622d7525f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-12-30 17:59:36 +08:00
mgw
7556c09ac2 增加活动项 2024-12-30 17:59:11 +08:00
禹翔辉
5344e97b7e Accept Merge Request #1681: (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/1681?initial=true
 2024-12-30 17:33:58 +08:00
yuxianghui
1b10b7bb53 Merge branch 'feature/成品调拨单优化_1' into feature/夹具查询优化_2 2024-12-30 17:32:28 +08:00
yuxianghui
9ab164f0fe 1 2024-12-30 17:31:22 +08:00
马广威
3b07b26303 Accept Merge Request #1680: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1680?initial=true
 2024-12-30 17:28:41 +08:00
管欢
29a32be8d2 Accept Merge Request #1679: (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/1679
 2024-12-30 17:28:15 +08:00
mgw
3620412a13 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-12-30 17:27:46 +08:00
mgw
5e72e3d1dd 审批明细问题 2024-12-30 17:27:00 +08:00
guanhuan
4137b304f3 消息提醒 2024-12-30 17:25:32 +08:00
马广威
caac651ab4 Accept Merge Request #1678: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1678?initial=true
 2024-12-30 17:12:01 +08:00
mgw
30e496442f Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-12-30 17:11:31 +08:00
mgw
c28c00a47b 调整description 2024-12-30 17:11:08 +08:00
禹翔辉
4f4fdeecb5 Accept Merge Request #1677: (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/1677?initial=true
 2024-12-30 17:07:07 +08:00
yuxianghui
8742f9b98b Merge branch 'feature/成品调拨单优化' into feature/成品调拨单优化_1 2024-12-30 17:05:45 +08:00
yuxianghui
d7ce69f474 1、询价单的确认按钮权限添加；2、成品调拨单添加对应的坯料采购单和坯料外协单跳转链接 2024-12-30 17:04:59 +08:00
胡尧
cf46cff7e5 Accept Merge Request #1676: (feature/sale_order_route_pick -> develop) 
Merge Request: 屏蔽前端代码

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1676?initial=true
 2024-12-30 16:33:41 +08:00
胡尧
c124e2962c 屏蔽前端代码 2024-12-30 16:32:36 +08:00
管欢
f4312c4d4e Accept Merge Request #1675: (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/1675
 2024-12-30 16:20:37 +08:00
guanhuan
5928456ffe 提示优化 2024-12-30 16:19:17 +08:00
马广威
305ea9dff7 Accept Merge Request #1674: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1674?initial=true
 2024-12-30 16:04:59 +08:00
mgw
bdfc393099 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-12-30 16:04:10 +08:00
mgw
1e1bd63acf 调整提示语句格式 2024-12-30 16:03:46 +08:00
马广威
fa20bb6eb5 Accept Merge Request #1673: (feature/制造功能优化 -> develop) 
Merge Request: sf-询价单-新增状态及修改未审批的提示语句

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1673?initial=true
 2024-12-30 15:51:19 +08:00
mgw
c82db7159d sf-询价单-新增状态及修改未审批的提示语句 2024-12-30 15:50:25 +08:00
廖丹龙
89d6752012 Accept Merge Request #1672: (feature/part_number -> 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/1672
 2024-12-30 15:40:36 +08:00
liaodanlong
3060b35ab2 销售订单交付状态修改 2024-12-30 15:38:43 +08:00
廖丹龙
17ad976a32 Accept Merge Request #1671: (feature/part_number -> 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/1671
 2024-12-30 15:28:57 +08:00
liaodanlong
9f3b351544 sf-工序外协调拨单-外协出库单多生成了一张外协出库调拨单 2024-12-30 15:25:20 +08:00
黄焱
5dc7dc8e0a Accept Merge Request #1670: (feature/前端样式修改 -> 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/1670?initial=true
 2024-12-30 14:40:22 +08:00
hy
f1868168af 修复会计列表表头少了列bug 2024-12-30 14:38:45 +08:00
guanhuan
f084b5d765 提示优化 2024-12-30 14:12:54 +08:00
guanhuan
854c3ceef2 提示优化 2024-12-30 13:51:31 +08:00
管欢
4269ce58db Accept Merge Request #1668: (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/1668?initial=true
 2024-12-30 11:37:04 +08:00
guanhuan
3555be86c6 提示优化 2024-12-30 11:35:08 +08:00
廖丹龙
764472111f Accept Merge Request #1667: (feature/part_number -> 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/1667?initial=true
 2024-12-30 10:31:05 +08:00
liaodanlong
ce4fc8b8ab 批量调拨 2024-12-30 10:29:29 +08:00
马广威
67f4917491 Accept Merge Request #1666: (feature/制造功能优化 -> develop) 
Merge Request: Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1666?initial=true
 2024-12-30 10:02:51 +08:00
mgw
ad885f1e39 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-12-30 10:02:09 +08:00
mgw
993d720c40 sf-采购询价单【上传合同】按钮展示条件修改 2024-12-30 10:01:43 +08:00
禹翔辉
da75a8cd35 Accept Merge Request #1665: (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/1665
 2024-12-30 09:59:32 +08:00
yuxianghui
b35f842915 调整托盘解绑修改顺序 2024-12-30 09:57:36 +08:00
guanhuan
4e7993d035 追溯参考号 2024-12-30 09:56:49 +08:00
禹翔辉
946f02003e Accept Merge Request #1664: (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/1664?initial=true
 2024-12-30 09:54:58 +08:00
yuxianghui
435315a166 Merge branch 'feature/夹具物料查询优化' into feature/夹具物料查询优化_1 2024-12-30 09:53:49 +08:00
yuxianghui
676f8eb7eb 添加点击工单的解绑托盘按钮时，修改对应托盘状态为空闲 2024-12-30 09:52:32 +08:00