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

6607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
胡尧
844f7de1ab Accept Merge Request #2232: (feature/6711 -> develop) 
Merge Request: 修改计划量字段为–qty_production

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2232?initial=true
 2025-06-20 15:39:28 +08:00
胡尧
13d33488dc 修改计划量字段为–qty_production 2025-06-20 15:39:11 +08:00
禹翔辉
266601cf84 Accept Merge Request #2231: (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/2231
 2025-06-20 15:36:51 +08:00
yuxianghui
2e168a4ba7 出厂检验报告模版-页脚优化 2025-06-20 15:35:07 +08:00
胡尧
68ba47ed70 Accept Merge Request #2230: (feature/7151 -> develop) 
Merge Request: 修改依赖

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2230?initial=true
 2025-06-20 15:03:57 +08:00
胡尧
5bb6fcd4f7 修改依赖 2025-06-20 15:03:42 +08:00
胡尧
9a05bbd82c Accept Merge Request #2229: (feature/7151 -> develop) 
Merge Request: 修改需求计划，下达生成的方法

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2229?initial=true
 2025-06-20 14:52:34 +08:00
胡尧
b33c992b25 修改需求计划，下达生成的方法 2025-06-20 14:51:58 +08:00
yuxianghui
5947b3dfe9 回退出厂检验报告模版 2025-06-20 14:26:29 +08:00
禹翔辉
95e43b0fba Accept Merge Request #2228: (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/2228
 2025-06-20 14:07:56 +08:00
yuxianghui
e7afc76753 出厂检验报告模版优化 2025-06-20 14:01:56 +08:00
胡尧
788183e239 修改批量大小 2025-06-20 13:52:37 +08:00
禹翔辉
4ddabdefa1 Accept Merge Request #2227: (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/2227
 2025-06-20 13:39:42 +08:00
yuxianghui
364127beb3 1 2025-06-20 13:37:42 +08:00
yuxianghui
109ea8729d 优化出厂检验报告模版 2025-06-20 12:03:17 +08:00
禹翔辉
32de726164 Accept Merge Request #2226: (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/2226
 2025-06-20 11:49:32 +08:00
yuxianghui
79f89f068b 修改出厂检验报告模版 2025-06-20 11:47:59 +08:00
禹翔辉
52189cff72 Accept Merge Request #2225: (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/2225
 2025-06-20 11:37:18 +08:00
yuxianghui
aadccce47e 修改出厂检验报告生成模版 2025-06-20 11:35:23 +08:00
胡尧
abd88fd721 Accept Merge Request #2224: (feature/6711 -> develop) 
Merge Request: 修改产量接口bug

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2224?initial=true
 2025-06-20 11:27:06 +08:00
胡尧
2c2fa87719 修改产量接口bug 2025-06-20 11:26:48 +08:00
胡尧
f38f60a6a8 计划增加队列 2025-06-20 11:24:39 +08:00
胡尧
7d8b7048a8 Accept Merge Request #2223: (feature/6711 -> develop) 
Merge Request: 去掉多余代码

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2223?initial=true
 2025-06-20 11:15:58 +08:00
胡尧
e7b312fb22 去掉多余代码 2025-06-20 10:53:31 +08:00
禹翔辉
bc641bde3a Accept Merge Request #2222: (feature/平台下单接口优化 -> develop) 
Merge Request: 处理bfm下单报错

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2222
 2025-06-20 10:30:25 +08:00
yuxianghui
d73ffab9b5 处理bfm下单报错 2025-06-20 10:28:07 +08:00
黄焱
4b1c0bc3b5 Accept Merge Request #2221: (feature/前端样式修改 -> develop) 
Merge Request: 质检PDF预览logo移位

Created By: @黄焱
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @黄焱
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2221?initial=true
 2025-06-20 09:23:34 +08:00
hyyy
45730e2dd4 质检PDF预览logo移位 2025-06-20 09:09:45 +08:00
禹翔辉
8903f32cf8 Accept Merge Request #2220: (feature/质检按钮隐藏 -> develop) 
Merge Request: 处理 bfm内部下单包含坯料尺寸时，生成的产品的加工参数-体积数据不正确问题

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2220
 2025-06-19 16:34:32 +08:00
yuxianghui
8bd1c8a095 处理 bfm内部下单包含坯料尺寸时，生成的产品的加工参数-体积数据不正确问题 2025-06-19 16:29:31 +08:00
谷耀东
abf9a0997b Accept Merge Request #2219: (feature/7154 -> 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/2219
 2025-06-19 16:28:02 +08:00
guyaodong
aec2d1c516 恢复刀具房样式和编码 2025-06-19 16:18:04 +08:00
禹翔辉
127efb67d7 Accept Merge Request #2218: (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/2218
 2025-06-19 15:19:34 +08:00
yuxianghui
78edf1f7eb 质检单按钮隐藏 2025-06-19 15:17:26 +08:00
胡尧
e6e13a5970 Accept Merge Request #2217: (feature/6711 -> develop) 
Merge Request: 修改大屏数据接口，日完成量统计,获取产线产量相关,获取工单明细

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2217?initial=true
 2025-06-19 15:03:27 +08:00
胡尧
55cc4906ef 修改大屏数据接口，日完成量统计,获取产线产量相关,获取工单明细 2025-06-19 15:02:55 +08:00
黄焱
427b548939 Accept Merge Request #2216: (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/2216?initial=true
 2025-06-19 14:37:13 +08:00
hyyy
8c9db7e8c8 修改合格logo位置 2025-06-19 14:32:59 +08:00
管欢
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
胡尧
d21e0c7fd9 修改大屏数据接口，支持线下数据 2025-06-19 10:54:33 +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