From 45cfa4d0ce2ae291f9a484fe3acca7bbc87c1fae Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Thu, 3 Aug 2023 10:29:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/common/utils/CommonUtil.java  |  2 +-
 .../vo/DistrilbutionBillLadingOwnVO.java      |  7 +-
 .../DistrilbutionAppBillLadingDetailVO.java   |  4 +-
 .../mapper/DistributionDeliveryListMapper.xml | 12 ++--
 .../mapper/DistributionParcelListMapper.xml   |  8 +--
 .../mapper/DistributionReservationMapper.xml  |  4 +-
 .../mapper/DistributionStockArticleMapper.xml |  4 +-
 .../mapper/DistrilbutionBillLadingMapper.java |  3 +-
 .../mapper/DistrilbutionBillLadingMapper.xml  | 68 +++++++++----------
 .../DistrilbutionBillLadingServiceImpl.java   |  2 +-
 10 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java
index 6afaff719..552fc31dc 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/utils/CommonUtil.java
@@ -55,7 +55,7 @@ public class CommonUtil {
 
 
 	public static String datoLongToString(Long dateTime,String format,String timeZone){
-		if (StringUtils.isEmpty(timeZone)) {
+		if (!StringUtils.hasLength(timeZone)) {
 			timeZone = "Asia/Shanghai";
 		}
 		if (dateTime != null) {
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java
index bc03f94ae..04e4eb65b 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistrilbutionBillLadingOwnVO.java
@@ -16,13 +16,10 @@
  */
 package com.logpm.distribution.vo;
 
-import com.logpm.distribution.entity.DistributionDeliveryChargeEntity;
 import com.logpm.distribution.entity.DistrilbutionBillLadingEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  * 提货单 视图实体类
  *
@@ -34,7 +31,7 @@ import java.util.List;
 public class DistrilbutionBillLadingOwnVO extends DistrilbutionBillLadingEntity {
 	private static final long serialVersionUID = 1L;
 
-	private String orderSelfNumbering;
+	private String orderCode;
 	private String descriptionGoods;
 	private Integer totalNumber;
 	private String stockupStatus;
@@ -42,7 +39,7 @@ public class DistrilbutionBillLadingOwnVO extends DistrilbutionBillLadingEntity
 	private String stockipAllocation;
 	private Integer esau;
 
-	private String packetBarCode;
+	private String orderPackageCode;
 	private String firsts;
 	private String second;
 	private String thirdProduct;
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java
index 88a17dce5..e3bd1b1ef 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistrilbutionAppBillLadingDetailVO.java
@@ -31,9 +31,9 @@ public class DistrilbutionAppBillLadingDetailVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private Long stockArticleId;
-	private String orderSelfNumbering;
+	private String orderCode;
 
-	private String packetBarCode;
+	private String orderPackageCode;
 
 	private Integer scanStatus;//扫码状态
 	private String scanStatusStr;//扫码状态
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index a7c26cdbd..22298368e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -722,7 +722,7 @@
     </select>
     <select id="selectDistributionAppDeliveryOrder" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
         SELECT
-            ldsa.order_self_numbering orderSelfNumbering,
+            ldsa.order_code orderCode,
             ldsa.complete_set completeSet,
             ldrs.reservation_num reservationNum,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub
@@ -735,7 +735,7 @@
     <select id="selectListbypack" resultType="com.logpm.distribution.vo.app.DistributionAppParcelListVO">
         select
             DISTINCT	ldrp.packet_bar_code packetBarCode,
-                        ldsa.order_self_numbering orderSelfNumbering,
+                        ldsa.order_code orderCode,
                         ldl.scan_status scanStatus
         FROM
             logpm_distribution_reservation_package ldrp
@@ -746,15 +746,15 @@
                 LEFT JOIN logpm_distribution_loadscan ldl on ldl.package_id =ldpl.id
         <where>
             lds.delivery_id = #{param.id}
-            <if test="param.orderSelfNumbering != null and param.orderSelfNumbering!=''">
-                and ldsa.order_self_numbering = #{param.orderSelfNumbering}
+            <if test="param.orderCode != null and param.orderCode!=''">
+                and ldsa.order_code = #{param.orderCode}
             </if>
         </where>
 
     </select>
     <select id="selectDistributionAppDeliveryOrderO" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
         SELECT
-            ldsa.order_self_numbering orderSelfNumbering,
+            ldsa.order_code orderCode,
             ldsa.complete_set completeSet,
             ldrs.reservation_num reservationNum,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 ) loadingNub
@@ -823,7 +823,7 @@
     <select id="selectDistributionAppDeliveryOrderOIn"
             resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
         SELECT
-            ldsa.order_self_numbering orderSelfNumbering,
+            ldsa.order_code orderCode,
             ldsa.complete_set completeSet,
             ldrs.reservation_num reservationNum,
             (SELECT COALESCE(COUNT(*), 0) from logpm_distribution_loadscan ldl WHERE ldl.order_id =ldsa.id and ldl.scan_status !=1 and ldl.signfor_state =2 ) signNub
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 2f1500e89..9d364581d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -53,15 +53,15 @@
     </update>
 
     <select id="selectOrderInfoList" resultType="com.logpm.distribution.vo.PackageStockupVO">
-        select ldpl.order_self_numbering orderCode,
+        select ldpl.order_code orderCode,
                ldpl.order_package_code packageBarCode,
                1 goodsType,
-               IF(t.id is null,0,1) isScan,
-               s.id scanId
+               IF(lds.id is null,0,1) isScan,
+               lds.id scanId
         from logpm_distribution_reservation ldr
             left join logpm_distribution_reservation_package ldrp on  ldr.id = ldrp.reservation_id and ldrp.is_deleted = 0
                  left join logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id and ldpl.is_deleted = 0
-                 left join logpm_distribution_stock s on s.parcel_list_id = ldpl.id and s.is_deleted = 0
+                 left join logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id and lds.is_deleted = 0
         where ldpl.stock_article_id = #{stockArticleId}
           and ldr.id = #{reservationId}
           and CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) = #{allocation}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
index 2ee1d4b2e..17249d90d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml
@@ -167,7 +167,7 @@
 
     <select id="selectStockupOrderList" resultType="com.logpm.distribution.vo.DistributionStockupOrderListVO">
         select CONCAT(ldpl.cargo_title,'-',ldpl.shelf_title,'-',ldpl.goods_allocation) allocation,
-               ldsa.order_self_numbering orderCode,
+               ldsa.order_code orderCode,
                ldrs.stock_article_id stockArticleId,
                ldpl.pallet pallet,
                count(ldpl.id) planNum,
@@ -184,7 +184,7 @@
         group by ldpl.cargo_title,
                  ldpl.shelf_title,
                  ldpl.goods_allocation,
-                 ldrs.stock_article_code,
+                 ldsa.order_code,
                  ldrs.stock_article_id,
                  ldpl.pallet
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index cbd11f5ce..6b1ba75ef 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -81,8 +81,8 @@
         )
         and
         ldsa.is_deleted = 0 and ldsa.type_service ='2'
-        <if test="distributionStockArticleVO.orderSelfNumbering!=null and distributionStockArticleVO.orderSelfNumbering !=''">
-           and ldsa.order_self_numbering == #{distributionStockArticleVO.orderSelfNumbering}
+        <if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
+           and ldsa.order_code == #{distributionStockArticleVO.orderCode}
         </if>
         <!-- 条件没有写完 -->
     </select>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java
index ecb4b3c58..4d6666db9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.java
@@ -29,7 +29,6 @@ import com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO;
 import com.logpm.distribution.vo.DistrilbutionBillLadingVO;
 import com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO;
 import org.apache.ibatis.annotations.Param;
-import org.springblade.core.mp.support.Query;
 
 import java.util.List;
 
@@ -65,7 +64,7 @@ public interface DistrilbutionBillLadingMapper extends BaseMapper<DistrilbutionB
 
 	DistrilbutionBillLadingAppVO selectDataByBillLadingId(@Param("billLadingId") Long billLadingId);
 
-	List<DistrilbutionAppBillLadingDetailVO> selectDetailList(@Param("stockArticleId") Long stockArticleId, @Param("scanStatus") Integer scanStatus,@Param("orderSelfNumbering") String orderSelfNumbering);
+	List<DistrilbutionAppBillLadingDetailVO> selectDetailList(@Param("stockArticleId") Long stockArticleId, @Param("scanStatus") Integer scanStatus,@Param("orderCode") String orderSelfNumbering);
 
     DistrilbutionBillLadingVO getOneOwn(@Param("id") Long id);
 
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 3acc8f0d1..57831642e 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
@@ -64,38 +64,38 @@
     </select>
 
     <select id="pageListApp" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingAppVO">
-        select ldbl.id billLadingId,
+        select lad.id billLadingId,
         3 carType,
-        ldbl.`condition` `condition`,
-        ldbl.Pick_up_plate pickUpPlate,
-        ldbl.consignee consignee,
-        ldbl.create_time,
-        ldbl.pick_up_time,
-        ldbl.stock_article_id stockArticleId
-        from logpm_distrilbution_bill_lading ldbl
-        where ldbl.is_deleted = 0
-        <if test="param.pickUpTimeStart != null and param.pickUpTimeStart!='' ">ldbl.pick_up_time &lt;= #{param.pickUpTimeStart}  </if>
-        <if test="param.pickUpTimeEnd != null and param.pickUpTimeEnd!='' ">ldbl.pick_up_time &gt;= #{param.pickUpTimeEnd}  </if>
+        lad.`condition` `condition`,
+        lad.Pick_up_plate pickUpPlate,
+        lad.consignee consignee,
+        lad.create_time,
+        lad.pick_up_time,
+        lad.stock_article_id stockArticleId
+        from logpm_distrilbution_bill_lading lad
+        where lad.is_deleted = 0
+        <if test="param.pickUpTimeStart != null and param.pickUpTimeStart!='' ">and lad.pick_up_time &lt;= #{param.pickUpTimeStart}  </if>
+        <if test="param.pickUpTimeEnd != null and param.pickUpTimeEnd!='' "> and lad.pick_up_time &gt;= #{param.pickUpTimeEnd}  </if>
     </select>
 
     <select id="selectDataByBillLadingId" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingAppVO">
-        select ldbl.id billLadingId,
+        select lad.id billLadingId,
                3 carType,
-               ldbl.`condition` `condition`,
-               ldbl.Pick_up_plate pickUpPlate,
-               ldbl.consignee consignee,
-               ldbl.create_time,
-               ldbl.pick_up_time,
-               ldbl.stock_article_id stockArticleId
-        from logpm_distrilbution_bill_lading ldbl
-        where ldbl.is_deleted = 0
-          and ldbl.id = #{billLadingId}
+               lad.`condition` `condition`,
+               lad.Pick_up_plate pickUpPlate,
+               lad.consignee consignee,
+               lad.create_time,
+               lad.pick_up_time,
+               lad.stock_article_id stockArticleId
+        from logpm_distrilbution_bill_lading lad
+        where lad.is_deleted = 0
+          and lad.id = #{billLadingId}
     </select>
 
     <select id="selectDetailList" resultType="com.logpm.distribution.vo.app.DistrilbutionAppBillLadingDetailVO">
         select ldpl.stock_article_id stockArticleId,
-        ldpl.order_self_numbering orderSelfNumbering,
-        ldpl.packet_bar_code packetBarCode,
+        ldpl.order_code orderCode,
+        ldpl.order_package_code orderPackageCode,
                case
                    when ldbls.id is null then 1
                    else 2
@@ -106,8 +106,8 @@
         <where>
             and ldpl.is_deleted = 0
             and ldpl.stock_article_id = #{stockArticleId}
-            <if test="orderSelfNumbering != null and orderSelfNumbering !=''">
-                and ldpl.order_self_numbering = ${orderSelfNumbering}
+            <if test="orderCode != null and orderCode !=''">
+                and ldpl.order_code = ${orderCode}
             </if>
             <if test="scanStatus != null and scanStatus==1">
                 and ldbls.id is null
@@ -118,15 +118,15 @@
         </where>
     </select>
     <select id="getOneOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingVO">
-        select ldbl.id,ldbl.stockup_code stockupCode,ldbl.pick_up_time pickUpTime,ldbl.stockup_area stockupArea,ldbl.consignee,
-               ldbl.pick_up_plate pickUpPlate,ldbl.total_cost totalCost
-        from logpm_distrilbution_bill_lading  ldbl
+        select lad.id,lad.stockup_code stockupCode,lad.pick_up_time pickUpTime,lad.stockup_area stockupArea,lad.consignee,
+        lad.pick_up_plate pickUpPlate,lad.total_cost totalCost
+        from logpm_distrilbution_bill_lading  lad
         <where>
-            ldbl.id = #{id}
+            lad.id = #{id}
         </where>
     </select>
     <select id="detailReservationOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO">
-        select ldpi.id,ldpi.packet_bar_code packetBarCode,ldpi.firsts ,ldpi.second ,ldpi.third_product thirdProduct,ldpi.material_name materialName,
+        select ldpi.id,ldpi.order_package_code orderPackageCode,ldpi.firsts ,ldpi.second ,ldpi.third_product thirdProduct,ldpi.material_name materialName,
                ldpi.goods_allocation goodsAllocation,ldpi.pallet
         from logpm_distribution_parcel_list ldpi
         where ldpi.stock_article_id in (
@@ -136,7 +136,7 @@
         )
     </select>
     <select id="detailOrderOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO">
-        select ldsa.id,ldsa.order_self_numbering orderSelfNumbering,ldsa.description_goods descriptionGoods,ldsa.total_number totalNumber,
+        select ldsa.id,ldsa.order_code orderCode,ldsa.description_goods descriptionGoods,ldsa.total_number totalNumber,
                ldbl.stockup_status stockupStatus,ldbl.stockip_allocation stockipAllocation,
                 ( select count(*)
                  from logpm_distribution_stock lds
@@ -158,7 +158,7 @@
         </where>
     </select>
     <select id="getInventoryOwn" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingOwnVO">
-        select ldsi.id,ldsi.sku,ldsi.order_self_numbering,ldsi.description_goods ,ldsi.cargo_unit ,lddd.quantity ,ldsi.tray_name ,ldsi.storage_location
+        select ldsi.id,ldsi.sku,ldsi.order_code,ldsi.description_goods ,ldsi.cargo_unit ,lddd.quantity ,ldsi.tray_name ,ldsi.storage_location
         from logpm_distribution_delivery_details lddd LEFT JOIN  logpm_distribution_stock_list ldsi on lddd.stock_list_id = ldsi.id
         <where>
             lddd.bill_lading_id = #{id}
@@ -166,8 +166,8 @@
     </select>
 
     <select id="getDetailOne" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingDetailsVO">
-        select ldbl.id,ldbl.pick_up_time ,ldbl.consignee ,ldbl.pick_up_plate ,ldbl.delivery_document ,ldbl.certificate_type ,ldbl.total_cost
-        from logpm_distrilbution_bill_lading ldbl
+        select lad.id,lad.pick_up_time ,lad.consignee ,lad.pick_up_plate ,lad.delivery_document ,lad.certificate_type ,lad.total_cost
+        from logpm_distrilbution_bill_lading lad
         <where>
             ldbl.id = #{id}
         </where>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 1359a6c7f..1b2e1ede9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -833,7 +833,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				);
 				list1.forEach( di ->{
 					DistrilbutionAppBillLadingDetailVO billLadingDetailVO = new DistrilbutionAppBillLadingDetailVO();
-					billLadingDetailVO.setPacketBarCode(di.getCoding());
+					billLadingDetailVO.setOrderPackageCode(di.getCoding());
 					billLadingDetailVO.setScanStatus(Integer.parseInt(di.getConditions()));
 					switch (di.getConditions()){
 						case "2":