浏览代码

永湖-库位库存信息-根据托盘号模糊查询
永湖-库位库存信息-根据入库单号查询,出库单号查询。

HuKang 2 年之前
父节点
当前提交
1efb664bc7

+ 10 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/InvLotLocIdController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,6 +41,15 @@ public class InvLotLocIdController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(InvLocIdSearchFrom invLocIdSearchFrom) {
         startPage();
+        if (StringUtils.isNotEmpty(invLocIdSearchFrom.getLotatt07())) {
+            invLocIdSearchFrom.getLotattDTO().setLotatt07(invLocIdSearchFrom.getLotatt07());
+        }
+        if (StringUtils.isNotEmpty(invLocIdSearchFrom.getLotatt08())) {
+            invLocIdSearchFrom.getLotattDTO().setLotatt08(invLocIdSearchFrom.getLotatt08());
+        }
+        if (StringUtils.isNotEmpty(invLocIdSearchFrom.getLotatt14())) {
+            invLocIdSearchFrom.getLotattDTO().setLotatt14(invLocIdSearchFrom.getLotatt14());
+        }
         List<InvLotLocIdLotattVO> list = invLotLocIdService.selectInvLocIdLotattList(invLocIdSearchFrom);
         return getDataTable(list);
     }

+ 32 - 1
ruoyi-ui/src/views/ams/inv/invLotLocId/index.vue

@@ -29,6 +29,33 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="托盘号" prop="lotatt07">
+        <el-input
+          v-model="queryParams.lotatt07"
+          placeholder="请输入托盘号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入库单号" prop="lotatt08">
+        <el-input
+          v-model="queryParams.lotatt08"
+          placeholder="请输入入库单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出库单号" prop="lotatt14">
+        <el-input
+          v-model="queryParams.lotatt14"
+          placeholder="请输入出库单号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="是否满拖" prop="isFull">
         <el-select v-model="queryParams.isFull" placeholder="请选择是否满拖" clearable>
           <el-option
@@ -270,8 +297,12 @@ export default {
         pageSize: 10,
         sku: null,
         locationNo: null,
+        palletNo: null,
         isFull: null,
-        zoneId: null
+        zoneId: null,
+        lotatt07: null,
+        lotatt08: null,
+        lotatt14: null,
       },
       // 表单参数
       form: {},

+ 29 - 2
warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/form/InvLocIdSearchFrom.java

@@ -12,8 +12,11 @@ public class InvLocIdSearchFrom {
     private String zoneId;
     private String locationNo;
     private String isFull;
-    private LotattDTO lotattDTO;
+    private LotattDTO lotattDTO= new LotattDTO();
     private String palletNo;
+    private String lotatt07;
+    private String lotatt08;
+    private String lotatt14;
 
     public String getSku() {
         return sku;
@@ -62,4 +65,28 @@ public class InvLocIdSearchFrom {
     public void setPalletNo(String palletNo) {
         this.palletNo = palletNo;
     }
-}
+
+    public String getLotatt07() {
+        return lotatt07;
+    }
+
+    public void setLotatt07(String lotatt07) {
+        this.lotatt07 = lotatt07;
+    }
+
+    public String getLotatt08() {
+        return lotatt08;
+    }
+
+    public void setLotatt08(String lotatt08) {
+        this.lotatt08 = lotatt08;
+    }
+
+    public String getLotatt14() {
+        return lotatt14;
+    }
+
+    public void setLotatt14(String lotatt14) {
+        this.lotatt14 = lotatt14;
+    }
+}