优化快速入库页面,容器选取

陈翱
1 parent f9b85463
Showing 5 changed files with 111 additions and 15 deletions
ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiAllEmptyContainer.vue
ant-design-vue-jeecg/src/views/system/task/modules/MaterialTaskModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/controller/ContainerController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
+<template>
+  <!-- 定义在这里的参数都是不可在外部覆盖的，防止出现问题 -->
+  <j-select-biz-component
+    :value="value"
+    :multiple="false"
+    :ellipsisLength="25"
+    :listUrl="url.list"
+    :columns="columns"
+    v-on="$listeners"
+    v-bind="attrs"
+  />
+
+
+</template>
+
+<script>
+import JDate from '@comp/jeecg/JDate'
+import JSelectBizComponent from './JSelectBizComponent'
+
+export default {
+  name: 'JSelectMultiAllEmptyContainer',
+  components: {JDate, JSelectBizComponent},
+  props: {
+    value: null, // any type
+    queryConfig: {
+      type: Array,
+      default: () => []
+    },
+  },
+  data() {
+    return {
+      url: {list: '/config/container/getEmptyAllContainer'},
+      columns: [
+        {title: '容器编码', align: 'center', width: '25%',  dataIndex: 'code'},
+        {title: '库位编码', align: 'center', width: '25%', dataIndex: 'locationCode'},
+        {title: '容器类型', align: 'center', width: '20%', dataIndex: 'containerTypeCode'},
+        {title: '填充状态', align: 'center', width: '20%', dataIndex: 'fillStatus'}
+      ],
+      // 定义在这里的参数都是可以在外部传递覆盖的，可以更灵活的定制化使用的组件
+      default: {
+        name: "编码",
+        width: 1200,
+        displayKey: 'code',
+        returnKeys: ['id', 'code'],
+        queryParamText: '容器编码',
+      },
+      // 多条件查询配置
+      queryConfigDefault: [
+        {
+          key: 'locationCode',
+          label: '库位编码',
+        },
+      ],
+    }
+  },
+  computed: {
+    attrs() {
+      return Object.assign(this.default, this.$attrs, {
+        queryConfig: this.queryConfigDefault.concat(this.queryConfig)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped></style>
 \ No newline at end of file
 <template>
   <a-modal
     :title="title"
-    :width="800"
+    :width="900"
     :visible="visible"
     :maskClosable="false"
     :confirmLoading="confirmLoading"
@@ -12,16 +12,18 @@
       <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :model="model">
         <!-- 主表单区域 -->
         <a-row class="form-row" :gutter="0">
-          <a-col :lg="8">
-            <a-form-model-item label="托盘号"   :rules="[{ required: true, message: '请输入托盘号!' }]">
-<!--              <a-input placeholder="请输入托盘号" v-model="quickMainModel.containerCode"/>-->
-              <j-search-select-tag
-                placeholder="请输入托盘号"
-                v-model="quickMainModel.containerCode"
-                dict="container,code,code,status='empty'"
-                :pageSize="10"
-                :async="true">
-              </j-search-select-tag>
+          <a-col :lg="10">
+<!--            <a-form-model-item label="托盘号"   :rules="[{ required: true, message: '请输入托盘号!' }]"> -->
+<!--              <j-search-select-tag-->
+<!--                placeholder="请输入托盘号"-->
+<!--                v-model="quickMainModel.containerCode"-->
+<!--                dict="container,code,code,status='empty'"-->
+<!--                :pageSize="10"-->
+<!--                :async="true">-->
+<!--              </j-search-select-tag>-->
+<!--            </a-form-model-item>-->
+            <a-form-model-item label="容器编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="containerCode">
+              <j-select-multi-all-empty-container v-model="quickMainModel.containerCode"></j-select-multi-all-empty-container>
             </a-form-model-item>
           </a-col>
  
@@ -61,9 +63,9 @@
               <a-col :span="8">
                 <a-form-model-item>
                   <j-search-select-tag
-                    placeholder="请做出你的选择"
+                    placeholder="请选择"
                     v-model="item.materialCode"
-                    dict="material,name,code"
+                    :dict="'material,name,code '"
                     :pageSize="5"
                     :async="true">
                   </j-search-select-tag>
@@ -98,15 +100,16 @@
 import JEditableTable from '@/components/jeecg/JEditableTable'
 import {execute, quickReceipt} from '@/api/api'
 import JDate from '@/components/jeecg/JDate'
+import JSelectMultiAllEmptyContainer from "../../../../components/jeecgbiz/JSelectMultiAllEmptyContainer";
  
 export default {
   name: 'MaterialTaskModal',
   components: {
-    JDate, JEditableTable
+    JDate, JEditableTable,JSelectMultiAllEmptyContainer
   },
   data() {
     return {
-      title: '操作',
+      title: '快速入库',
       visible: false,
       confirmLoading: false,
       model: {},
@@ -31,6 +31,7 @@ import org.jeecg.modules.wms.config.container.service.IContainerService;
 import org.jeecg.modules.wms.config.location.entity.Location;
 import org.jeecg.modules.wms.config.location.service.ILocationService;
 import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -206,4 +207,18 @@ public class ContainerController extends JeecgController&lt;Container, IContainerSe
         return super.importExcel(request, response, Container.class);
     }
  
+    /**
+     * 选取空闲的托盘
+     * @param  container
+     * @return
+     */
+    @AutoLog(value = "选取空闲的托盘")
+    @ApiOperation(value = "库位管理-选取空闲的托盘", notes = "库位管理-选取空闲的托盘")
+    @GetMapping(value = "/getEmptyAllContainer")
+    public Result getEmptyAllContainer(Container container, HttpServletRequest req) {
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        List<Container>containerList=containerService.getEmptyAllContainer(container,warehouseCode);
+        return Result.OK(containerList);
+    }
+
 }
@@ -34,5 +34,7 @@ public interface IContainerService extends IService&lt;Container&gt; {
  
     List<Container> getContainerListByStatus(String status, String warehouseCode);
  
+    List<Container> getEmptyAllContainer(Container container, String warehouseCode);
+
     List<Container> getContainerListByCodeList(List<String> containerCodeList, String warehouseCode);
 }
@@ -178,4 +178,14 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
         return 0;
     }
  
+    @Override
+    public List<Container> getEmptyAllContainer(Container container, String warehouseCode) {
+        LambdaQueryWrapper<Container>lambdaQueryWrapper=new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Container::getStatus,QuantityConstant.STATUS_CONTAINER_FILL_EMPTY)
+                .eq(Container::getWarehouseCode,warehouseCode)
+                .eq(StringUtils.isNotEmpty(container.getCode()),Container::getCode,container.getCode())
+                .eq(StringUtils.isNotEmpty(container.getLocationCode()),Container::getLocationCode,container.getLocationCode());
+        List<Container>list=this.list(lambdaQueryWrapper);
+        return list;
+    }
 }