diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialCategoryController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialCategoryController.java
index 130929f..2a07b31 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialCategoryController.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialCategoryController.java
@@ -1,6 +1,5 @@
 package org.dromara.wms.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -41,7 +40,7 @@ public class BaseMaterialCategoryController extends BaseController {
     /**
      * 查询物料大类信息列表
      */
-    @SaCheckPermission("mes:baseMaterialCategory:list")
+    //@SaCheckPermission("mes:baseMaterialCategory:list")
     @GetMapping("/list")
     public TableDataInfo<BaseMaterialCategoryVo> list(BaseMaterialCategoryBo bo, PageQuery pageQuery) {
         return baseMaterialCategoryService.queryPageList(bo, pageQuery);
@@ -50,7 +49,7 @@ public class BaseMaterialCategoryController extends BaseController {
     /**
      * 导出物料大类信息列表
      */
-    @SaCheckPermission("mes:baseMaterialCategory:export")
+    //@SaCheckPermission("mes:baseMaterialCategory:export")
     @Log(title = "物料大类信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(BaseMaterialCategoryBo bo, HttpServletResponse response) {
@@ -63,7 +62,7 @@ public class BaseMaterialCategoryController extends BaseController {
      *
      * @param materialCategoryId 主键
      */
-    @SaCheckPermission("mes:baseMaterialCategory:query")
+    //@SaCheckPermission("mes:baseMaterialCategory:query")
     @GetMapping("/{materialCategoryId}")
     public R<BaseMaterialCategoryVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long materialCategoryId) {
@@ -73,7 +72,7 @@ public class BaseMaterialCategoryController extends BaseController {
     /**
      * 新增物料大类信息
      */
-    @SaCheckPermission("mes:baseMaterialCategory:add")
+    //@SaCheckPermission("mes:baseMaterialCategory:add")
     @Log(title = "物料大类信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -84,7 +83,7 @@ public class BaseMaterialCategoryController extends BaseController {
     /**
      * 修改物料大类信息
      */
-    @SaCheckPermission("mes:baseMaterialCategory:edit")
+    //@SaCheckPermission("mes:baseMaterialCategory:edit")
     @Log(title = "物料大类信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -97,7 +96,7 @@ public class BaseMaterialCategoryController extends BaseController {
      *
      * @param materialCategoryIds 主键串
      */
-    @SaCheckPermission("mes:baseMaterialCategory:remove")
+    //@SaCheckPermission("mes:baseMaterialCategory:remove")
     @Log(title = "物料大类信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{materialCategoryIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialInfoController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialInfoController.java
index 3bd31d4..7e646a5 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialInfoController.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/BaseMaterialInfoController.java
@@ -42,7 +42,7 @@ public class BaseMaterialInfoController extends BaseController {
     /**
      * 查询物料信息列表
      */
-    @SaCheckPermission("mes:baseMaterialInfo:list")
+    //@SaCheckPermission("mes:baseMaterialInfo:list")
     @GetMapping("/list")
     public TableDataInfo<BaseMaterialInfoVo> list(BaseMaterialInfoBo bo, PageQuery pageQuery) {
         return baseMaterialInfoService.queryPageList(bo, pageQuery);
@@ -51,7 +51,7 @@ public class BaseMaterialInfoController extends BaseController {
     /**
      * 导出物料信息列表
      */
-    @SaCheckPermission("mes:baseMaterialInfo:export")
+    //@SaCheckPermission("mes:baseMaterialInfo:export")
     @Log(title = "物料信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(BaseMaterialInfoBo bo, HttpServletResponse response) {
@@ -64,7 +64,7 @@ public class BaseMaterialInfoController extends BaseController {
      *
      * @param materialId 主键
      */
-    @SaCheckPermission("mes:baseMaterialInfo:query")
+    //@SaCheckPermission("mes:baseMaterialInfo:query")
     @GetMapping("/{materialId}")
     public R<BaseMaterialInfoVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long materialId) {
@@ -74,7 +74,7 @@ public class BaseMaterialInfoController extends BaseController {
     /**
      * 新增物料信息
      */
-    @SaCheckPermission("mes:baseMaterialInfo:add")
+    //@SaCheckPermission("mes:baseMaterialInfo:add")
     @Log(title = "物料信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -85,7 +85,7 @@ public class BaseMaterialInfoController extends BaseController {
     /**
      * 修改物料信息
      */
-    @SaCheckPermission("mes:baseMaterialInfo:edit")
+    //@SaCheckPermission("mes:baseMaterialInfo:edit")
     @Log(title = "物料信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -98,7 +98,7 @@ public class BaseMaterialInfoController extends BaseController {
      *
      * @param materialIds 主键串
      */
-    @SaCheckPermission("mes:baseMaterialInfo:remove")
+    //@SaCheckPermission("mes:baseMaterialInfo:remove")
     @Log(title = "物料信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{materialIds}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java
index 7c0da25..f85baf8 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPurchaseOrderController.java
@@ -1,27 +1,26 @@
 package org.dromara.wms.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.wms.domain.WmsPurchaseOrder;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.wms.domain.vo.WmsPurchaseOrderVo;
-import org.dromara.wms.domain.bo.WmsPurchaseOrderBo;
-import org.dromara.wms.service.IWmsPurchaseOrderService;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.wms.domain.WmsPurchaseOrder;
+import org.dromara.wms.domain.bo.WmsPurchaseOrderBo;
+import org.dromara.wms.domain.vo.WmsPurchaseOrderVo;
+import org.dromara.wms.service.IWmsPurchaseOrderService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 采购订单
@@ -115,4 +114,5 @@ public class WmsPurchaseOrderController extends BaseController {
         List<WmsPurchaseOrderVo> list = wmsPurchaseOrderService.queryList(bo);
         return R.ok(list);
     }
+
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java
index a844cf7..41fc6ed 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockDetail.java
@@ -1,9 +1,7 @@
 package org.dromara.wms.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -122,6 +120,17 @@ public class WmsInstockDetail{
      */
     private BigDecimal printedNum;
 
+    /**
+     * 分包数量
+     */
+    private BigDecimal apportionQty;
+
+    /**
+     * 是否质检
+     */
+    private String isInspection;
+
+
 
     /**
      * 物料大类
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockOrder.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockOrder.java
index 4421990..a1e38ca 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockOrder.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockOrder.java
@@ -1,13 +1,12 @@
 package org.dromara.wms.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 入库单对象 wms_instock_order
@@ -75,6 +74,12 @@ public class WmsInstockOrder{
     private Long warehouseId;
 
 
+    /**
+     * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+     */
+    private String instockMethond;
+
+
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java
index 5617fcf..0e78d81 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockDetailBo.java
@@ -4,13 +4,12 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
 import org.dromara.wms.domain.WmsInstockDetail;
 
 import java.math.BigDecimal;
@@ -110,6 +109,18 @@ public class WmsInstockDetailBo{
      * 租户id
      */
     private String tenantId;
+
+    /**
+     * 分包数量
+     */
+    private BigDecimal apportionQty;
+
+    /**
+     * 是否质检
+     */
+    private String isInspection;
+
+
     /**
      * 分包数量
      */
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockOrderBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockOrderBo.java
index bcfe431..fed36a8 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockOrderBo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsInstockOrderBo.java
@@ -1,17 +1,18 @@
 package org.dromara.wms.domain.bo;
 
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.wms.domain.WmsInstockOrder;
 
+import java.util.Date;
+
 /**
  * 入库单业务对象 wms_instock_order
  *
@@ -82,10 +83,15 @@ public class WmsInstockOrderBo extends BaseEntity {
      */
     @NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long warehouseId;
+
     /**
      * 租户id
      */
     private String tenantId;
 
+    /**
+     * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+     */
+    private String instockMethond;
 
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java
index d6632cf..33272b1 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockDetailVo.java
@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.wms.domain.WmsInstockDetail;
@@ -141,6 +139,17 @@ public class WmsInstockDetailVo implements Serializable {
      */
     private String tenantId;
 
+    /**
+     * 分包数量
+     */
+    private BigDecimal apportionQty;
+
+    /**
+     * 是否质检
+     */
+    private String isInspection;
+
+
     /**
      * 物料大类
      */
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockOrderVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockOrderVo.java
index a38a8c9..0060288 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockOrderVo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockOrderVo.java
@@ -1,16 +1,10 @@
 package org.dromara.wms.domain.vo;
 
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.wms.domain.WmsInstockOrder;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.wms.domain.WmsInstockOrder;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -91,11 +85,18 @@ public class WmsInstockOrderVo implements Serializable {
      */
     @ExcelProperty(value = "仓库ID")
     private Long warehouseId;
+
     /**
      * 租户id
      */
     private String tenantId;
 
+    /**
+     * 入库方式（0PDA入库、1AGV入库、2质检后PDA入库、3质检后AGV入库）
+     */
+    private String instockMethond;
+
+
     private String warehouseCode;//字段映射
 
     /**
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderVo.java
index 477444a..a9589ce 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderVo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsPurchaseOrderVo.java
@@ -1,21 +1,18 @@
 package org.dromara.wms.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.wms.domain.WmsPurchaseOrder;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.wms.domain.WmsPurchaseOrder;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 采购订单视图对象 wms_purchase_order
  *
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java
index 43a4cd5..613044b 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/BaseMaterialInfoServiceImpl.java
@@ -95,6 +95,10 @@ public class BaseMaterialInfoServiceImpl implements IBaseMaterialInfoService {
             .select(BaseMaterialCategory::getMaterialCategoryName)
             .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, BaseMaterialInfo::getMaterialCategoryId)
 
+//        lqw.between(params.get("beginApproveDate") != null && params.get("endApproveDate") != null,
+//            BaseMaterialInfo::getApproveDate ,params.get("beginApproveDate"), params.get("endApproveDate"));
+            .between(params.get("beginApproveDate") != null && params.get("endApproveDate") != null,
+                BaseMaterialInfo::getApproveDate ,params.get("beginApproveDate"), params.get("endApproveDate"))
 
             .eq(bo.getMaterialId() != null, BaseMaterialInfo::getMaterialId, bo.getMaterialId())
             .eq(StringUtils.isNotBlank(bo.getErpId()), BaseMaterialInfo::getErpId, bo.getErpId())
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java
index 66554e6..f888ea4 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockDetailServiceImpl.java
@@ -96,6 +96,8 @@ public class WmsInstockDetailServiceImpl implements IWmsInstockDetailService {
             .select(BaseMaterialCategory::getMaterialCategoryName)
             .leftJoin(BaseMaterialCategory.class, BaseMaterialCategory::getMaterialCategoryId, WmsInstockDetail::getMaterialCategoryId)
 
+            .eq(StringUtils.isNotBlank(bo.getIsInspection()), WmsInstockDetail::getIsInspection, bo.getIsInspection())
+            .eq(bo.getInstockQty() != null, WmsInstockDetail::getInstockQty, bo.getInstockQty())
 
             .eq(bo.getInstockDetailId() != null, WmsInstockDetail::getInstockDetailId, bo.getInstockDetailId())
             .eq(bo.getInstockId() != null, WmsInstockDetail::getInstockId, bo.getInstockId())
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
index ddb8765..1a31c3d 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInstockOrderServiceImpl.java
@@ -1,28 +1,24 @@
 package org.dromara.wms.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.checkerframework.checker.units.qual.A;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.wms.domain.BaseMaterialCategory;
 import org.dromara.wms.domain.WmsBaseWarehouse;
 import org.dromara.wms.domain.WmsConfiguration;
 import org.dromara.wms.domain.WmsInstockOrder;
-import org.dromara.wms.domain.bo.WmsConfigurationBo;
 import org.dromara.wms.domain.bo.WmsInstockOrderBo;
 import org.dromara.wms.domain.vo.WmsInstockOrderVo;
 import org.dromara.wms.mapper.WmsInstockOrderMapper;
-import org.dromara.wms.service.IWmsConfigurationService;
 import org.dromara.wms.service.IWmsInstockDetailService;
 import org.dromara.wms.service.IWmsInstockOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,12 +26,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * 入库单Service业务层处理
@@ -114,6 +109,7 @@ public class WmsInstockOrderServiceImpl implements IWmsInstockOrderService {
             .select(WmsBaseWarehouse::getWarehouseCode)
             .leftJoin(WmsBaseWarehouse.class, WmsBaseWarehouse::getWarehouseId, WmsInstockOrder::getWarehouseId)
 
+            .eq(StringUtils.isNotBlank(bo.getInstockMethond()), WmsInstockOrder::getInstockMethond, bo.getInstockMethond())
             .eq(bo.getInstockId() != null, WmsInstockOrder::getInstockId, bo.getInstockId())
             .eq(StringUtils.isNotBlank(bo.getInstockCode()), WmsInstockOrder::getInstockCode, bo.getInstockCode())
             .eq(StringUtils.isNotBlank(bo.getMaterialCategoryId()), WmsInstockOrder::getMaterialCategoryId, bo.getMaterialCategoryId())
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java
index 817b092..a4ddf01 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPurchaseOrderServiceImpl.java
@@ -1,32 +1,31 @@
 package org.dromara.wms.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.wms.domain.*;
-import org.dromara.wms.domain.vo.WmsInstockOrderVo;
-import org.dromara.wms.mapper.WmsInstockOrderMapper;
-import org.dromara.wms.service.IWmsPurchaseOrderDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import org.dromara.wms.domain.BaseMaterialCategory;
+import org.dromara.wms.domain.BaseSupplierInfo;
+import org.dromara.wms.domain.WmsPurchaseOrder;
 import org.dromara.wms.domain.bo.WmsPurchaseOrderBo;
 import org.dromara.wms.domain.vo.WmsPurchaseOrderVo;
+import org.dromara.wms.mapper.BaseMaterialInfoMapper;
 import org.dromara.wms.mapper.WmsPurchaseOrderMapper;
+import org.dromara.wms.service.IWmsPurchaseOrderDetailService;
 import org.dromara.wms.service.IWmsPurchaseOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -47,6 +46,8 @@ public class WmsPurchaseOrderServiceImpl implements IWmsPurchaseOrderService {
     @Autowired
     private IWmsPurchaseOrderDetailService wmsPurchaseOrderDetailService;
 
+    private final BaseMaterialInfoMapper baseMaterialInfoMapper;
+
     /**
      * 查询采购订单
      *