Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/kshzs/KshzsServiceImpl.java

@@ -86,7 +86,7 @@ public class KshzsServiceImpl implements KshzsService{
                 }
             }
             // 各省的库存数量
-            objData = kshzsMapper.selectList(paramVo);
+            // objData = kshzsMapper.selectList(paramVo);
             objMap = kshzsMapper.selectCardList(paramVo);
         }
         // 各省的库存数量

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -10,7 +10,7 @@
             and cdbm = #{xzqhdm}
         </if>
         <if test="lspzmc!= null and lspzmc!=''">
-            and lspzmc in (
+            and lspzbm in (
                 <foreach collection="lspzmcLst" item="item" separator=",">
                     #{item}
                 </foreach>
@@ -185,7 +185,7 @@
         <if test="lspzmc != null and lspzmc != ''">
             and kq.id in (
                select hw.kqid from DELIVERY_HWK hw
-               where hw.lspzmc in (
+               where hw.lspzbm in (
                    <foreach collection="lspzmcLst" item="item" separator=",">
                         #{item}
                    </foreach>
@@ -195,7 +195,7 @@
         <if test="lsdjdm != null and lsdjdm != ''">
             and kq.id in (
                 select hw.kqid from DELIVERY_HWK hw
-                where hw.lsdjdm in (
+                where hw.lsdjbm in (
                     <foreach collection="lsdjdmLst" item="item" separator=",">
                         #{item}
                     </foreach>