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

1851 Commits

Author SHA1 Message Date
mgw
e9226a87f5 调整判断逻辑 2025-02-26 10:41:05 +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
0be9afcdfe 修改变量名 2025-02-26 10:13:26 +08:00
mgw
e3b2dade15 调整判断逻辑 2025-02-26 10:06:27 +08:00
mgw
f89b52bad1 修改状态名称 2025-02-26 09:58:16 +08:00
mgw
f06951958d sf-工厂取消接单-取消列表展示数据问题 2025-02-26 09:54:08 +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
c400553294 工艺确认时的工单空值处理 2025-02-25 16:35:40 +08:00
liaodanlong
7975fd2bd2 CNC回退后需开放送检按钮 2025-02-25 16:32:04 +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
mgw
e2e9637dbf Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化 2025-02-24 16:59:33 +08:00
mgw
3745125990 编程单去重 2025-02-24 16:59:12 +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
mgw
28a16ca08e 调整工单名称、编程单去重 2025-02-24 15:29:02 +08:00
mgw
74442c6539 改正语法问题 2025-02-24 15:15:27 +08:00
mgw
4e7bf40d91 调整领料单生成次数 2025-02-24 15:12: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
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
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
管欢
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