fix：出入库单状态查询

nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/dao/mapper/IOStorInvMapper.xml

@@ -149,29 +149,29 @@
                 ios.is_upload = #{params.is_upload}
             </if>
 
-            <if test="params.storIds != null">
+            <if test="params.stor_id != null">
                 AND
-                ios.stor_id IN #{params.storIds}
+                ios.stor_id = #{params.stor_id}
             </if>
 
-            <if test="params.billStatuses != null">
+            <if test="params.bill_status != null">
                 AND
-                ios.bill_status IN #{params.billStatuses}
+                ios.bill_status = #{params.bill_status}
             </if>
 
-            <if test="params.billTypes != null">
+            <if test="params.bill_type != null">
                 AND
-                ios.bill_type IN #{params.billTypes}
+                ios.bill_type = #{params.bill_type}
             </if>
 
             <if test="params.pcsn != null">
                 AND
-                dis.pcsn LIKE  #{params.pcsn}
+                dis.pcsn =  #{params.pcsn}
             </if>
 
             <if test="params.pcsn_in != null">
                 AND
-                dis.pcsn IN #{params.pcsn_in}
+                dis.pcsn = #{params.pcsn_in}
             </if>
 
             <if test="params.begin_time != null">

nladmin-system/wms-server/src/main/java/org/nl/wms/warehouse_manage/inAndOut/service/impl/OutBillServiceImpl.java

@@ -122,56 +122,19 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
 
         // 空格查询
         if (StrUtil.isNotEmpty(map.get("pcsn"))) {
-            // 判断是否有空格
+            map.put("pcsn", map.get("pcsn"));
-            String pcsn = MapUtil.getStr(map, "pcsn");
-
-            boolean matches = pcsn.matches(".*\\s.*");
-
-            if (matches) {
-                String[] s = pcsn.split(" ");
-                String pcsn_in = String.join("','", Arrays.asList(s));
-
-                map.put("pcsn_in", "('"+pcsn_in+"')");
-                map.put("pcsn", "");
-            } else {
-                map.put("pcsn", "%" + map.get("pcsn") + "%");
-            }
         }
 
         if (ObjectUtil.isNotEmpty(stor_id)) {
-            String storIds = "(";
+            map.put("stor_id", map.get("stor_id"));
-            for (int i = 0; i < stor_id.length; i++) {
-                if (i != stor_id.length - 1) {
-                    storIds += "'" + stor_id[i] + "',";
-                } else {
-                    storIds += "'" + stor_id[i] + "')";
-                }
-            }
-            map.put("storIds", storIds);
         }
 
         if (ObjectUtil.isNotEmpty(bill_status)) {
-            String billStatuses = "(";
+            map.put("bill_status", map.get("bill_status"));
-            for (int i = 0; i < bill_status.length; i++) {
-                if (i != bill_status.length - 1) {
-                    billStatuses += "'" + bill_status[i] + "',";
-                } else {
-                    billStatuses += "'" + bill_status[i] + "')";
-                }
-            }
-            map.put("billStatuses", billStatuses);
         }
 
         if (ObjectUtil.isNotEmpty(bill_type)) {
-            String billTypes = "(";
+            map.put("bill_type", map.get("bill_type"));
-            for (int i = 0; i < bill_type.length; i++) {
-                if (i != bill_type.length - 1) {
-                    billTypes += "'" + bill_type[i] + "',";
-                } else {
-                    billTypes += "'" + bill_type[i] + "')";
-                }
-            }
-            map.put("billTypes", billTypes);
         }
 
         return ioStorInvMapper.queryOutBillPage(new Page<>(page.getPage()+1,page.getSize()),map);

nladmin-ui/src/views/wms/st/inbill/index.vue

@@ -58,24 +58,6 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="生成方式">
-            <el-select
-              v-model="query.create_mode"
-              clearable
-              size="mini"
-              placeholder="生成方式"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.ST_CREATE_MODE"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-
           <el-form-item label="单据状态">
             <el-select
               v-model="query.bill_status"

nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -32,7 +32,6 @@
           <el-form-item label="所属仓库">
             <el-select
               v-model="query.stor_id"
-              multiple
               collapse-tags
               clearable
               size="mini"
@@ -50,7 +49,6 @@
           <el-form-item label="单据状态">
             <el-select
               v-model="query.bill_status"
-              multiple
               collapse-tags
               clearable
               size="mini"
@@ -69,7 +67,6 @@
           <el-form-item label="业务类型">
             <el-select
               v-model="query.bill_type"
-              multiple
               collapse-tags
               clearable
               filterable
@@ -206,7 +203,6 @@
         <el-table-column show-overflow-tooltip label="计划数量" align="center" prop="total_qty" width="100" :formatter="crud.formatNum3" />
         <!--        <el-table-column show-overflow-tooltip label="实际重量" align="center" prop="plan_qty" width="100" :formatter="crud.formatNum3" />-->
         <el-table-column show-overflow-tooltip label="是否回传" align="center" prop="is_upload" width="80" :formatter="formatIsUpload" />
-        <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
         <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
         <el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
         <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />