Commit Graph
100 Commits
Author SHA1 Message Date
liuyihe 6c4ee2bfde 贴标申请,仓储转运 2026-10-12 15:57:47 +08:00
liuyihe a1cd47dabd 贴标申请,仓储转运 2026-10-12 13:42:23 +08:00
liuyihe ea3aae6093 Merge remote-tracking branch 'origin/test' into test 2026-10-12 13:42:13 +08:00
liuyihe b4b00ae3dd 贴标申请,仓储转运 2026-10-12 11:18:58 +08:00
liuyihe c6471d06ff 贴标申请,仓储转运 2026-10-10 16:58:33 +08:00
liuyihe 05302490fb 贴标申请,仓储转运 2026-10-10 16:15:17 +08:00
liuyihe 84864c2ecf Merge remote-tracking branch 'origin/test' into test 2026-10-10 14:47:42 +08:00
liuyihe d1b4cc9c0f 贴标申请,仓储转运 2026-10-10 14:47:31 +08:00
liuyihe 12a5093b41 贴标申请,仓储转运 2026-10-10 13:48:25 +08:00
liuyihe 7e37770f26 贴标申请,仓储转运 2026-10-09 17:27:02 +08:00
liuyihe bac7e0b214 贴标申请,仓储转运 2026-10-09 15:53:30 +08:00
liuyihe 1e15a2838a 贴标申请,仓储转运 2026-10-09 15:25:00 +08:00
liuyihe b4b3ae452c 贴标申请,仓储转运 2026-10-09 15:20:15 +08:00
liuyihe 2ec5414b39 贴标申请,仓储转运 2026-10-09 11:49:17 +08:00
liuyihe 315a510969 贴标申请,仓储转运 2026-10-08 18:27:52 +08:00
liuyihe a24a223a35 贴标申请,仓储转运 2026-10-08 18:10:06 +08:00
liuyihe 16d2d9111a 贴标申请,仓储转运 2026-10-08 15:55:47 +08:00
liuyihe dd792cd792 贴标申请,仓储转运 2026-09-28 17:34:38 +08:00
liuyihe 582ea098f9 Merge remote-tracking branch 'origin/test' into test 2026-09-28 11:59:16 +08:00
liuyihe 2bb98d2047 贴标申请,仓储转运 2026-09-28 11:59:08 +08:00
liuyihe bcf44affd7 贴标申请,仓储转运 2026-09-24 14:42:24 +08:00
liuyihe 56f4e6e35c 贴标申请,仓储转运 2026-09-24 14:09:50 +08:00
liuyihe d03862d47e 贴标申请,仓储转运 2026-09-24 11:39:15 +08:00
liuyihe b991eac3c3 Merge branch 'dev' into test
# Conflicts:
#	lastleg-service/src/test/java/com/baiyue/lastleg/transfer/service/WarehouseTransferServiceTest.java
2026-09-24 09:26:50 +08:00
liuyihe b89400e6dc 贴标申请,仓储转运 2026-09-24 09:13:02 +08:00
liuyihe 186b6be7d8 贴标申请,仓储转运 2026-09-24 09:01:14 +08:00
liuyihe b21690d943 贴标申请,仓储转运 2026-09-23 08:41:53 +08:00
liuyihe 2555eda797 货柜pda 添加操作人 2026-09-22 17:27:32 +08:00
liuyihe 9a8412279c 贴标申请,仓储转运 2026-09-22 08:49:21 +08:00
liuyihe 82ff6589cb 贴标申请,仓储转运 2026-09-20 16:55:55 +08:00
liuyihe 11e5c6b769 Merge remote-tracking branch 'origin/test' into test 2026-09-20 15:07:01 +08:00
liuyihe de5b1fa889 贴标申请,仓储转运 2026-09-20 15:06:56 +08:00
liuyihe 02844da360 贴标申请,仓储转运 2026-09-20 15:06:17 +08:00
liuyihe 29f05b7b09 贴标申请,仓储转运 2026-09-17 17:37:29 +08:00
liuyihe 506525524b Merge remote-tracking branch 'origin/test' into test 2026-09-15 15:28:40 +08:00
liuyihe cadc5a175e 提交 2026-09-15 15:15:46 +08:00
liuyihe 419950482f Merge remote-tracking branch 'origin/test' into test 2026-09-14 22:44:54 +08:00
liuyihe 70145e6b3b 废弃 ,换标文件上传 ,排车托盘锁粒度 2026-09-14 20:21:07 +08:00
liuyihe dbc4926d14 Merge remote-tracking branch 'origin/test' into test 2026-09-14 17:26:01 +08:00
liuyihe 57358d7665 Merge branch 'test' into dev 2026-09-14 17:04:24 +08:00
liuyihe 57f62ae97b 废弃 ,换标文件上传 ,排车托盘锁粒度 2026-09-14 16:49:08 +08:00
liuyihe 78bbd69a26 废弃 ,换标文件上传 ,排车托盘锁粒度 2026-09-14 16:49:00 +08:00
liuyihe cd578a8615 优化提交 2026-09-14 15:26:00 +08:00
liuyihe 60ebc2e376 优化提交 2026-09-14 15:03:04 +08:00
liuyihe 6c7bc1dc97 Merge test into dev and resolve conflicts 2026-09-14 11:02:37 +08:00
liuyihe f7ef8be18f 优化提交 2026-09-14 10:37:23 +08:00
liuyihe 8cf7c4b9c9 优化提交 2026-09-14 09:58:30 +08:00
liuyihe 72e62c0532 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	deploy/sql/海外区域统一增量-MySQL8.sql
#	lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java
#	lastleg-service/src/main/resources/db/lastleg.sql
#	lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
#	lastleg-service/src/test/java/com/baiyue/lastleg/relabel/service/RelabelApplicationServiceTest.java
#	scripts/README.md
2026-09-10 17:25:07 +08:00
liuyihe 2e6a18c58e 优化 2026-09-10 17:11:33 +08:00
liuyihe 1ee32b7a6f 优化 2026-09-09 15:14:15 +08:00
liuyihe 90a2eda86a 优化 2026-09-09 13:41:24 +08:00
liuyihe c3ae15abfe 优化 2026-09-09 12:02:12 +08:00
liuyihe f81fac8f6b Merge remote-tracking branch 'origin/dev' into dev 2026-09-08 20:52:55 +08:00
liuyihe c6156771b4 Merge remote-tracking branch 'origin/dev' into dev 2026-09-08 20:50:41 +08:00
liuyihe 4d4008cdb3 Merge origin/dev and resolve backend conflicts 2026-09-08 20:50:28 +08:00
liuyihe 249bf0ab4b 修改提交 2026-09-08 20:25:05 +08:00
liuyihe 2a27e28f26 修改提交 2026-09-08 17:58:42 +08:00
liuyihe 9d213b3843 修改提交 2026-09-06 16:02:11 +08:00
liuyihe 3ae8964fe5 修改提交 2026-09-06 15:02:33 +08:00
liuyihe 5c094fd0fd 修改提交 2026-09-04 12:23:26 +08:00
liuyihe 6f32971d79 修改提交 2026-09-04 11:50:01 +08:00
liuyihe 451c791f10 修改提交 2026-09-04 11:34:25 +08:00
liuyihe e6859c470c 修改提交 2026-09-04 10:34:35 +08:00
liuyihe 4ca5a57e6a 修改提交 2026-09-04 10:13:46 +08:00
liuyihe da4cb16d52 Merge remote-tracking branch 'origin/test' into test 2026-09-03 21:33:33 +08:00
liuyihe bfb139c7c7 修改提交 2026-09-03 21:33:23 +08:00
liuyihe baabfdabba 修改提交 2026-09-03 21:09:22 +08:00
liuyihe 29ec202563 修改提交 2026-09-03 15:11:40 +08:00
liuyihe e29695eb3f 修改提交 2026-09-03 15:10:35 +08:00
liuyihe fb91168614 Merge remote-tracking branch 'origin/test' into test 2026-09-03 11:59:15 +08:00
liuyihe f561e6bb09 修改提交 2026-09-03 11:59:06 +08:00
liuyihe a3715f618f 一件代发拣货 2026-09-03 10:44:34 +08:00
liuyihe 8a94c541cb Merge remote-tracking branch 'origin/dev' into dev 2026-09-01 15:14:24 +08:00
liuyihe 8b0c99593e 一件代发拣货 2026-09-01 13:41:00 +08:00
liuyihe f86fab838a 一件代发拣货 2026-09-01 10:35:54 +08:00
liuyihe 2f1bda8369 一件代发拣货 2026-09-01 09:57:10 +08:00
liuyihe a213be67c5 尾程暂扣回传 2026-08-31 15:22:32 +08:00
liuyihe a4189a0074 提交 2026-08-31 14:39:40 +08:00
liuyihe a4429f95b7 提交 2026-08-30 18:49:15 +08:00
liuyihe 5ddaa4d51f 提交 2026-08-28 15:25:50 +08:00
liuyihe 8a7c92bb0f 提交 2026-08-28 15:16:36 +08:00
liuyihe 4f2b670ebf 暂扣 标记合托功能 2026-08-28 14:55:18 +08:00
liuyihe 66b9c3aa77 暂扣 标记合托功能 2026-08-28 14:20:48 +08:00
liuyihe 6a83008ba6 提交 2026-08-28 09:59:17 +08:00
liuyihe 5f341d6fb5 一件代发 2026-08-27 17:23:18 +08:00
liuyihe 8d39c61863 提交 2026-08-27 16:54:03 +08:00
liuyihe 7e0911951d Merge branch 'dev' into dev-lyhfive
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	scripts/admin-test-env-modules/phase3-container-loading.mjs
#	scripts/admin-test-env-modules/phase3-loading.mjs
2026-08-27 13:40:26 +08:00
liuyihe a79999d97c 提交 2026-08-27 13:35:52 +08:00
liuyihe 3975759458 提交 2026-08-26 19:46:14 +08:00
liuyihe 63182a2b88 Merge branch 'dev' into dev-lyhfive 2026-08-26 16:07:27 +08:00
liuyihe b04c58a76a Merge branch 'dev' into dev-lyhfive
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	deploy/sql/海外区域统一增量-MySQL8.sql
#	lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java
#	lastleg-service/src/main/resources/db/lastleg.sql
#	lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java
2026-08-26 16:05:24 +08:00
liuyihe 5c6c0ef5ca 提交 2026-08-26 15:51:46 +08:00
liuyihe 93e1540e3f 提交 2026-08-26 15:02:14 +08:00
liuyihe e31fd8caa2 提交 2026-08-26 14:36:04 +08:00
liuyihe 394c690601 提交 2026-08-26 13:51:19 +08:00
liuyihe 270372f56a 提交 2026-08-26 11:05:26 +08:00
liuyihe 3bf68c1083 提交 2026-08-25 19:58:08 +08:00
liuyihe 749a0d40a7 Merge branch 'dev' into dev-lyhfive
# Conflicts:
#	firstleg/src/main/java/com/baiyue/firstleg/service/LoadingCompletedOutboxService.java
#	firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java
#	lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/controller/InboundPdaController.java
#	lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/dto/PdaResponses.java
#	lastleg-service/src/main/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowService.java
#	lastleg-service/src/main/java/com/baiyue/lastleg/service/LoadingCompletedConsumer.java
#	lastleg-service/src/test/java/com/baiyue/lastleg/inboundplan/pda/service/InboundPdaWorkflowServiceTest.java
#	lastleg-service/src/test/java/com/baiyue/lastleg/service/LoadingCompletedConsumerTest.java
2026-08-25 15:06:11 +08:00
liuyihe 5c331f173d 提交 2026-08-24 17:58:47 +08:00
liuyihe 01675b8220 提交 2026-08-24 17:12:30 +08:00