jikimo/jikimo_sf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,984 Commits 134 Branches 0 Tags
2bae98950ed46d5ce47cfecf4d48a03d494ff1cf
Commit Graph

1515 Commits

Author SHA1 Message Date
廖丹龙
fd76863daa Accept Merge Request #1861: (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/1861
 2025-02-26 10:48:29 +08:00
liaodanlong
85c8e834cb 匹配规则修改 2025-02-26 10:46:02 +08:00
廖丹龙
22b0b02168 Accept Merge Request #1859: (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/1859
 2025-02-26 10:31:10 +08:00
liaodanlong
bff10de6b2 修改计算方法名称 2025-02-26 10:29:01 +08:00
廖丹龙
ebe8d56ffd Accept Merge Request #1854: (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/1854
 2025-02-26 10:22:03 +08:00
mgw
dca6f9fb53 sf-工厂取消接单-坯料的制造订单未取消 2025-02-26 09:40:18 +08:00
liaodanlong
c4c6386871 坯料的采购订单零件图号，零件名称显示 2025-02-26 09:37:56 +08:00
mgw
2a8791b9a9 Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-26 09:10:04 +08:00
mgw
def9bd2c6e 坯料自加工的切割工序状态也判断了编程状态 2025-02-26 09:09:26 +08:00
胡尧
bf785328ac Accept Merge Request #1850: (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/1850?initial=true
 2025-02-25 17:25:26 +08:00
胡尧
332dbce769 工单返工完成不触发制造订单的完成事件 2025-02-25 17:25:04 +08:00
廖丹龙
fa2f5552e2 Accept Merge Request #1849: (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/1849
 2025-02-25 16:40:12 +08:00
liaodanlong
a0c5f9d15f 制造订单是返工状态时-上报返工的工单有【回退】入口-要隐藏问题处理 2025-02-25 16:31:18 +08:00
liaodanlong
2e648dea4e 成品入库单已经完成-工单还有【回退】按钮-还能回退成功 问题处理 2025-02-25 16:29:58 +08:00
yuxianghui
fb4f08a24a 1、处理销售订单确认供货路线报错-坯料获取方式是自加工 问题；2、质检完成的消息通知添加超链接；3、添加 库存作业单据没有质检单时-会发送待处理消息通知-不用发送判断条件 2025-02-25 15:05:30 +08:00
yuxianghui
0fd33831f1 处理由客供料入库单生成的质检单没有批次序列号问题 2025-02-25 11:22:41 +08:00
yuxianghui
7ecb28382a 1、库存序列号的更新序列号功能按钮优化；2、销售单默认显示字段优化； 2025-02-25 10:28:51 +08:00
廖丹龙
014456f09f Accept Merge Request #1842: (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/1842
 2025-02-24 16:50:08 +08:00
liaodanlong
7a3534f8e4 当前工单下一张工单为表面工艺时不显示回退按钮问题处理 2025-02-24 16:39:10 +08:00
廖丹龙
08c7226add Accept Merge Request #1840: (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/1840
 2025-02-24 16:31:56 +08:00
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
liaodanlong
71e7ac9993 最后一个解除装夹未隐藏回退按钮 2025-02-24 16:16:00 +08:00
liaodanlong
749df39809 cnc工单没有回退按钮问题 2025-02-24 16:08:22 +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
廖丹龙
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
胡尧
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
管欢
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
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
胡尧
52e585e637 解决冲突 2025-02-20 13:51:24 +08:00
胡尧
05dac9fb0c 调整模型上传的流程 2025-02-20 13:36:05 +08:00
guanhuan
8e27ee2434 修复取消订单状态已更新时的提示 2025-02-20 10:25:56 +08:00
mgw
9fce93e1ef 调整工单状态改变逻辑 2025-02-17 17:34:54 +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
胡尧
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
yuxianghui
fc4eae0488 完成 入库优化：自动确认序列号 需求 2025-02-17 12:42:07 +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
胡尧
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