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

5047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liaodanlong
e99b8692ea Merge branch 'refs/heads/develop' into feature/part_number 2025-01-02 09:06:41 +08:00
liaodanlong
701decb38f 表面工艺采购单确认订单进行限制 2024-12-31 17:08:38 +08:00
管欢
3c61726fd3 Accept Merge Request #1698: (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/1698?initial=true
 2024-12-31 16:42:34 +08:00
guanhuan
247bebbd75 询价单审批 2024-12-31 16:39:09 +08:00
胡尧
c3ceda2ba9 Accept Merge Request #1697: (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/1697?initial=true
 2024-12-31 16:01:03 +08:00
胡尧
281f3c67c3 特殊表面工艺外协采购单发起人修改为供应商的采购员 2024-12-31 16:00:24 +08:00
禹翔辉
641a669f46 Accept Merge Request #1696: (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/1696
 2024-12-31 15:53:53 +08:00
yuxianghui
94b1c7d258 关闭报废入口 2024-12-31 15:50:51 +08:00
廖丹龙
b06b690ae9 Accept Merge Request #1695: (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/1695
 2024-12-31 14:05:55 +08:00
liaodanlong
37476bcc88 回退代码 2024-12-31 14:03:15 +08:00
管欢
af7eeb55f1 Accept Merge Request #1694: (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/1694
 2024-12-31 13:32:34 +08:00
guanhuan
39ed32f3e9 修复成品调拨出库订单的状态没变 2024-12-31 13:08:00 +08:00
廖丹龙
79ec60bd6b Accept Merge Request #1693: (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/1693
 2024-12-31 12:55:17 +08:00
liaodanlong
4b7308fdcd sf-制造-外协工单-调拨单已取消问题 2024-12-31 12:54:16 +08:00
胡尧
198f1145d7 Accept Merge Request #1692: (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/1692?initial=true
 2024-12-31 11:40:03 +08:00
胡尧
64eb66c334 修改退回工艺设计后再确认，采购单编程草稿状态 2024-12-31 11:39:36 +08:00
禹翔辉
cff21a4bcc Accept Merge Request #1691: (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/1691?initial=true
 2024-12-31 11:35:30 +08:00
yuxianghui
2373f33315 采购单源单据为入库单时，自动计算对应参考销售订单的值 2024-12-31 11:34:21 +08:00
禹翔辉
d6e2e554a8 Accept Merge Request #1690: (feature/采购单链接销售单 -> develop) 
Merge Request: 采购订单的关联销售订单字段从销售模块搬迁到制造模块，并新增一个many2many类型字段，且对字段的自动计算方法进行优化。

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1690
 2024-12-31 10:58:54 +08:00
yuxianghui
6c45a0bf4a Merge branch 'feature/入库单优化' into feature/采购单链接销售单 2024-12-31 10:57:09 +08:00
yuxianghui
4902fc5d9a 1、采购订单的关联销售订单字段从销售模块搬迁到制造模块，并新增一个many2many类型字段，且对字段的自动计算方法进行优化。 2024-12-31 10:56:07 +08:00
黄焱
9e5dbc0104 Accept Merge Request #1688: (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/1688?initial=true
 2024-12-31 10:00:18 +08:00
管欢
c57918736d Accept Merge Request #1689: (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/1689
 2024-12-31 10:00:01 +08:00
guanhuan
78a456849c 修复成品调拨出库订单的状态没变 2024-12-31 09:55:16 +08:00
hy
1816f1a497 修复表格对不齐问题 2024-12-31 09:45:56 +08:00
禹翔辉
da815c8ea1 Accept Merge Request #1686: (feature/入库单优化 -> develop) 
Merge Request: 1、采购订单form页买家改名为采购员；2、优化成品入库单的的坯料委外加工链接；

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1686
 2024-12-31 08:57:15 +08:00
yuxianghui
32e3c2f79f 采购订单源文档字段名称改为源单据 2024-12-31 08:56:41 +08:00
胡尧
c478b72e04 Accept Merge Request #1687: (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/1687?initial=true
 2024-12-31 08:54:23 +08:00
胡尧
78b0529809 创建成品时从模板上获取供应商价格 2024-12-31 08:54:02 +08:00
yuxianghui
17ffac63cb Merge branch 'feature/夹具查询优化_2' into feature/入库单优化 2024-12-31 08:48:50 +08:00
yuxianghui
acee32cc39 1、采购订单form页买家改名为采购员；2、优化成品入库单的的坯料委外加工链接； 2024-12-31 08:47:44 +08:00
马广威
b36cf745c2 Accept Merge Request #1685: (feature/制造功能优化 -> develop) 
Merge Request: 添加提交审批的通知消息

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1685?initial=true
 2024-12-30 21:38:17 +08:00
mgw
a24279f6e6 添加提交审批的通知消息 2024-12-30 21:37:10 +08:00
马广威
68b89999a9 Accept Merge Request #1684: (feature/制造功能优化 -> develop) 
Merge Request: 修改展示名称

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1684?initial=true
 2024-12-30 20:29:57 +08:00
mgw
7c38c7f643 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2024-12-30 20:28:49 +08:00
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