自提详情扫描、拆包包件出库

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

@@ -565,16 +565,18 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		}
 		distributionStockListInfo.setId(null);
 		//对原来的库存品进行数据维护
-		one.setQuantityStock(one.getQuantityStock() - distributionStockListDTO.getUnpackingQuantity());
+		int num = one.getQuantityStock() - distributionStockListDTO.getUnpackingQuantity();
+		one.setQuantityStock(num);
 		one.setUnpackingQuantity(one.getUnpackingQuantity() + distributionStockListDTO.getUnpackingQuantity());
 		one.setUnpack(true);
 		one.setOutboundQuantity(one.getOutboundQuantity() + distributionStockListDTO.getUnpackingQuantity());
-		int num = one.getQuantityStock() - distributionStockListDTO.getUnpackingQuantity();
 		if (one.getSourceType().equals("1")){
 			List<DistributionParcelListEntity> parcelListEntities = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda()
 				.eq(DistributionParcelListEntity::getWarehouseId, one.getWarehouseId())
 				.eq(DistributionParcelListEntity::getOrderCode, one.getIncomingBatch())
 				.eq(DistributionParcelListEntity::getConditions, 2)
+				.ne(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yichuku.getValue())
+				.ne(DistributionParcelListEntity::getOrderPackageLoadingStatus, OrderPackageLoadingStatusConstant.yizhuangche.getValue())
 				.eq(DistributionParcelListEntity::getIsTransfer, 0)
 				.orderByDesc(DistributionParcelListEntity::getCreateTime)
 			);

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

@@ -3027,7 +3027,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			planNum = planNum + pn;
 			//通过订单id查询扫描表中有多少数据
 			QueryWrapper<DistributionBillLadingScanEntity> qw = new QueryWrapper<>();
-			qw.eq("stock_article_id", Long.parseLong(s))
+			qw.eq("stock_article_id", Long.parseLong(s));
+			qw.eq("bill_lading_id", main.getId())
 				.eq("is_deleted", 0);
 			List<DistributionBillLadingScanEntity> ls = distributionBillLadingScanService.list(qw);
 			if (!ls.isEmpty()) {
@@ -3426,6 +3427,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		distributionBillLadingScan.setPacketBarCode(coding);
 		distributionBillLadingScan.setStockListId(matchedPackage.getStockListId());
 		distributionBillLadingScan.setQuantity(1);
+		distributionBillLadingScan.setWarehouseId(myCurrentWarehouse.getId());
 		String content = "包件在" + warehouse.getName() + "由" + AuthUtil.getNickName() + "自提扫描签收,操作方式:扫描签收,自提批次号:" + pickupBatch;
 		JSONObject js = handleLogJSONObject(warehouse, AuthUtil.getUser(), coding, content, WorkNodeEnums.SIGN_BILLOFLADING.getCode());
 		aaa.add(js);