jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,541 Commits 134 Branches 31 Tags
531bc2e09032effe3b42de299717b550b3c75ea8
Commit Graph

6541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
管欢
531bc2e090 Accept Merge Request #2203: (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/2203
 2025-06-18 09:44:16 +08:00
guanhuan
bc3ab21d75 打印列表程序单数据修改 2025-06-18 09:40:12 +08:00
guanhuan
d1811ea24b 需齐套检查修改 2025-06-17 16:33:01 +08:00
guanhuan
b426d5d505 需求计划排序修改 2025-06-17 14:58:27 +08:00
禹翔辉
1dfa22900d Accept Merge Request #2202: (feature/质检样式修改 -> develop) 
Merge Request: 1、质检单类型为出厂检测报告时，隐藏通过状态下的不合格按钮；2、功能刀具组装检测BOM物料时过滤产品的追溯类型为不追溯的产品。

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2202
 2025-06-17 11:50:01 +08:00
yuxianghui
0eeebf437a 1、质检单类型为出厂检测报告时，隐藏通过状态下的不合格按钮；2、功能刀具组装检测BOM物料时过滤产品的追溯类型为不追溯的产品。 2025-06-17 11:47:26 +08:00
管欢
397d4f29a1 Accept Merge Request #2201: (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/2201
 2025-06-17 11:21:00 +08:00
guanhuan
33205c5d29 不同产品调拨单就绪未过滤产品问题 2025-06-17 10:57:13 +08:00
hyyy
568f3e4f30 修改传参，增加提示，默认展示第一个文件 2025-06-17 09:58:53 +08:00
guanhuan
8c43fc2b76 打印方法修改 2025-06-17 09:41:08 +08:00
guanhuan
8960d3d07c Merge remote-tracking branch 'origin/feature/齐套检查与下达生产' into feature/齐套检查与下达生产 2025-06-16 17:42:40 +08:00
guanhuan
95b5c86242 投料齐套检查修改 2025-06-16 17:42:05 +08:00
hyyy
c2000aa9c5 修改字段名 2025-06-16 17:28:09 +08:00
hyyy
e29456bbf7 选择列表展示图片 2025-06-16 17:25:52 +08:00
禹翔辉
a2f8dc6cec Accept Merge Request #2200: (feature/平台下单优化_1 -> develop) 
Merge Request: Merge branch 'feature/平台下单优化' into feature/平台下单优化_1

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2200
 2025-06-16 16:06:06 +08:00
yuxianghui
fec095ca6b Merge branch 'feature/平台下单优化' into feature/平台下单优化_1 2025-06-16 16:03:53 +08:00
yuxianghui
aed33dbb35 1、内部下单：行明细增加交期等； 2、处理 bfm平台下单-填写了合同相关字段，未上传合同，合同的相关字段未传到sf销售订单 问题 2025-06-16 16:02:43 +08:00
guanhuan
dbe8c95558 打印页面增加筛选 2025-06-16 15:43:02 +08:00
胡尧
5c7e6e969f Accept Merge Request #2199: (feature/修改产品名称 -> develop) 
Merge Request: 客供料的制造订单，不显示采购申请的智能按钮

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2199
 2025-06-16 15:00:42 +08:00
胡尧
d70b757487 客供料的制造订单，不显示采购申请的智能按钮 2025-06-16 14:51:07 +08:00
管欢
fb3bb8f1c0 Accept Merge Request #2198: (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/2198
 2025-06-16 14:44:40 +08:00
guanhuan
9123aeaee8 人工线下加工最后一个工单完工后未记录时间完工时间 2025-06-16 14:35:28 +08:00
胡尧
e3af0bea3c Accept Merge Request #2197: (feature/修改产品名称 -> develop) 
Merge Request: 在调拨单验证前，先进行设置数量

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2197?initial=true
 2025-06-16 14:25:27 +08:00
胡尧
af1bc021d6 在调拨单验证前，先进行设置数量 2025-06-16 14:24:50 +08:00
guanhuan
2febc369bb 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 2025-06-16 13:44:55 +08:00
胡尧
6ee1c5f9a9 Accept Merge Request #2196: (feature/修改产品名称 -> develop) 
Merge Request: 修改migrate脚本，解决更新慢的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2196?initial=true
 2025-06-16 13:42:42 +08:00
