Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -76,7 +76,7 @@
         SELECT client_id from logpm_basicdata_clientuser where user_id =#{loginUserId}
         )
         and
-        ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = 1
+        ldsa.is_deleted = 0 and ldsa.type_service ='2' and ldsa.genre = 1  and ldsa.reservation_status in ('10','20') and ldsa.order_status in ('10','20'，'30')
         <if test="distributionStockArticleVO.orderCode!=null and distributionStockArticleVO.orderCode !=''">
             and ldsa.order_code = #{distributionStockArticleVO.orderCode}
         </if>
@@ -101,10 +101,54 @@
         <if test="distributionStockArticleVO.freezeStatus != null and distributionStockArticleVO.freezeStatus != ''">
             and ldsa.freeze_status = #{distributionStockArticleVO.freezeStatus}
         </if>
+        <!-- 条件没有写完 -->
 
+        <if test="distributionStockArticleVO.orderCode != null and distributionStockArticleVO.orderCode != ''">
+            and ldsa.order_code like concat('%',#{distributionStockArticleVO.orderCode},'%')
+        </if>
 
-        <!-- 条件没有写完 -->
+        <if test="distributionStockArticleVO.descriptionGoods != null and distributionStockArticleVO.descriptionGoods != ''">
+            and ldsa.description_goods like concat('%',#{distributionStockArticleVO.descriptionGoods},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.warehouse != null and distributionStockArticleVO.warehouse != ''">
+            and ldsa.warehouse like concat('%',#{distributionStockArticleVO.warehouse},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.brand != null and distributionStockArticleVO.brand != ''">
+            and ldsa.brand like concat('%',#{distributionStockArticleVO.brand},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.storeName != null and distributionStockArticleVO.storeName != ''">
+            and ldsa.store_name like concat('%',#{distributionStockArticleVO.storeName},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.customerName != null and distributionStockArticleVO.customerName != ''">
+            and ldsa.customer_name like concat('%',#{distributionStockArticleVO.customerName},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.customerTelephone != null and distributionStockArticleVO.customerTelephone != ''">
+            and ldsa.customer_telephone like concat('%',#{distributionStockArticleVO.customerTelephone},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.customerAddress != null and distributionStockArticleVO.customerAddress != ''">
+            and ldsa.customer_address like concat('%',#{distributionStockArticleVO.customerAddress},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.waybillNumber != null and distributionStockArticleVO.waybillNumber != ''">
+            and ldsa.waybill_number like concat('%',#{distributionStockArticleVO.waybillNumber},'%')
+        </if>
+
+        <if test="distributionStockArticleVO.totalNumber != null and distributionStockArticleVO.totalNumber != ''">
+            and ldsa.total_number = #{distributionStockArticleVO.totalNumber}
+        </if>
+
+        <if test="distributionStockArticleVO.handQuantity != null and distributionStockArticleVO.handQuantity != ''">
+            and ldsa.hand_quantity = #{distributionStockArticleVO.handQuantity}
+        </if>
     </select>
+
+
     <select id="getAllReservationStockArticleInfo"
             resultType="com.logpm.distribution.entity.DistributionStockArticleEntity">
         SELECT
@@ -590,6 +634,10 @@
             <if test="par.customerTelephone != null and par.customerTelephone != '' ">
                 and ldsa.customer_telephone like concat('%',#{par.customerTelephone},'%')
             </if>
+
+            <if test="par.serviceNumber != null and par.serviceNumber != '' ">
+                and ldsa.service_number like concat('%',#{par.serviceNumber},'%')
+            </if>
             <if test="par.consigneeAddress != null and par.consigneeAddress != '' ">
                 and ldsa.consignee_address like concat('%',#{par.consigneeAddress},'%')
             </if>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -35,7 +35,7 @@
     </resultMap>
 
     <sql id="stockList">
-        select DISTINCT ldsi.service_number serviceNumber,ldsi.service_type serviceType,ldsi.description_goods descriptionGoods,ldsi.cargo_number cargoNumber,ldsi.despatch ,ldsi.incoming_batch incomingBatch,ldsi.warehouse_id warehouseId,
+        select DISTINCT ldsi.service_number serviceNumber,ldsi.service_type serviceType,ldsi.description_goods descriptionGoods,ldsi.cargo_number cargoNumber,ldsi.despatch ,ldsi.incoming_batch incomingBatch,ldsi.warehouse_id warehouseId,ldsi.order_code orderCode,
         CASE  WHEN ldsi.pid is null THEN
         (select  sum(l.quantity_stock)
         from logpm_distribution_stock_list l
@@ -176,6 +176,10 @@
             <if test=" param.despatch != null and param.despatch != ''">and ldsi.despatch like concat('%',
                 #{param.despatch},'%')
             </if>
+
+            <if test=" param.orderCode != null and param.orderCode != ''">and ldsi.order_code like concat('%',
+                #{param.orderCode},'%')
+            </if>
             <if test=" param.incomingBatch != null and param.incomingBatch != ''">and ldsi.incoming_batch like
                 concat('%', #{param.incomingBatch},'%')
             </if>

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

@@ -371,6 +371,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		List clientIds =null;
 		if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){
 			 clientIds = basicdataClientUserEntityListByUserIds.stream().map(BasicdataClientUserEntity::getClientId).collect(Collectors.toList());
+		}else {
+			return null;
 		}
 		IPage<DistributionStockListVO> page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds);
 		return  page1;