Merge branch 'dev' into pre-production

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

@@ -392,10 +392,11 @@
                              ldrp.reservation_id = lds.reservation_id
                      ) goodsAllocation,
                      ldrs.stock_article_status stockArticleState,
-                     (   select  sum(loaded_nub) FROM
+                     (   select  IFNULL(sum( loaded_nub ) ,0) FROM
                         logpm_distribution_loadscan AS ldl
                         WHERE  ldl.order_id=ldrs.stock_article_id
                                  and ldl.scan_status != 1
+                                 AND ldl.is_deleted = 0
                                  and ldl.reservation_id = lds.reservation_id
                       ) AS loadingNumber,
                       (   select  count(*) FROM

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml

@@ -245,15 +245,19 @@
             <if test="param.warehouseId  != null and param.warehouseId != ''">and warehouse_id =#{param.warehouseId } </if>
             <if test="param.allocationId  != null and param.allocationId != ''">and allocation_id =#{param.allocationId } </if>
             <if test="param.trayId  != null and param.trayId != ''">and tray_id =#{param.trayId } </if>
-            <if test="param.orderCode  != null and param.orderCode != ''">and order_code like concat('%',#{param.orderCode },'%') </if>
+            <if test="param.orderCode  != null and param.orderCode != ''">and order_code like concat(#{param.orderCode },'%') </if>
-            <if test="param.categoryName  != null and param.categoryName != ''">and category_name like concat('%',#{param.categoryName },'%') </if>
+            <if test="param.categoryName  != null and param.categoryName != ''">and category_name like concat(#{param.categoryName },'%') </if>
-            <if test="param.materialCode  != null and param.materialCode != ''">and material_code like concat('%',#{param.materialCode },'%') </if>
+            <if test="param.materialCode  != null and param.materialCode != ''">and material_code like concat(#{param.materialCode },'%') </if>
-            <if test="param.trayCode  != null and param.trayCode != ''">and tray_code like concat('%',#{param.trayCode },'%') </if>
+            <if test="param.trayCode  != null and param.trayCode != ''">and tray_code like concat(#{param.trayCode },'%') </if>
-            <if test="param.trayName  != null and param.trayName != ''">and tray_name like concat('%',#{param.trayName },'%') </if>
+            <if test="param.trayName  != null and param.trayName != ''">and tray_name like concat(#{param.trayName },'%') </if>
-            <if test="param.brandName  != null and param.brandName != ''">and brand_name like concat('%',#{param.brandName },'%') </if>
+            <if test="param.brandName  != null and param.brandName != ''">and brand_name like concat(#{param.brandName },'%') </if>
             <if test="param.marketName  != null and param.marketName != ''">and market_name  like concat('%',#{param.marketName},'%') </if>
             <if test="param.materialName  != null and param.materialName != ''">and material_name  like concat('%',#{param.materialName},'%') </if>
-            <if test="param.positionCode  != null and param.positionCode != ''">and position_code  like concat('%',#{param.positionCode},'%') </if>
+
+
+            <if test="param.positionCode  != null and param.positionCode != ''">and (position_code  like concat('%',#{param.positionCode},'%') or grounding_position_code like concat('%',#{param.positionCode},'%')) </if>
+
+
             <if test="param.orderPackageCode  != null and param.orderPackageCode != ''">and order_package_code =#{param.orderPackageCode } </if>
             <if test="param.inventoryUser  != null and param.inventoryUser != ''">and inventory_user like concat('%',#{param.inventoryUser },'%') </if>
             <if test="param.startTime  != null and param.startTime != ''">  and inventory_time  BETWEEN  #{param.startTime } and #{param.endTime}</if>