Commit Graph

1554 Commits

Author SHA1 Message Date
hayu 68764e648b 问题修改 2025-08-03 18:11:17 +08:00
mashuai f165448650 分公司班组领料同步材料站 2025-08-03 16:25:20 +08:00
mashuai 16fe9fedbb 优化 2025-08-03 11:10:54 +08:00
syruan 3a0ef44b56 完善优化结算 2025-08-01 16:07:02 +08:00
hongchao d51a0daf1c 退料 2025-08-01 14:37:18 +08:00
mashuai 8ec3710c2b 优化 2025-07-31 18:59:04 +08:00
mashuai 3888e72842 优化 2025-07-31 18:25:38 +08:00
mashuai a0f3649173 优化 2025-07-31 17:11:00 +08:00
hayu f281707f43 问题修改 2025-07-31 16:42:40 +08:00
mashuai 949f592b45 优化 2025-07-31 16:25:56 +08:00
mashuai 58c4819819 优化 2025-07-31 15:53:32 +08:00
mashuai 6fa6783969 优化 2025-07-31 15:50:41 +08:00
mashuai d6279ec605 优化 2025-07-31 15:06:18 +08:00
hongchao 80cb178f52 退料负责机具权限 2025-07-31 10:25:47 +08:00
jiang 364a09f8ed 日更新 2025-07-30 18:31:30 +08:00
jiang 0f29e252bc Merge remote-tracking branch 'origin/master' 2025-07-30 18:28:08 +08:00
jiang 962853c093 日更新 2025-07-30 18:28:01 +08:00
hayu 81c964be5a 问题修改 2025-07-30 18:12:00 +08:00
hongchao 3be946db4c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-material/src/main/resources/mapper/material/common/SelectMapper.xml
2025-07-30 17:45:49 +08:00
hongchao 86ad36e74d 退料修改 2025-07-30 17:42:21 +08:00
syruan c43ec2a116 Merge remote-tracking branch 'frps/master' into frp-master 2025-07-30 15:53:43 +08:00
syruan 58d40d964a refactor(bonus-material): 重构协议信息获取和处理逻辑
- 将 mergerData 和 handleData 方法从控制器移动到服务层
- 优化了数据合并和处理的逻辑
- 使用 StringUtils 和 Objects 类改进了字符串和对象的处理- 调整了方法参数和返回类型,提高了代码的可读性和可维护性
2025-07-30 15:53:38 +08:00
jiang 847e0eaac8 日更新 2025-07-30 15:42:28 +08:00
mashuai f377f210c5 Merge remote-tracking branch 'origin/master' 2025-07-30 14:23:36 +08:00
mashuai a754499791 优化 2025-07-30 14:23:19 +08:00
syruan 91efabadc6 材料站协议查询修改 2025-07-30 14:12:21 +08:00
mashuai 5064809f9e 优化 2025-07-30 13:50:08 +08:00
syruan 33df1a7311 材料站班组下拉选、协议下拉选 2025-07-30 11:28:08 +08:00
mashuai 76f1a1f7f9 Merge remote-tracking branch 'origin/master' 2025-07-30 10:45:21 +08:00
mashuai 7db751ab74 优化 2025-07-30 10:45:04 +08:00
hayu c6b7c6ab2d 问题修改 2025-07-30 01:35:19 +08:00
mashuai c63a79304f 优化 2025-07-29 18:42:23 +08:00
hayu 2983184263 问题修改 2025-07-29 17:43:21 +08:00
jiang cbd7538120 日更新 2025-07-29 15:53:18 +08:00
jiang 274a72d126 日更新 2025-07-29 15:53:01 +08:00
jiang a114f6cb13 Merge remote-tracking branch 'origin/master' 2025-07-28 18:41:42 +08:00
jiang bc8ce5ad71 现场维修 2025-07-28 18:41:33 +08:00
bonus d5f6711d1c Merge remote-tracking branch 'origin/master' 2025-07-28 15:57:27 +08:00
bonus a816d9448d 维修拆分提交修改 2025-07-28 15:57:07 +08:00
mashuai e592719669 优化 2025-07-28 15:56:11 +08:00
syruan 2338d1c89e 新购的整体查询速度优化 2025-07-28 15:53:50 +08:00
syruan e1aef51b22 退料查询优化,3秒->0.3秒 2025-07-28 11:11:01 +08:00
syruan dc39193624 修正领料库存逻辑 2025-07-28 09:51:48 +08:00
syruan 21bee91a10 领料查询、出库的速度优化
材料站出库优化
select下拉框优化
2025-07-27 19:09:42 +08:00
mashuai 0ec7b9ca73 优化 2025-07-27 14:50:47 +08:00
bonus f7b00ae4c0 退料编码查询,退料任务结束修改 2025-07-26 19:10:34 +08:00
bonus 02f28b9cbb 修试后入库驳回至维修定损,修改默认值 2025-07-26 16:00:31 +08:00
mashuai 5cef41384f 优化 2025-07-26 14:03:59 +08:00
syruan db111f72b8 fix(bonus-material): 领料出库驳回修改任务状态 2025-07-26 13:39:18 +08:00
bonus eecad8ae44 mapper映射修改 2025-07-26 13:27:16 +08:00