转库存品包件数量维护

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionStockArticleOweDTO.java

@@ -28,6 +28,5 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti
 	private String reservation;
 	private String startDate;
 	private String entDate;
-	private String warehouseEntryTimeEnd;
 	private List<Long> warehouseIdList;
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -525,7 +525,7 @@
             <if test="  param.customerAddress != null   and param.customerAddress != '' ">and ldsa.customer_address like
                 concat('%',#{param.customerAddress},'%')
             </if>
-            <if test="  param.trays != null   and param.trays != '' ">and lwtg.tray_code like
+            <if test=" param.trays != null   and param.trays != '' ">and lwtg.tray_code like
                 concat('%',#{param.trays},'%')
             </if>
             <if test="  param.allocation != null   and param.allocation != '' ">and lwug.position_code like
@@ -609,7 +609,7 @@
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
-            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0
+            AND (ldsa.incoming_num - ldsa.delivery_quantity) > 0 AND  ldsa.hand_quantity > 0
             <if test="par.warehouseId != null and par.warehouseId != '' ">
                 and ldsa.warehouse_id = #{par.warehouseId}
             </if>

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

@@ -526,12 +526,22 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleMapper.selectById(oo);                        //修改
 					stockArticleEntity.setId(oo);
 					stockArticleEntity.setGenre(2);
-					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
+//					stockArticleEntity.setTotalNumber(stockArticleEntity.getTotalNumber() - list1.size());
+					stockArticleEntity.setHandQuantity(0);
 					distributionStockArticleMapper.updateById(stockArticleEntity);
 				} else {
 					DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleMapper.selectById(oo);
 					distributionStockArticleEntity.setHandQuantity(distributionStockArticleEntity.getHandQuantity() - list1.size());
-					distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
+//					distributionStockArticleEntity.setTotalNumber(distributionStockArticleEntity.getTotalNumber() - list1.size());
+					//统计订单在库数量
+//					List<DistributionParcelListEntity> parcelListEntities = this.list(Wrappers.<DistributionParcelListEntity>query().lambda()
+//						.eq(DistributionParcelListEntity::getStockArticleId, oo)
+//						.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+//					);
+//					int sum = parcelListEntities.stream().filter(p -> "1".equals(p.getConditions())).mapToInt(DistributionParcelListEntity::getQuantity).sum();
+//					distributionStockArticleEntity.setHandQuantity(sum);
+//					distributionStockArticleEntity.setIncomingNum(sum);
+
 					distributionStockArticleMapper.updateById(distributionStockArticleEntity);
 				}
 			});