From 3fc04cb02c7c6c35aa4835517fa2c4677ee53aeb Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 22 Apr 2024 20:00:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=201.=E5=A2=9E=E5=8A=A0=E8=80=81?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BB=93=E5=BA=93=20=20=E6=94=80=E6=9E=9D?=
 =?UTF-8?q?=E8=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/common/constant/OldSystemDataPushConfig.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
index e360f01b5..99ef1cb4e 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
@@ -76,6 +76,9 @@ public class OldSystemDataPushConfig {
 		// 宜宾仓
 		warehourseIds.add("146");
 
+		// 攀枝花
+		warehourseIds.add("32");
+
 	}
 
 

From 89f0d25286d24ac4f25026c4097595a345a35550 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 22 Apr 2024 20:11:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=201.=E5=A2=9E=E5=8A=A0=E8=80=81?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BB=93=E5=BA=93=20=20=E6=94=80=E6=9E=9D?=
 =?UTF-8?q?=E8=8A=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/common/constant/OldSystemDataPushConfig.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
index 99ef1cb4e..f9780a1df 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/OldSystemDataPushConfig.java
@@ -82,6 +82,7 @@ public class OldSystemDataPushConfig {
 	}
 
 
+
 	public static List<String> getWarehourseIdList(){
 
 		return warehourseIds;

From bc51def4079c146c87293200273e17347bf9323b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 23 Apr 2024 09:26:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=A4=8D=E6=A0=B8BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index dfc9cb84d..23f9620bc 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/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());