java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
ouyangxq
2026-09-14 12:00:48 +08:00
parent fb66d9200a
commit e55ab73e61
11 changed files with 288 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/mapper/LoadingCompletedEventMapper.java
+6 -3
View File
@@ -91,7 +91,8 @@ public interface LoadingCompletedEventMapper {
JOIN fl_dropship_pallet_carton carton ON carton.pallet_id=pallet.id
JOIN fl_loading_plan_item item ON item.loading_plan_id=#{planId}
AND item.account_id=carton.tenant_id AND item.inbound_id=carton.inbound_id
AND item.inbound_detail_id=carton.inbound_detail_id AND item.deleted=0
AND item.inbound_detail_id=carton.inbound_detail_id
AND item.pallet_id=pallet.id AND item.deleted=0
WHERE pallet.pallet_status='SEALED'
ORDER BY carton.tenant_id,carton.inbound_id,pallet.id,item.inbound_detail_id,carton.id
""")
@@ -101,7 +102,8 @@ public interface LoadingCompletedEventMapper {
SELECT COUNT(DISTINCT p.id) FROM fl_dropship_pallet p
JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id
JOIN fl_loading_plan_item i ON i.loading_plan_id=#{planId} AND i.account_id=c.tenant_id
AND i.inbound_id=c.inbound_id AND i.deleted=0 WHERE p.pallet_status='SEALED'
AND i.inbound_id=c.inbound_id AND i.pallet_id=p.id AND i.deleted=0
WHERE p.pallet_status='SEALED'
""")
int workPalletCount(@Param("planId") long planId);
@@ -109,7 +111,8 @@ public interface LoadingCompletedEventMapper {
SELECT COUNT(DISTINCT p.id) FROM fl_dropship_pallet p
JOIN fl_dropship_pallet_carton c ON c.pallet_id=p.id
JOIN fl_loading_plan_item i ON i.loading_plan_id=#{planId} AND i.account_id=c.tenant_id
AND i.inbound_id=c.inbound_id AND i.deleted=0 WHERE p.pallet_status='OPEN'
AND i.inbound_id=c.inbound_id AND i.pallet_id=p.id AND i.deleted=0
WHERE p.pallet_status='OPEN'
""")
int openWorkPalletCount(@Param("planId") long planId);
firstleg/src/test/java/com/baiyue/firstleg/service/LoadingCompletedOutboxServiceTest.java
+9
View File
@@ -248,6 +248,12 @@ class LoadingCompletedOutboxServiceTest {
String actualPalletsSql = String.join(" ", LoadingCompletedEventMapper.class
.getMethod("actualPalletRows", long.class).getAnnotation(Select.class).value())
.replaceAll("\\s+", " ");
String workPalletCountSql = String.join(" ", LoadingCompletedEventMapper.class
.getMethod("workPalletCount", long.class).getAnnotation(Select.class).value())
.replaceAll("\\s+", " ");
String openWorkPalletCountSql = String.join(" ", LoadingCompletedEventMapper.class
.getMethod("openWorkPalletCount", long.class).getAnnotation(Select.class).value())
.replaceAll("\\s+", " ");
assertThat(rowsSql).doesNotContain("p.plan_status = 'COMPLETED'")
.doesNotContain("o.process_status = 'LOADED'")
@@ -276,7 +282,10 @@ class LoadingCompletedOutboxServiceTest {
.doesNotContain("label.inbound_id = i.inbound_id");
assertThat(actualPalletsSql)
.contains("pallet.pallet_no AS pallet_code")
.contains("item.pallet_id=pallet.id")
.doesNotContain("pallet.pallet_code");
assertThat(workPalletCountSql).contains("i.pallet_id=p.id");
assertThat(openWorkPalletCountSql).contains("i.pallet_id=p.id");
}
@org.junit.jupiter.params.ParameterizedTest