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

blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java

@@ -76,9 +76,13 @@ public class OldSystemDataPushConfig {
 		// 宜宾仓
 		warehourseIds.add("146");
 
+		// 攀枝花
+		warehourseIds.add("32");
+
 	}
 
 
+
 	public static List<String> getWarehourseIdList(){
 
 		return warehourseIds;

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

@@ -603,10 +603,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionSignforEntity distributionSignfor = this.getById(distributionSignforDTO.getId());
 		Integer loadingNum = distributionSignfor.getLoadedNumber() + distributionSignfor.getLoadedinNumber();
 		Integer signNum = distributionSignfor.getReceivedQuantity() + distributionSignfor.getReceivedinQuantity();
-		if (Func.equals(loadingNum,signNum)){
-			log.error("复核签收装车数和签收数不一致,装车数:{},签收数:{}", loadingNum,signNum);
-			return R.fail("请维护计划后进行复核!!!");
+		int i = loadingNum - signNum;
+		if (i < 0){
+			log.info("复核签收装车数和签收数不一致,装车数:{},签收数:{}", loadingNum,signNum);
+			return R.fail("存在装车还未签收数据!!!");
 		}
+
 		BladeUser user = AuthUtil.getUser();
 		distributionSignfor.setExamineUserId(user.getUserId());
 		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());