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

5450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yuxianghui
8c14ea4a85 Merge branch 'feature/库存功能优化' into feature/库存优化_3 2025-02-24 16:27:49 +08:00
yuxianghui
eb11e71d0d 1、入库单据优化：单据就绪自动分配序列号；分配序列号时，流水号取值=MAX（产品序列号模型最大序号，预分配最大序号），界面优化。2、客供料入库单批量调拨有待质检的单子时-提示语显示重复了优化 2025-02-24 16:27:09 +08:00
马广威
332ac49229 Accept Merge Request #1839: (feature/制造功能优化 -> develop) 
Merge Request: 调整工单名称、编程单去重

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1839?initial=true
 2025-02-24 15:29:53 +08:00
mgw
fea58e6288 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-24 15:29:20 +08:00
mgw
28a16ca08e 调整工单名称、编程单去重 2025-02-24 15:29:02 +08:00
马广威
363169d9e4 Accept Merge Request #1838: (feature/制造功能优化 -> develop) 
Merge Request: 改正语法问题

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1838?initial=true
 2025-02-24 15:15:47 +08:00
mgw
74442c6539 改正语法问题 2025-02-24 15:15:27 +08:00
马广威
d247b25d55 Accept Merge Request #1837: (feature/制造功能优化 -> develop) 
Merge Request: 调整领料单生成次数

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1837?initial=true
 2025-02-24 15:13:09 +08:00
mgw
b2b6a57f40 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-24 15:12:40 +08:00
mgw
4e7bf40d91 调整领料单生成次数 2025-02-24 15:12:23 +08:00
马广威
2baf739eb2 Accept Merge Request #1836: (feature/制造功能优化 -> develop) 
Merge Request: 调整行号取值

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1836?initial=true
 2025-02-24 15:00:23 +08:00
mgw
7ab90143b6 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-24 14:59:53 +08:00
mgw
8bf788e39c 调整行号取值 2025-02-24 14:57:19 +08:00
马广威
2e83a22540 Accept Merge Request #1835: (feature/制造功能优化 -> develop) 
Merge Request: 调整下游单据内容

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1835?initial=true
 2025-02-24 14:47:28 +08:00
mgw
9e25657fea Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-24 14:46:35 +08:00
mgw
555802b271 调整下游单据内容 2025-02-24 14:46:18 +08:00
廖丹龙
4002588eec Accept Merge Request #1834: (feature/tool_standard_library_process -> 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/1834
 2025-02-24 14:05:38 +08:00
liaodanlong
09ba001b06 sf-生产环境-客供料入库单-合并后的客供料入库单的零件图号显示名称不正确 2025-02-24 13:38:02 +08:00
廖丹龙
c208bac3a1 Accept Merge Request #1833: (feature/tool_standard_library_process -> 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/1833
 2025-02-24 09:45:27 +08:00
liaodanlong
7efea85420 刀具标准库 基本参数修改字段默认隐藏，并可勾选展示 2025-02-24 09:30:27 +08:00
mgw
91061b1eec 调整调拨产品名称等 2025-02-21 17:34:57 +08:00
廖丹龙
3c349c3346 Accept Merge Request #1832: (feature/tool_standard_library_process -> 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/1832?initial=true
 2025-02-21 16:47:25 +08:00
liaodanlong
e1185aa28b 子制造订单回退功能处理 处理解除装夹没有回退按钮 2025-02-21 15:22:00 +08:00
胡尧
e2edd38a8e Accept Merge Request #1831: (feature/mrp_bug_fixed -> develop) 
Merge Request: 修复库存有两个驾驶舱菜单的bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1831?initial=true
 2025-02-21 14:48:34 +08:00
胡尧
16b5ce300a 修复库存有两个驾驶舱菜单的bug 2025-02-21 14:48:01 +08:00
胡尧
70855a4936 Accept Merge Request #1830: (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/1830?initial=true
 2025-02-21 14:29:46 +08:00
胡尧
1bbdf2bd44 取消配送路线关联字段修改 2025-02-21 14:29:15 +08:00
廖丹龙
3da67f27ec Accept Merge Request #1829: (feature/tool_standard_library_process -> 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/1829?initial=true
 2025-02-21 10:30:16 +08:00
liaodanlong
d8e8babbd3 工单详情添加回退按钮 2025-02-21 10:28:12 +08:00
廖丹龙
41deefa4f3 Accept Merge Request #1828: (feature/tool_standard_library_process -> 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/1828
 2025-02-21 09:00:21 +08:00
liaodanlong
acfc09596b 刀具编码修改 2025-02-20 17:21:44 +08:00
管欢
5d00c1018b Accept Merge Request #1827: (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/1827
 2025-02-20 16:28:20 +08:00
廖丹龙
a438ba9c40 Accept Merge Request #1826: (feature/tool_standard_library_process -> 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/1826
 2025-02-20 16:13:43 +08:00
liaodanlong
c3f5a890f1 工厂编码修改 2025-02-20 16:12:59 +08:00
liaodanlong
416a63138a Merge branch 'refs/heads/develop' into feature/tool_standard_library_process 
# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py
 2025-02-20 15:48:22 +08:00
liaodanlong
75460c5df6 制造订单 工单回退 2025-02-20 15:38:37 +08:00
liaodanlong
162a1061de 制造订单 工单回退 2025-02-20 14:08:06 +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
guanhuan
8e27ee2434 修复取消订单状态已更新时的提示 2025-02-20 10:25:56 +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
mgw
a30ee546bd Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-19 15:35:40 +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