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

6566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
管欢
990f73ea4e Accept Merge Request #2215: (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/2215
 2025-06-19 11:21:12 +08:00
guanhuan
b4ed65a75c 物料需求计划增加字段显示 2025-06-19 10:37:35 +08:00
管欢
53ba2ec589 Accept Merge Request #2214: (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/2214
 2025-06-19 09:58:10 +08:00
guanhuan
566bc0e1e2 物料需求计划增加字段显示 2025-06-19 09:40:29 +08:00
黄焱
5f216684f0 Accept Merge Request #2213: (feature/前端样式修改 -> develop) 
Merge Request: 修改出厂检验报告合格LOGO移位

Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2213?initial=true
 2025-06-18 18:00:26 +08:00
hyyy
e86bd59a43 修改出厂检验报告合格LOGO移位 2025-06-18 17:56:27 +08:00
禹翔辉
e55625e4b6 Accept Merge Request #2212: (feature/处理sf.t更新报错 -> develop) 
Merge Request: bfm内部下单新增坯料长宽高同步到sf产品-加工参数-坯料尺寸的长宽高

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2212
 2025-06-18 17:02:57 +08:00
yuxianghui
790dd3dd05 销售订单行的交货截止日期改为客户交期 2025-06-18 17:00:16 +08:00
yuxianghui
84846fb3da bfm内部下单新增坯料长宽高同步到sf产品-加工参数-坯料尺寸的长宽高 2025-06-18 16:54:15 +08:00
禹翔辉
f45a46255b Accept Merge Request #2211: (feature/处理sf.t更新报错 -> develop) 
Merge Request: 处理sf.t更新报错

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2211
 2025-06-18 16:12:12 +08:00
yuxianghui
fe5b005e45 1 2025-06-18 16:11:49 +08:00
yuxianghui
fc33280509 处理sf.t更新报错 2025-06-18 16:09:44 +08:00
黄焱
60ed04cf77 Accept Merge Request #2208: (feature/前端样式修改 -> develop) 
Merge Request: 修改需求计划模块需求与bug

Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2208
 2025-06-18 15:47:36 +08:00
禹翔辉
3439b47b0c Accept Merge Request #2206: (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/2206
 2025-06-18 15:45:32 +08:00
管欢
33c5d648b5 Accept Merge Request #2210: (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/2210
 2025-06-18 15:41:54 +08:00
谷耀东
c7b50d9706 Accept Merge Request #2209: (feature/7141 -> develop) 
Merge Request: 增加kanban悬停tip

Created By: @谷耀东
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @谷耀东
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2209
 2025-06-18 15:41:44 +08:00
guanhuan
05caed1d91 批量排程时间修改 2025-06-18 14:49:35 +08:00
guyaodong
8b66fda899 增加kanban悬停tip 2025-06-18 14:26:53 +08:00
hyyy
1456d4303b 修改需求计划模块需求与bug 2025-06-18 14:18:37 +08:00
guanhuan
9d2f23de7c 批量排程时间修改 2025-06-18 14:05:23 +08:00
yuxianghui
9393a48e70 删除客户交期字段 2025-06-18 11:11:51 +08:00
胡尧
749f44d6df Accept Merge Request #2205: (feature/7134 -> develop) 
Merge Request: 修改采购申请相关欠单创建报错的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2205?initial=true
 2025-06-18 10:56:54 +08:00
胡尧
4f000a6be4 修改采购申请相关欠单创建报错的问题 2025-06-18 10:56:22 +08:00
胡尧
7af7079a5c Accept Merge Request #2204: (feature/7134 -> develop) 
Merge Request: 采购申请按钮按照产品以及bom产品过滤

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2204?initial=true
 2025-06-18 10:34:57 +08:00
胡尧
376eb9e56f 采购申请按钮按照产品以及bom产品过滤 2025-06-18 10:34:34 +08:00
管欢
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