修改提交

lastleg-service/src/main/java/com/baiyue/lastleg/relabel/service/RelabelApplicationService.java

@@ -126,7 +126,7 @@ public class RelabelApplicationService implements WalletResultHandler {
                 || !Objects.equals(balance.getInboundOrderId(), item.sourceInboundOrderId())) {
                 throw conflict("Selected inventory does not belong to this customer, operation warehouse and inbound order");
             }
-            if (value(position.getAvailablePackages()) < item.totalPackageCount()) {
+            if (value(position.getAvailablePackages()) < item.notifiedPackageCount()) {
                 throw conflict("Available inventory changed for inbound " + balance.getInboundOrderNo());
             }
             sources.add(new SourceInventory(item, balance));
@@ -137,7 +137,7 @@ public class RelabelApplicationService implements WalletResultHandler {
         String relabelNo = orderNoGenerator.next("RELABEL", operationWarehouseId, applicationId);
         for (SourceInventory source : sources) {
             inventoryCommands.hold(customerId, operatorId, new InventoryCommandRequests.Move(
-                source.request().sourceInventoryPositionId(), source.request().totalPackageCount(), relabelNo,
+                source.request().sourceInventoryPositionId(), source.request().notifiedPackageCount(), relabelNo,
                 null, "RELABEL:" + relabelNo, request.idempotencyKey().trim() + ":HOLD:"
                     + source.request().sourceInventoryPositionId(), "贴标申请冻结原入仓单库存"));
         }
@@ -398,9 +398,9 @@ public class RelabelApplicationService implements WalletResultHandler {
 
     private void releaseInventory(String customerId, String operatorId, RelabelApplication application) {
         for (RelabelItem item : itemList(application.getId())) {
-            if (item.getSourceInventoryPositionId() == null || item.getTotalPackageCount() == null) continue;
+            if (item.getSourceInventoryPositionId() == null || item.getNotifiedPackageCount() == null) continue;
             inventoryCommands.release(customerId, operatorId, new InventoryCommandRequests.Move(
-                item.getSourceInventoryPositionId(), item.getTotalPackageCount(), application.getRelabelNo(), null,
+                item.getSourceInventoryPositionId(), item.getNotifiedPackageCount(), application.getRelabelNo(), null,
                 "RELABEL:" + application.getRelabelNo(), application.getIdempotencyKey() + ":RELEASE:"
                     + item.getSourceInventoryPositionId(), "贴标结束释放库存至原入仓单"));
         }