 syruan
|
a0f4d1e8d5
|
feat(material): 支持班组领料功能
- 新增字段和方法以支持班组领料
- 修改出库流程，增加对班组领料的处理逻辑
- 更新退料和结算相关功能，以适应班组领料
- 优化查询接口，支持按班组查询领料信息
|
2025-08-12 15:09:12 +08:00 |
 hayu
|
185769e896
|
问题修改
|
2025-08-12 15:01:52 +08:00 |
 mashuai
|
15895c528e
|
优化
|
2025-08-11 17:37:35 +08:00 |
|
mashuai
|
29940b3575
|
优化
|
2025-08-11 15:17:33 +08:00 |
|
hayu
|
924dc3f6d7
|
问题修改
|
2025-08-11 11:07:39 +08:00 |
|
mashuai
|
f29ae556fc
|
优化
|
2025-08-11 11:02:32 +08:00 |
|
mashuai
|
da3cc8fbaf
|
优化
|
2025-08-08 15:30:24 +08:00 |
|
mashuai
|
4f67ac7f80
|
优化
|
2025-08-07 09:56:04 +08:00 |
|
hayu
|
daa2861f0d
|
问题修改
|
2025-08-06 20:47:10 +08:00 |
|
mashuai
|
487bc5047a
|
优化
|
2025-08-06 17:50:48 +08:00 |
|
hayu
|
d8e5d565e0
|
问题修改
|
2025-08-06 16:55:34 +08:00 |
|
mashuai
|
342f27cfc8
|
优化
|
2025-08-06 09:12:38 +08:00 |
|
mashuai
|
e7e694735d
|
优化
|
2025-08-06 09:00:41 +08:00 |
|
mashuai
|
5d8f82bc27
|
Merge remote-tracking branch 'origin/master'
|
2025-08-05 21:18:57 +08:00 |
|
mashuai
|
a364f573a9
|
优化
|
2025-08-05 21:18:28 +08:00 |
|
hayu
|
2c0820d48f
|
问题修改
|
2025-08-05 21:06:11 +08:00 |
|
mashuai
|
c1710f52b8
|
材料站页面优化
|
2025-08-05 19:33:56 +08:00 |
|
hayu
|
97be09380e
|
问题修改
|
2025-08-05 15:37:02 +08:00 |
|
mashuai
|
9611f236b9
|
优化
|
2025-08-05 13:56:49 +08:00 |
|
mashuai
|
a866447d06
|
优化
|
2025-08-04 15:34:14 +08:00 |
|
hayu
|
19cceff7b8
|
问题修改
|
2025-08-04 09:58:23 +08:00 |
|
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 |