diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index a0345da6c..54d0addb9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -1011,6 +1011,7 @@ public class DistributionStockupAppController extends BladeController { entity.setConditions("0"); entity.setType(2); entity.setAllocationId(stockupDTO.getAllocationId()); + entity.setOutboundType(stockupEntity.getTypeService()); distributionStockService.save(entity); // dataSourceTransactionManager.commit(transactionStatus);//提交 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 859cf37c0..f78bcddb6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -374,6 +374,7 @@ and ldsi.material_id = #{param.materialId} and ldsi.market_id = #{param.marketId} and ldsi.warehouse_id = #{param.warehouseId} + and ldsi.incoming_batch = #{param.incomingBatch} and ldsi.store_id = #{param.storeId}