Merge branch 'dev' into pre-production

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";
 
 
 	/**

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(

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());