Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -2078,7 +2078,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 						//构建库存品
 						DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity();
 						disStockListDetailEntity.setNum(1);
-						disStockListDetailEntity.setSku(distributionStockListDTO.getSku());
+						disStockListDetailEntity.setSku(distributionStockListDTO.getCargoNumber());
 						disStockListDetailEntity.setStockListId(distributionStockListDTO.getId());
 						disStockListDetailEntity.setStockLockingStatus(InventoryLoadingStatusConstant.weizhuangche.getValue());
 						disStockListDetailEntity.setStockSignfoStatus(InventorySigningStatusConstant.weiqianshou.getValue());
@@ -3513,7 +3513,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 					//构建库存品
 					DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity();
 					disStockListDetailEntity.setNum(1);
-					disStockListDetailEntity.setSku(i.getSku());
+					disStockListDetailEntity.setSku(i.getCargoNumber());
 					disStockListDetailEntity.setStockListId(i.getId());
 					disStockListDetailEntity.setStockLockingStatus(InventoryLoadingStatusConstant.weizhuangche.getValue());
 					disStockListDetailEntity.setStockSignfoStatus(InventorySigningStatusConstant.weiqianshou.getValue());