Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/BstIvtBoxinfoServiceImpl.java

@@ -52,6 +52,9 @@ public class BstIvtBoxinfoServiceImpl extends ServiceImpl<BstIvtBoxinfoMapper, B
         if (whereJson.containsKey("search")) {
             queryWrapper.like(BstIvtBoxinfo::getBox_no, whereJson.get("search")).or().like(BstIvtBoxinfo::getMaterial_code, whereJson.get("search")).or().like(BstIvtBoxinfo::getMaterial_name, whereJson.get("search"));
         }
+        if (whereJson.containsKey("is_packing")) {
+            queryWrapper.eq(BstIvtBoxinfo::getIs_packing, whereJson.get("is_packing"));
+        }
         IPage<BstIvtBoxinfo> result = bstIvtBoxinfoMapper.selectPage(new Page<>(page.getPageNumber() + 1, page.getPageSize()), queryWrapper);
         mapReslt.put("content", result.getRecords());
         mapReslt.put("totalElements", result.getTotal());

lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue

@@ -21,6 +21,22 @@
             />
           </el-form-item>
 
+          <el-form-item label="是否装箱">
+            <el-select
+              v-model="query.is_packing"
+              clearable
+              class="filter-item"
+              placeholder="请选择"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in packingList"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+
           <rrOperation />
         </el-form>
       </div>
@@ -178,6 +194,10 @@ export default {
         edit: ['admin', 'user:edit'],
         del: ['admin', 'user:del']
       },
+      packingList: [
+        { 'label': '是', 'value': '1' },
+        { 'label': '否', 'value': '0' }
+      ],
       rules: {
       }
     }

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -93,31 +93,6 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission">
-        <el-button
-          v-if="query.stor_id === '1582991156504039455'"
-          slot="right"
-          class="filter-item"
-          type="warning"
-          icon="el-icon-check"
-          size="mini"
-          @click="openOneCreate"
-        >
-          一键生成
-        </el-button>
-        <el-button
-          v-if="query.stor_id === '1582991156504039455'"
-          slot="right"
-          class="filter-item"
-          type="success"
-          icon="el-icon-position"
-          size="mini"
-          @click="closeTun"
-        >
-          巷道管理
-        </el-button>
-      </crudOperation>
-
       <el-dialog
         :visible.sync="dialogVisible2"
         :show-close="true"
@@ -176,6 +151,17 @@
         >
           一键生成
         </el-button>
+        <el-button
+          v-if="query.stor_id === '1582991156504039455'"
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-position"
+          size="mini"
+          @click="closeTun"
+        >
+          巷道管理
+        </el-button>
       </crudOperation>
 
       <!--表单组件-->