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

6538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
guanhuan
154a17657c 需求计划材料销售订单行取值问题 2025-06-12 09:35:39 +08:00
yuxianghui
62ead52f00 处理功能刀具预警时没有创建功能刀具预警记录和功能刀具拆解单bug 2025-06-11 17:18:59 +08:00
管欢
23d6e38b24 Accept Merge Request #2185: (hotfix/备注为空 -> 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/2185
 2025-06-11 16:02:38 +08:00
管欢
bdc23afc56 Accept Merge Request #2184: (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/2184
 2025-06-11 13:51:01 +08:00
guanhuan
b8043b3ad2 修复多条采购申请跳转报错 2025-06-11 11:41:03 +08:00
胡尧
8841d800ea Merge branch 'hotfix/备注为空' into release/release_2.14 2025-06-11 11:28:35 +08:00
guanhuan
920e96ffc6 修复备注为空 2025-06-11 11:19:31 +08:00
yuxianghui
d52f5fa841 修复取消订单时报错bug 2025-06-11 11:15:03 +08:00
guanhuan
37c5c9d498 需求计划列表拖动 2025-06-11 10:40:26 +08:00
guanhuan
6867d7e4ce 需求计划合同号 2025-06-11 09:48:53 +08:00
管欢
9cbd311fec Accept Merge Request #2183: (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/2183
 2025-06-11 09:22:25 +08:00
guanhuan
0e753b1c85 命名修改 2025-06-11 08:59:41 +08:00
guanhuan
48316c55b7 命名修改 2025-06-11 08:57:51 +08:00
guanhuan
b33ba9c354 命名修改 2025-06-11 08:56:44 +08:00
胡尧
e0559e9887 Merge branch 'develop' into release/release_2.14 master_sf_20250610_2.15 2025-06-10 16:33:57 +08:00
管欢
39a25bb6c8 Accept Merge Request #2180: (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/2180
 2025-06-10 16:33:37 +08:00
guanhuan
796e9b0cef 需求计划新增合同日期等字段 2025-06-10 15:49:22 +08:00
禹翔辉
e129c08426 Accept Merge Request #2179: (feature/bfm下单接口优化 -> 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/2179
 2025-06-10 15:28:17 +08:00
yuxianghui
c6b47bd68d 销售订单新增合同日期字段 2025-06-10 15:26:32 +08:00
guanhuan
126d60f8d7 Merge branch 'refs/heads/feature/搜索优化' into release/release_2.14 2025-06-10 10:45:52 +08:00
guanhuan
4225a8fe1b 采购申请单完成操作提示调整 2025-06-10 10:45:06 +08:00
guanhuan
a13a79f41f Merge branch 'refs/heads/feature/搜索优化' into release/release_2.14 2025-06-09 17:56:50 +08:00
guanhuan
a828c823dd 采购申请单完成操作修改 2025-06-09 17:55:34 +08:00
guanhuan
9cf2bac9c6 修复返工问题 2025-06-09 17:39:55 +08:00
guanhuan
1926375d58 需求计划文件打印 2025-06-09 10:30:12 +08:00
huziyang@jikimo.com
23dd88b7ba 解决冲突 2025-06-09 10:01:57 +08:00
huziyang@jikimo.com
f164488e48 屏蔽OCC导入 2025-06-09 09:59:47 +08:00
huziyang@jikimo.com
25b53794bb 处理#6973任务： 
1货位编码规则简化
2货位看板直观化展示
 2025-06-09 09:49:21 +08:00
胡尧
484fab85be Accept Merge Request #2176: (feature/6694 -> develop) 
Merge Request: 修改出厂检验报告预览数据

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2176
 2025-06-09 09:09:06 +08:00
胡尧
6ed5de6400 修改出厂检验报告预览数据 2025-06-09 09:08:26 +08:00
guanhuan
8224f36567 需求计划页面显示 2025-06-06 15:24:12 +08:00
胡尧
2449b92bc8 Accept Merge Request #2175: (feature/6694 -> develop) 
Merge Request: 修复点击智能按钮点击的问题

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2175?initial=true
 2025-06-06 09:34:15 +08:00
胡尧
03ec94d223 修复点击智能按钮点击的问题 2025-06-06 09:33:23 +08:00
胡尧
d26e6edd31 Accept Merge Request #2174: (feature/6694 -> develop) 
Merge Request: 修改制造订单的采购申请只能按钮判断规则

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2174?initial=true
 2025-06-06 09:17:06 +08:00
胡尧
2ea24f2049 修改制造订单的采购申请只能按钮判断规则 2025-06-06 09:16:41 +08:00
guanhuan
b11b6ef283 合同编号显示 2025-06-06 09:11:03 +08:00
胡尧
b1a04f8f44 Accept Merge Request #2173: (feature/6694 -> develop) 
Merge Request: 在出厂检验报告验证数量时，增加产品的匹配

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2173?initial=true
 2025-06-06 08:37:58 +08:00
胡尧
0b5415dc47 在出厂检验报告验证数量时，增加产品的匹配 2025-06-06 08:37:38 +08:00
胡尧
59569806e6 Accept Merge Request #2172: (feature/6694 -> develop) 
Merge Request: 修复二次弹窗不能刷新页面的问题，但是js方法还需要修改

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2172
 2025-06-06 08:29:51 +08:00
胡尧
4e1be6f4d5 修复二次弹窗不能刷新页面的问题，但是js方法还需要修改 2025-06-06 08:29:25 +08:00
禹翔辉
cdf8fbb12a Accept Merge Request #2171: (feature/销售合同优化 -> develop) 
Merge Request: 1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑

Created By: @禹翔辉
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2171
 2025-06-05 17:03:44 +08:00
yuxianghui
5d0f094da7 1 2025-06-05 17:03:06 +08:00
guanhuan
865d2216af 未齐套提示按钮修改 2025-06-05 17:02:39 +08:00
yuxianghui
95cb5251dc 1、销售订单添加合同编号字段，bfm下单接口添加合同编号同步；2、优化解除装夹工单完工时解绑rfid逻辑，优化工单返工时新工单绑定rfid逻辑 2025-06-05 16:59:33 +08:00
guanhuan
1d01e3ad2e 未齐套提示 2025-06-05 16:17:18 +08:00
禹翔辉
c8fe7504c7 Accept Merge Request #2170: (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/2170
 2025-06-05 15:35:03 +08:00
yuxianghui
222efc57c2 返工优化 2025-06-05 15:29:14 +08:00
禹翔辉
735d5c659d Accept Merge Request #2169: (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/2169
 2025-06-05 14:53:53 +08:00
yuxianghui
50d188b737 处理自动化产线的确认工艺路线报错 2025-06-05 14:49:09 +08:00
禹翔辉
af3ea0f702 Accept Merge Request #2168: (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/2168
 2025-06-05 13:59:35 +08:00