Commit Graph

85 Commits

Author SHA1 Message Date
hongchao 535e9ccc2f Merge remote-tracking branch 'origin/master' 2025-09-27 10:00:31 +08:00
hongchao dc26bfbc5e 费用推送产线服务地址更换 2025-09-27 09:53:23 +08:00
hayu 85887779fd 材料站领料单号一键出库 2025-09-26 18:01:23 +08:00
hongchao 5f6087d0a9 费用推送 2025-09-26 16:32:33 +08:00
bonus fc24c9d576 修改台账报表机具分包领用在用展示 2025-09-25 17:44:57 +08:00
hayu 9dab95e001 修改 2025-09-23 20:32:54 +08:00
mashuai e83e88e68f 材料站优化 2025-09-23 20:12:32 +08:00
mashuai 7597ea905f 优化 2025-09-22 20:52:01 +08:00
hongchao 69f46d8a1a Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material 2025-09-22 19:28:29 +08:00
hongchao b40219b870 材料站领料修改 2025-09-22 19:28:20 +08:00
bonus 664d09dbeb 材料站多协议类型树修改 2025-09-22 19:01:55 +08:00
mashuai 6b623f2eab 优化 2025-09-19 15:43:47 +08:00
hongchao 130440d3d8 sql修复 2025-09-19 14:54:54 +08:00
hongchao cadfdc6cdc Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material 2025-09-19 14:32:14 +08:00
mashuai 0485bcb690 优化 2025-09-19 14:32:03 +08:00
hongchao 1466d8686e Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material 2025-09-19 14:29:06 +08:00
hongchao 9260cd9822 材料站下拉框 2025-09-19 14:29:00 +08:00
mashuai 62f98b1445 优化 2025-09-19 14:21:31 +08:00
mashuai 040b69d594 材料站优化 2025-09-18 19:36:12 +08:00
bonus 9f70189db7 材料站增加检查报告 2025-09-18 17:14:50 +08:00
hongchao 0c1228234b 材料站领料记录添加备注 2025-09-18 10:49:31 +08:00
mashuai 7c31ac223b 材料站优化 2025-09-17 22:02:24 +08:00
mashuai 9b7527b087 材料站优化 2025-09-17 21:56:10 +08:00
mashuai 99b47f9fed 材料站优化 2025-09-17 20:32:54 +08:00
mashuai 6851a6b6c5 材料站优化 2025-09-17 18:23:02 +08:00
mashuai ee5d6414d7 功能优化 2025-09-16 21:07:49 +08:00
hongchao 76490ac8c7 工器具检验字段处理 2025-09-16 14:04:04 +08:00
mashuai 9d801cf860 功能优化 2025-09-16 12:18:34 +08:00
mashuai b1fe3526c4 功能优化 2025-09-15 19:55:53 +08:00
mashuai 3e0b2ace75 功能优化 2025-09-15 18:36:46 +08:00
mashuai 3315b69a88 功能优化 2025-09-15 12:25:17 +08:00
mashuai 989f1efc3d 功能优化 2025-09-14 23:24:15 +08:00
hayu 547af18752 材料站退料预约 2025-09-14 20:36:51 +08:00
hongchao 8a86d64282 材料站领料单详情接口 2025-09-14 11:24:02 +08:00
hongchao dae408efad 合并代码恢复自身代码 2025-09-13 20:09:29 +08:00
hongchao 167e214bc8 Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material
# Conflicts:
#	bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialLeaseInfoMapper.xml
#	bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
2025-09-13 17:57:09 +08:00
hongchao 95bb8ca367 材料站,直转 2025-09-13 17:53:54 +08:00
bonus 2457422046 领料出库、材料站类型树查询优化 2025-09-13 17:26:46 +08:00
hayu 513d96dca7 修改 2025-09-13 15:29:31 +08:00
mashuai 4bc97b87ac 材料站功能优化 2025-09-13 01:28:58 +08:00
mashuai 16573aedc9 材料站功能优化 2025-09-13 01:02:36 +08:00
mashuai 023ad15fe4 功能优化 2025-09-11 20:02:26 +08:00
mashuai 5c540d2cf1 功能优化 2025-09-09 12:10:21 +08:00
mashuai 714959eb41 功能优化 2025-09-03 02:29:08 +08:00
mashuai 9454d969aa 优化 2025-08-30 16:37:08 +08:00
mashuai 1eb3a39b1f 优化 2025-08-29 18:33:50 +08:00
mashuai c1348ed43d 材料站领料删除优化 2025-08-19 18:20:36 +08:00
mashuai 8b72d2358b 优化 2025-08-15 17:41:58 +08:00
mashuai 0de34998f7 优化 2025-08-14 13:48:59 +08:00
syruan a0f4d1e8d5 feat(material): 支持班组领料功能
- 新增字段和方法以支持班组领料
- 修改出库流程,增加对班组领料的处理逻辑
- 更新退料和结算相关功能,以适应班组领料
- 优化查询接口,支持按班组查询领料信息
2025-08-12 15:09:12 +08:00