Commit Graph
100 Commits
Author SHA1 Message Date
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
liuyihe ce9f08c756 提交 2026-08-24 14:52:50 +08:00
liuyihe 6a86dbcb37 Merge remote-tracking branch 'origin/dev-lyhfive' into dev-lyhfive 2026-08-24 13:41:54 +08:00
liuyihe e398f1f7e0 修改提交 2026-08-22 12:35:32 +08:00
liuyihe 93feb7da67 修改提交 2026-08-22 10:16:45 +08:00
liuyihe ab2f3ed72e Merge remote-tracking branch 'origin/dev' into dev 2026-08-22 09:52:04 +08:00
liuyihe 15636a1600 修改提交 2026-08-22 09:51:41 +08:00
liuyihe 76b41c0812 Merge remote-tracking branch 'origin/dev' into dev 2026-08-21 18:12:25 +08:00
liuyihe 4f14367eba 修改提交 2026-08-21 18:12:07 +08:00
liuyihe d1d269e96f 修改提交 2026-08-21 17:38:14 +08:00
liuyihe bbd303cd65 修改提交 2026-08-21 17:21:26 +08:00
liuyihe e534784052 提交 2026-08-21 14:42:40 +08:00
liuyihe 5fd00d3151 提交 2026-08-21 11:43:03 +08:00
liuyihe e17f03e596 提交 2026-08-21 10:43:25 +08:00
liuyihe a38396ce3f 提交 2026-08-20 18:06:07 +08:00
liuyihe c9a05b108b 桥接事件 2026-08-20 16:45:47 +08:00
liuyihe 1f0c0f7751 提交 2026-08-20 15:59:45 +08:00
liuyihe 2847ad1b2d 提交 2026-08-20 15:58:25 +08:00
liuyihe cd34cd426e 提交 2026-08-20 15:25:40 +08:00
liuyihe b55b049e77 优化 2026-08-20 15:20:05 +08:00
liuyihe 802893b2ff Merge remote-tracking branch 'origin/dev' into dev 2026-08-20 13:34:55 +08:00
liuyihe b139255d3b 入库修改 2026-08-20 13:34:34 +08:00
liuyihe f03ea227ed 暂存提交 2026-08-19 17:23:54 +08:00
liuyihe 26eba227eb 暂存提交 2026-08-19 17:22:03 +08:00
liuyihe 88100f3536 Merge remote-tracking branch 'origin/dev' into dev 2026-08-19 16:49:58 +08:00
liuyihe 63618c20dc 暂存提交 2026-08-19 16:49:41 +08:00
liuyihe 6acb6178da 暂存提交 2026-08-19 16:24:02 +08:00
liuyihe 6b077c20db 暂存提交 2026-08-19 09:28:40 +08:00
liuyihe 0192380e81 暂存提交 2026-08-14 15:15:43 +08:00
liuyihe 8540147992 Merge branch 'test' into test-lastlag
# Conflicts:
#	auth/src/main/java/com/baiyue/auth/service/AuthService.java
#	auth/src/test/java/com/baiyue/auth/service/AuthServiceSmallJwtTest.java
2026-08-14 09:24:12 +08:00
liuyihe af646c6f1f 暂存提交 2026-08-13 19:49:19 +08:00
liuyihe 073cb6a577 暂存提交 2026-08-13 19:01:16 +08:00
liuyihe c43d581ba6 打印箱唛修改 尾程垮桥事件提交 2026-08-13 17:13:58 +08:00
liuyihe 43bbd9c1e8 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
2026-08-13 09:51:02 +08:00
liuyihe 74edf76e72 快速下单 2026-08-13 09:50:06 +08:00
liuyihe c2b1ab92ff 第三期装柜验收优化修改 2026-08-12 13:34:26 +08:00
liuyihe bed917ba6c 装柜修改 2026-08-11 20:00:31 +08:00
liuyihe cb30839945 装柜修改 2026-08-11 14:24:05 +08:00
liuyihe e915086133 装柜修改 2026-08-10 20:52:46 +08:00
liuyihe a1bcb519c9 装柜只能限制一个人拣货 2026-08-10 12:50:22 +08:00
liuyihe 037527b4cb 装柜回归测试 2026-08-10 11:30:14 +08:00
liuyihe 0ce264a257 装柜回归测试 2026-08-09 20:35:11 +08:00
liuyihe 0d70edc020 Merge branch 'test-02huogui' into test
# Conflicts:
#	firstleg/src/main/java/com/baiyue/firstleg/service/InboundMeasurementService.java
#	firstleg/src/test/java/com/baiyue/firstleg/service/InboundMeasurementServiceTest.java
2026-08-07 23:46:44 +08:00
liuyihe a09639ff05 暂存提交 2026-08-07 23:43:41 +08:00
liuyihe 2b81fd40e7 Merge branch 'test' into test-02huogui
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java
#	firstleg/src/main/resources/application.yml
#	firstleg/src/main/resources/openapi/fba-pricing-v1.yaml
#	firstleg/src/test/java/com/baiyue/firstleg/service/FbaPricingServiceTest.java
#	order/src/main/java/com/baiyue/order/controller/PlatformFirstLegOrderController.java
#	order/src/test/java/com/baiyue/order/controller/OrderControllerPermissionTest.java
2026-08-07 19:49:09 +08:00
liuyihe 3f15f3ad2b 暂存提交 2026-08-07 19:40:42 +08:00
liuyihe 7c17b1a76a 订单批量审核提交 2026-08-07 15:32:59 +08:00
liuyihe 77dc32a69a 订单批量审核提交 2026-08-07 14:52:21 +08:00
liuyihe 0dc60d835b 装柜 2026-08-07 12:19:47 +08:00
liuyihe efb01f8932 Merge branch 'test' into test-02huogui
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
#	firstleg/src/main/java/com/baiyue/firstleg/BaiyueFirstlegApplication.java
#	firstleg/src/main/resources/openapi/firstleg-v1.yaml
2026-08-07 11:11:43 +08:00
liuyihe ebea3a1813 装柜 2026-08-07 10:57:06 +08:00
liuyihe 913eca7b7d 装柜 2026-08-06 17:48:50 +08:00
liuyihe c68eedd3f3 Merge branch 'test' into test-02huogui
# Conflicts:
#	deploy/sql/头程数据库统一增量-MySQL8.sql
2026-08-06 15:54:25 +08:00
liuyihe c3a978b497 提交 2026-08-06 15:48:21 +08:00
liuyihe 4df8b8c355 客户运费计费 2026-08-05 20:32:43 +08:00
liuyihe 06f7f9d2f2 日志记录提交 2026-08-05 14:20:04 +08:00
liuyihe cac377de96 新增海外仓阶梯费用 2026-08-05 11:20:28 +08:00
liuyihe 9678ee0f1f 删除增量文件 2026-08-05 10:54:38 +08:00
liuyihe 496fc58a90 格式修改 2026-08-05 10:35:07 +08:00
liuyihe de8acc419f 二期内容提交:客户端订单列表 2026-08-04 20:49:46 +08:00
liuyihe 917f217088 二期内容提交 2026-08-04 20:13:56 +08:00
liuyihe e20d20c540 二期内容提交 2026-08-04 20:13:40 +08:00
liuyihe c3bf4edd53 二期内容提交 2026-08-04 19:48:35 +08:00
liuyihe 3292f2c597 二期内容提交 2026-08-04 17:29:36 +08:00
liuyihe b7d36d4766 二期内容提交 2026-08-04 17:18:07 +08:00
liuyihe 2b712f9cdf Merge remote-tracking branch 'origin/test-01' into test-01 2026-08-04 14:56:12 +08:00
liuyihe 656f05d3c6 二期内容提交 2026-08-04 14:55:58 +08:00
liuyihe 4d8b31429c Merge remote-tracking branch 'origin/test' into test-01 2026-08-04 14:55:52 +08:00
liuyihe 7e945229be Merge remote-tracking branch 'origin/test' into test-01
# Conflicts:
#	config/nacos/cn/file-service.yml
#	config/nacos/local/file-service.yml
#	deploy/sql/README.md
#	firstleg/pom.xml
2026-08-04 12:27:25 +08:00
liuyihe addde4375e 二期内容提交 2026-08-04 12:23:46 +08:00
liuyihe 25d2a13581 二期内容提交 2026-08-04 10:24:43 +08:00
liuyihe 57b54a5236 二期内容提交 2026-08-04 10:07:45 +08:00
liuyihe b2b4ff429d 暂存 2026-08-03 17:26:59 +08:00
liuyihe 28e9b45314 暂存 2026-08-03 16:40:46 +08:00
liuyihe 1c11e2f7d0 修改 2026-08-03 15:41:00 +08:00