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

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -223,12 +223,12 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@ApiModelProperty(value = "零担标识")
 	@TableField(exist = false)
 	private String isZero;
-	/**
-	 * 商场名称
-	 */
-	@ApiModelProperty(value = "商场iD")
-	@TableField(exist = false)
-	private Long mallId;
+//	/**
+//	 * 商场名称
+//	 */
+//	@ApiModelProperty(value = "商场iD")
+//	@TableField(exist = false)
+//	private Long mallId;
 	/**
 	 * 托盘ID
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java

@@ -182,7 +182,7 @@ public class BasicdataClientController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入basicdataClient")
 	public R save(@Valid @RequestBody BasicdataClientEntity basicdataClient) {
-		return R.status(basicdataClientService.save(basicdataClient));
+		return R.status(basicdataClientService.saveClient(basicdataClient));
 	}
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java

@@ -117,4 +117,10 @@ public interface IBasicdataClientService extends BaseService<BasicdataClientEnti
 	 */
 	String getFinallyClientCode();
 
+	/**
+	 * 保存客户信息
+	 * @param basicdataClient
+	 * @return
+	 */
+	boolean saveClient(BasicdataClientEntity basicdataClient);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -678,5 +678,15 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		return "HT00" + anInt;
 	}
 
+	@Override
+	public boolean saveClient(BasicdataClientEntity basicdataClient) {
+		boolean save = this.save(basicdataClient);
+		if (save){
+			//进行redis的设置
+			redis.set(RedisKeyConstant.FINAL_CLIENT_CODE + AuthUtil.getTenantId(), basicdataClient.getClientCode());
+		}
+		return true;
+	}
+
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -1493,7 +1493,7 @@ public class DistributionStockupAppController extends BladeController {
 							.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
 							.eq(DistributionParcelListEntity::getConditions, "2")
 							.eq(DistributionParcelListEntity::getMaterialId, entity.getMaterialId())
-							.eq(DistributionParcelListEntity::getMallId, entity.getMarketId())
+							.eq(DistributionParcelListEntity::getMarketId, entity.getMarketId())
 							.set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue())
 						);
 

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

@@ -481,7 +481,7 @@
                          FROM
                              logpm_distribution_reservation_package ldrp
                          WHERE
-                             ldrp.reservation_id = lds.reservation_id and ldrp.packet_bar_status != 2
+                             ldrp.reservation_id = lds.reservation_id and ldrp.packet_bar_status != 2 AND ldrp.stock_article_id = ldrs.stock_article_id
                      ) readyStock,
                      (
                          SELECT

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

@@ -209,7 +209,7 @@ public interface DistributionSignforMapper extends BaseMapper<DistributionSignfo
 	 * @param id
 	 * @param id1
 	 */
-    void deleteByReservationAndDeliveryId(@Param("reservationId") Long id,@Param("deliveryId") Long id1);
+    void deleteByReservationAndDeliveryId(@Param("reservationId") Long reservationId,@Param("deliveryId") Long deliveryId);
 
 	Integer updateSignforNum(@Param("deliveryId") Long deliveryId,@Param("reservationId") Long reservationId,@Param("packageNub") Integer packageNub);
 

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

@@ -6042,6 +6042,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				JSONObject js = handleLogJSONObject(myCurrentWarehouse, AuthUtil.getUser(), parcelListEntity.getOrderPackageCode(), content, WorkNodeEnums.CANCEL_DISTRIBUTION.getCode());
 				aaa.add(js);
 
+				//对滞留包件进行签收信息数量减少
+				distributionSignforMapper.deductionLoadingPacjageNum(reservationId,deliveryId,1);
+
 			}
 			if (!aaa.isEmpty()) {
 				trunklinePackageTrackLogClient.addPackageTrackLog(aaa);
@@ -7243,7 +7246,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 		// 根据装载数量是否等于配送数量且所有配送是否已完成签收，设置配送状态
 		// 如果装载数量等于配送数量且所有配送已完成签收，设置为“已完成”；否则设置为“配送中”
-		deliveryListEntity.setDeliveryStatus(loadingNum == deliveryQuantity && isAllSignforCompleted(deliveryListEntity.getId())
+		deliveryListEntity.setDeliveryStatus(isAllSignforCompleted(deliveryListEntity.getId())
 			? DeliveryStatusConstant.yiwancheng.getValue()
 			: DeliveryStatusConstant.peisongzhong.getValue());
 

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

@@ -878,7 +878,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		List<Long> materialId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialId).distinct().collect(Collectors.toList());
 		List<String> materialCode = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialCode).distinct().collect(Collectors.toList());
 		List<String> materialUnit = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialUnit).distinct().collect(Collectors.toList());
-		List<Long> mallId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMallId).distinct().collect(Collectors.toList());
+		List<Long> mallId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMarketId).distinct().collect(Collectors.toList());
 		List<String> materialName = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getMaterialName).distinct().collect(Collectors.toList());
 		List<Long> brandId = distributionParcelListEntities.stream().map(DistributionParcelListEntity::getBrandId).distinct().collect(Collectors.toList());
 		if (materialId.size() != 1 || materialCode.size() != 1 || materialUnit.size() != 1 || mallId.size() != 1 || materialName.size() != 1 || brandId.size() != 1) {