Commit Graph

53 Commits

Author SHA1 Message Date
806d3ff06b Merge remote-tracking branch 'origin/master' 2026-01-14 20:37:46 +08:00
d39f071c38 fix:出库、取货 2026-01-14 20:37:40 +08:00
feb78385eb rev:打印修改 2026-01-14 15:55:55 +08:00
61b8d260e3 rev:测试修改 2026-01-14 14:25:01 +08:00
f585da58d1 Merge branch 'master' of http://47.111.78.178:8012/liuxy/HuaDongYiYaoWMS
# Conflicts:
#	wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPdGroupbucketService.java
#	wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.java
#	wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPdGroupbucketMapper.xml
#	wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPdGroupbucketServiceImpl.java
#	wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/IMdPbGroupplateService.java
#	wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java
2026-01-13 20:10:39 +08:00
bf1f191be9 add:PC桶记录 2026-01-13 20:06:12 +08:00
a0194db46c fix:修复冲突 2026-01-12 19:48:22 +08:00
999d4bebea feat: 外包间任务 2026-01-12 19:46:34 +08:00
841aa2b367 rev: 组盘测试修改 2026-01-12 10:52:08 +08:00
da6188ef83 rev:组盘测试修改 2026-01-12 10:51:48 +08:00
95c4bc3997 Merge remote-tracking branch 'origin/master' 2026-01-09 16:43:24 +08:00
28b4645981 opt: 包衣前段业务 2026-01-09 16:42:16 +08:00
2d316f35bf rev:测试修改 2026-01-09 16:42:01 +08:00
c7a61edd26 Merge remote-tracking branch 'origin/master' 2026-01-08 20:01:13 +08:00
72ad55b1c9 opt: 压片前段业务 2026-01-08 20:00:35 +08:00
ebbfa976c4 rev:测试修改 2026-01-08 15:55:28 +08:00
4f0bf0e727 add:手持通用功能 2026-01-07 17:20:48 +08:00
a42c82f7c8 add:无人车卸货 2026-01-06 20:24:36 +08:00
e7f84b13b0 add:手持增加收货入库、直接出库 2025-12-31 16:19:40 +08:00
99e959ce52 add:手持空托盘堆叠 2025-12-30 14:26:08 +08:00
39473900c2 add:手持外包材管理 2025-12-29 17:55:54 +08:00
ebb75d2ed5 add:1.外包材收货2.外包材转运 2025-12-26 13:52:32 +08:00
7e555c7b32 opt: 压片前段业务 2025-12-25 09:57:51 +08:00
c9bb61c6cd opt: 托盘叫料、取料 2025-12-11 15:57:45 +08:00
fe242a9175 opt: 入库 2025-12-10 16:02:17 +08:00
a1ce68f74a rev:空载具出库更新起点 2025-12-09 17:47:23 +08:00
67a8490350 Merge remote-tracking branch 'origin/master' 2025-12-09 14:26:30 +08:00
e04781108e fix: 直接入库 2025-12-09 14:24:53 +08:00
78a487fff1 rev:入库强制确认 2025-12-09 14:11:10 +08:00
0e52c0b9da opt: 载具号 2025-12-05 17:58:03 +08:00
c9a861772d add:中间站入库分配规则 2025-12-05 15:29:15 +08:00
8190cebe0d feat: 手持预加工下料、生产下料(粉碎、制粒,压片下料) 2025-12-04 16:35:28 +08:00
ef53f522ed add:库存查询袋信息 2025-12-03 15:41:01 +08:00
48d47cbba0 feat: 手持组桶 2025-12-03 09:42:11 +08:00
0a5fe359b2 feat: 加工下料 2025-12-02 16:02:23 +08:00
96a4a34b18 fix: 剩料回库 2025-12-02 13:26:16 +08:00
d88a9478e5 feat: 点位取货、剩料回库 2025-12-02 13:21:37 +08:00
dcb0ef7ba0 feat: 托盘叫料 2025-12-01 17:49:24 +08:00
a6a10f770d add;入库混料 2025-12-01 17:31:06 +08:00
4a212755b0 Merge branch 'master' of http://47.111.78.178:8012/liuxy/HuaDongYiYaoWMS 2025-12-01 17:30:40 +08:00
87f6cc442c add:入库混料 2025-12-01 17:30:36 +08:00
79a8b3d3db fix: 手持直接入库 2025-11-28 17:55:02 +08:00
b6d08f53a6 feat: 手持空载具入库 2025-11-28 14:56:15 +08:00
b7f1602213 fix: 原辅料直接入库 2025-11-27 17:37:00 +08:00
5c03f3e82c Merge remote-tracking branch 'origin/master' 2025-11-27 14:46:05 +08:00
5a184130b5 feat: 原辅料直接入库 2025-11-27 14:45:33 +08:00
a1ad41478d add:PC组盘 2025-11-26 19:58:56 +08:00
4e30f7bfd4 Merge branch 'master' of http://47.111.78.178:8012/liuxy/HuaDongYiYaoWMS 2025-11-26 19:58:12 +08:00
7b1a9aef6e rev:PC组盘 2025-11-26 19:58:08 +08:00
bd74f763c7 feat: 手持:组盘、组袋、呼叫空托 2025-11-26 10:39:02 +08:00