胡尧
5ef8023169 修改migrate脚本，解决更新慢的问题 2025-06-16 13:41:50 +08:00
guanhuan
fa03b562a2 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 2025-06-16 11:52:22 +08:00
guanhuan
5f55c954d1 确认工艺路线新增表面工艺参数需要同步到产品的加工参数中 2025-06-16 11:42:21 +08:00
胡尧
e0ca13b5b7 Accept Merge Request #2195: (feature/修改产品名称 -> develop) 
Merge Request: 修改产品名称

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2195?initial=true
 2025-06-16 10:51:28 +08:00
胡尧
dba38f4d37 修改产品名称 2025-06-16 10:50:56 +08:00
胡尧
ceb7a02209 Accept Merge Request #2194: (feature/修改产品名称 -> develop) 
Merge Request: 解决修改产品名称带来的影响

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2194?initial=true
 2025-06-16 09:36:16 +08:00
胡尧
1811dbf0fd 解决修改产品名称带来的影响 2025-06-16 09:33:52 +08:00
胡尧
1c1d1a74ad Accept Merge Request #2193: (feature/修改产品名称 -> develop) 
Merge Request: 修改产品名称生成规则

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2193?initial=true
 2025-06-16 09:21:06 +08:00
胡尧
347019d7ee 修改产品名称生成规则 2025-06-16 09:20:32 +08:00
管欢
7d46d00fd7 Accept Merge Request #2192: (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/2192
 2025-06-16 08:53:35 +08:00
胡尧
5a22402e7a Accept Merge Request #2191: (feature/修改产品名称 -> develop) 
Merge Request: 修改接口授权后，没有赋予用户的bug，导致无法获取公司，增加替换sf销售订单行产品名称的模块

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2191?initial=true
 2025-06-13 17:55:13 +08:00
胡尧
f53e34aeb4 修改接口授权后，没有赋予用户的bug，导致无法获取公司，增加替换sf销售订单行产品名称的模块 2025-06-13 17:53:57 +08:00
guanhuan
e145e8a3a4 下发时修改需求计划的总预计加工时间 2025-06-13 15:40:02 +08:00
管欢
0ef6fe73f3 Accept Merge Request #2190: (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/2190
 2025-06-13 14:24:29 +08:00
guanhuan
ffad4b7995 修复坯料的采购申请按钮没显示 2025-06-13 14:17:48 +08:00
guanhuan
2c7fbd3aef 修复坯料的采购申请按钮没显示 2025-06-13 10:41:57 +08:00
禹翔辉
72b8d33a3e Accept Merge Request #2189: (feature/功能刀具组装支持搜索更多物料 -> develop) 
Merge Request: 功能刀具组装点【更多】按钮弹窗的物料添加【BOM物料】默认筛选，根据BOM筛选出符合条件的物料信息；取消默认筛选后记录按满足BOM的和不满足BOM的顺序排序出现。

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2189
 2025-06-13 10:21:32 +08:00
yuxianghui
6517d2bd12 功能刀具组装点【更多】按钮弹窗的物料添加【BOM物料】默认筛选，根据BOM筛选出符合条件的物料信息；取消默认筛选后记录按满足BOM的和不满足BOM的顺序排序出现。 2025-06-13 10:19:11 +08:00
guanhuan
2c97287218 下达生产修改 2025-06-13 10:05:33 +08:00
胡尧
012ff120b4 Accept Merge Request #2188: (hotfix/修复刀具预警没有预警记录和通知 -> develop) 
Merge Request: 功能刀具寿命到期消息通知

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2188
 2025-06-13 08:41:05 +08:00
胡梓杨
960f05090c Accept Merge Request #2187: (feature/6973 -> 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/2187
 2025-06-12 15:48:03 +08:00
huziyang@jikimo.com
6321e7ef23 货位看板详情回退修复，删除幽灵卡片。 2025-06-12 15:38:56 +08:00
管欢
69d200973b Accept Merge Request #2186: (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/2186
 2025-06-12 10:57:11 +08:00
guanhuan
448a2cd277 需求计划对应产品的调拨单显示不正确 2025-06-12 10:54:07 +08:00