From 058b6ca1b57fd1118a536f7b8a3993394b45826d Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 29 Jan 2024 13:47:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/springblade/common/constant/LauncherConstant.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
index ffbd3c95e..fcbb62526 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/LauncherConstant.java
@@ -45,7 +45,7 @@ public interface LauncherConstant {
 	/**
 	 * nacos dev 地址
 	 */
-	String NACOS_DEV_ADDR = "192.168.2.100:8848";
+	String NACOS_DEV_ADDR = "192.168.2.46:8848";
 
 
 	/**
@@ -77,7 +77,7 @@ public interface LauncherConstant {
 	/**
 	 * seata dev 地址
 	 */
-	String SEATA_DEV_ADDR = "192.168.2.100:8091";
+	String SEATA_DEV_ADDR = "192.168.2.46:8091";
 
 
 	/**

From d33a44e0a48e299f972dc89bebe9e984554f2d7c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 29 Jan 2024 15:09:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml | 2 +-
 .../service/impl/DistributionSignforServiceImpl.java            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
index 8ab96aec7..d37f79d2b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml
@@ -472,7 +472,7 @@
     </select>
     <select id="selectByBillLadingCode"
             resultType="com.logpm.distribution.entity.DistrilbutionBillLadingEntity">
-        SELECT * FROM logpm_distribution_bill_lading WHERE warehouse_id = #{warehouseId} AND pickup_batch=#{pickupBatch} AND is_deleted = 0
+        SELECT * FROM logpm_distrilbution_bill_lading WHERE warehouse_id = #{warehouseId} AND pickup_batch=#{pickupBatch} AND is_deleted = 0
     </select>
     <select id="selectBillLadingPlanNum" resultType="java.lang.Integer">
         SELECT(
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 19d7e6994..ce823fc75 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
@@ -849,7 +849,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			Integer stockUpPlanNum = distributionStockupMapper.selectStockUpPlanNum(distributionStockupEntity.getId());
 			startStockUpNodeVo.setNodeInfo("计划备货"+stockUpPlanNum+"件;");
 			nodeVos.add(startStockUpNodeVo);
-			if (distributionStockupEntity.getAssignStatus().equals(StockAssignStatusConstant.yizhipai.getValue())){
+			if (distributionStockupEntity.getAssignStatus().equals(StockAssignStatusConstant.yizhipai.getValue()) && distributionStockupEntity.getForkliftName()!= null){
 				DeliveryNodeVo assignStockUpNodeVo = new DeliveryNodeVo();
 				assignStockUpNodeVo.setNodeName(StockUpNode.yizhipai.getName());
 				assignStockUpNodeVo.setTime(distributionStockupEntity.getAssignTime());