diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
index a92c5cd..fe05af8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
@@ -56,6 +56,14 @@ public class ToWmsApiController {
         requestLogService.insertRequestLog(requestLog);
         return ajaxResult;
     }
+    @PostMapping("/sendCargoSpace")
+    public AjaxResult sendCargoSpace(@RequestBody RequestEnter requestEnter) {
+        AjaxResult ajaxResult = toWmsService.requestEnterByTaskNo(requestEnter);
+        RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(requestEnter), "入库任务创建请求",ajaxResult);
+        requestLogService.insertRequestLog(requestLog);
+        return ajaxResult;
+    }
+
 
     // 入库分货位
     @PostMapping("/sendCargoSpace")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
index 71cb587..d3e3288 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
@@ -41,6 +41,16 @@ private String stockoutDetailId;
         this.trayType = trayType;
     }
 
+private String trayType;
+
+    public String getTrayType() {
+        return trayType;
+    }
+
+    public void setTrayType(String trayType) {
+        this.trayType = trayType;
+    }
+
     public String getStatus() {
         return status;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/controller/BasStockHcController.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/controller/BasStockHcController.java
new file mode 100644
index 0000000..4aa8a53
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/controller/BasStockHcController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.stock.hcstock.controller;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.stock.hcstock.domain.BasStockHc;
+import com.ruoyi.stock.hcstock.service.IBasStockHcService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 缓存库存信息Controller
+ * 
+ * @author ruoyi
+ * @date 2026-03-23
+ */
+@RestController
+@RequestMapping("/hcstock/hcstock")
+public class BasStockHcController extends BaseController
+{
+    @Autowired
+    private IBasStockHcService basStockHcService;
+
+    /**
+     * 查询缓存库存信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BasStockHc basStockHc)
+    {
+        startPage();
+        List<BasStockHc> list = basStockHcService.selectBasStockHcList(basStockHc);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出缓存库存信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:export')")
+    @Log(title = "缓存库存信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BasStockHc basStockHc)
+    {
+        List<BasStockHc> list = basStockHcService.selectBasStockHcList(basStockHc);
+        ExcelUtil<BasStockHc> util = new ExcelUtil<BasStockHc>(BasStockHc.class);
+        util.exportExcel(response, list, "缓存库存信息数据");
+    }
+
+    /**
+     * 获取缓存库存信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:query')")
+    @GetMapping(value = "/{stockId}")
+    public AjaxResult getInfo(@PathVariable("stockId") String stockId)
+    {
+        return success(basStockHcService.selectBasStockHcByStockId(stockId));
+    }
+
+    /**
+     * 新增缓存库存信息
+     */
+    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:add')")
+    @Log(title = "缓存库存信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BasStockHc basStockHc)
+    {
+        return toAjax(basStockHcService.insertBasStockHc(basStockHc));
+    }
+
+    /**
+     * 修改缓存库存信息
+     */
+    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:edit')")
+    @Log(title = "缓存库存信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BasStockHc basStockHc)
+    {
+        return toAjax(basStockHcService.updateBasStockHc(basStockHc));
+    }
+
+    /**
+     * 删除缓存库存信息
+     */
+    @PreAuthorize("@ss.hasPermi('hcstock:hcstock:remove')")
+    @Log(title = "缓存库存信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockIds}")
+    public AjaxResult remove(@PathVariable String[] stockIds)
+    {
+        return toAjax(basStockHcService.deleteBasStockHcByStockIds(stockIds));
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/domain/BasStockHc.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/domain/BasStockHc.java
new file mode 100644
index 0000000..7c7a5c6
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/domain/BasStockHc.java
@@ -0,0 +1,562 @@
+package com.ruoyi.stock.hcstock.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 缓存库存信息对象 bas_stock_hc
+ * 
+ * @author ruoyi
+ * @date 2026-03-23
+ */
+public class BasStockHc extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 库存id */
+    private String stockId;
+
+    /** 货位id */
+    @Excel(name = "货位id")
+    private String cargoSpaceId;
+
+    /** 库存状态 1正常 2冻结 */
+    @Excel(name = "库存状态 1正常 2冻结")
+    private String stockStatus;
+
+    /** 物料状态 1正常 2盘点待审批 3异常 */
+    @Excel(name = "物料状态 1正常 2盘点待审批 3异常")
+    private String productStatus;
+
+    /** 546批号 */
+    @Excel(name = "546批号")
+    private String lotNo;
+
+    /** 入库时间 */
+    @Excel(name = "入库时间")
+    private String inDate;
+
+    /** 回流时间 */
+    @Excel(name = "回流时间")
+    private String backDate;
+
+    /** 物料GUID */
+    @Excel(name = "物料GUID")
+    private String productGuid;
+
+    /** 库存数量 */
+    @Excel(name = "库存数量")
+    private String quantity;
+
+    /** 作业ID */
+    @Excel(name = "作业ID")
+    private String jobId;
+
+    /** 托盘条码 */
+    @Excel(name = "托盘条码")
+    private String trayCode;
+
+    /** 出库数量 */
+    @Excel(name = "出库数量")
+    private String outQuantity;
+
+    /** 入库子单id */
+    @Excel(name = "入库子单id")
+    private String stockinDetailId;
+
+    /** 入库主单 */
+    @Excel(name = "入库主单")
+    private String stockinId;
+
+    /** 入库类型 */
+    @Excel(name = "入库类型")
+    private String inType;
+
+    /** 入库班组ID */
+    @Excel(name = "入库班组ID")
+    private String inClassId;
+
+    /** 仓库 */
+    @Excel(name = "仓库")
+    private String warehouseId;
+
+    /** 供应商名称546 */
+    @Excel(name = "供应商名称546")
+    private String stackingId;
+
+    /** 层级关系546 */
+    @Excel(name = "层级关系546")
+    private String spare1;
+
+    /** 上层物料546 */
+    @Excel(name = "上层物料546")
+    private String spare2;
+
+    /** 顶层物料546 */
+    @Excel(name = "顶层物料546")
+    private String spare3;
+
+    /** 项目号546 */
+    @Excel(name = "项目号546")
+    private String spare4;
+
+    /** 合同号546 */
+    @Excel(name = "合同号546")
+    private String spare5;
+
+    /** 销售订单号546 */
+    @Excel(name = "销售订单号546")
+    private String spare6;
+
+    /** 物料编码 */
+    @Excel(name = "物料编码")
+    private String productId;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String productName;
+
+    /** 供应商编码546 */
+    @Excel(name = "供应商编码546")
+    private String voltage;
+
+    /** 规格型号546 */
+    @Excel(name = "规格型号546")
+    private String power;
+
+    /** 计量单位546 */
+    @Excel(name = "计量单位546")
+    private String phase;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String netWeight;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String grossWeight;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String distribution;
+
+    /** 是否满盘546,0否1是 */
+    @Excel(name = "是否满盘546,0否1是")
+    private String model;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String orderId;
+
+    /** 盘点记录 0-未盘点 1-已盘点 */
+    @Excel(name = "盘点记录 0-未盘点 1-已盘点")
+    private String spare7;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare8;
+
+    public void setStockId(String stockId) 
+    {
+        this.stockId = stockId;
+    }
+
+    public String getStockId() 
+    {
+        return stockId;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
+    }
+
+    public void setStockStatus(String stockStatus) 
+    {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getStockStatus() 
+    {
+        return stockStatus;
+    }
+
+    public void setProductStatus(String productStatus) 
+    {
+        this.productStatus = productStatus;
+    }
+
+    public String getProductStatus() 
+    {
+        return productStatus;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setInDate(String inDate) 
+    {
+        this.inDate = inDate;
+    }
+
+    public String getInDate() 
+    {
+        return inDate;
+    }
+
+    public void setBackDate(String backDate) 
+    {
+        this.backDate = backDate;
+    }
+
+    public String getBackDate() 
+    {
+        return backDate;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public String getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setJobId(String jobId) 
+    {
+        this.jobId = jobId;
+    }
+
+    public String getJobId() 
+    {
+        return jobId;
+    }
+
+    public void setTrayCode(String trayCode) 
+    {
+        this.trayCode = trayCode;
+    }
+
+    public String getTrayCode() 
+    {
+        return trayCode;
+    }
+
+    public void setOutQuantity(String outQuantity) 
+    {
+        this.outQuantity = outQuantity;
+    }
+
+    public String getOutQuantity() 
+    {
+        return outQuantity;
+    }
+
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
+    }
+
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setInType(String inType) 
+    {
+        this.inType = inType;
+    }
+
+    public String getInType() 
+    {
+        return inType;
+    }
+
+    public void setInClassId(String inClassId) 
+    {
+        this.inClassId = inClassId;
+    }
+
+    public String getInClassId() 
+    {
+        return inClassId;
+    }
+
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
+
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
+
+    public void setStackingId(String stackingId) 
+    {
+        this.stackingId = stackingId;
+    }
+
+    public String getStackingId() 
+    {
+        return stackingId;
+    }
+
+    public void setSpare1(String spare1) 
+    {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare1() 
+    {
+        return spare1;
+    }
+
+    public void setSpare2(String spare2) 
+    {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare2() 
+    {
+        return spare2;
+    }
+
+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
+    public void setSpare5(String spare5) 
+    {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare5() 
+    {
+        return spare5;
+    }
+
+    public void setSpare6(String spare6) 
+    {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare6() 
+    {
+        return spare6;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
+    }
+
+    public void setVoltage(String voltage) 
+    {
+        this.voltage = voltage;
+    }
+
+    public String getVoltage() 
+    {
+        return voltage;
+    }
+
+    public void setPower(String power) 
+    {
+        this.power = power;
+    }
+
+    public String getPower() 
+    {
+        return power;
+    }
+
+    public void setPhase(String phase) 
+    {
+        this.phase = phase;
+    }
+
+    public String getPhase() 
+    {
+        return phase;
+    }
+
+    public void setNetWeight(String netWeight) 
+    {
+        this.netWeight = netWeight;
+    }
+
+    public String getNetWeight() 
+    {
+        return netWeight;
+    }
+
+    public void setGrossWeight(String grossWeight) 
+    {
+        this.grossWeight = grossWeight;
+    }
+
+    public String getGrossWeight() 
+    {
+        return grossWeight;
+    }
+
+    public void setDistribution(String distribution) 
+    {
+        this.distribution = distribution;
+    }
+
+    public String getDistribution() 
+    {
+        return distribution;
+    }
+
+    public void setModel(String model) 
+    {
+        this.model = model;
+    }
+
+    public String getModel() 
+    {
+        return model;
+    }
+
+    public void setOrderId(String orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public String getOrderId() 
+    {
+        return orderId;
+    }
+
+    public void setSpare7(String spare7) 
+    {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare7() 
+    {
+        return spare7;
+    }
+
+    public void setSpare8(String spare8) 
+    {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare8() 
+    {
+        return spare8;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockId", getStockId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("stockStatus", getStockStatus())
+            .append("productStatus", getProductStatus())
+            .append("lotNo", getLotNo())
+            .append("inDate", getInDate())
+            .append("backDate", getBackDate())
+            .append("productGuid", getProductGuid())
+            .append("quantity", getQuantity())
+            .append("jobId", getJobId())
+            .append("trayCode", getTrayCode())
+            .append("outQuantity", getOutQuantity())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("stockinId", getStockinId())
+            .append("inType", getInType())
+            .append("inClassId", getInClassId())
+            .append("warehouseId", getWarehouseId())
+            .append("stackingId", getStackingId())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("productId", getProductId())
+            .append("productName", getProductName())
+            .append("voltage", getVoltage())
+            .append("power", getPower())
+            .append("phase", getPhase())
+            .append("netWeight", getNetWeight())
+            .append("grossWeight", getGrossWeight())
+            .append("distribution", getDistribution())
+            .append("model", getModel())
+            .append("orderId", getOrderId())
+            .append("spare7", getSpare7())
+            .append("spare8", getSpare8())
+            .toString();
+    }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/mapper/BasStockHcMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/mapper/BasStockHcMapper.java
new file mode 100644
index 0000000..3e7b8c8
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/mapper/BasStockHcMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.stock.hcstock.mapper;
+
+import java.util.List;
+import com.ruoyi.stock.hcstock.domain.BasStockHc;
+
+/**
+ * 缓存库存信息Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2026-03-23
+ */
+public interface BasStockHcMapper 
+{
+    /**
+     * 查询缓存库存信息
+     * 
+     * @param stockId 缓存库存信息主键
+     * @return 缓存库存信息
+     */
+    public BasStockHc selectBasStockHcByStockId(String stockId);
+
+    /**
+     * 查询缓存库存信息列表
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 缓存库存信息集合
+     */
+    public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc);
+
+    /**
+     * 新增缓存库存信息
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 结果
+     */
+    public int insertBasStockHc(BasStockHc basStockHc);
+
+    /**
+     * 修改缓存库存信息
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 结果
+     */
+    public int updateBasStockHc(BasStockHc basStockHc);
+
+    /**
+     * 删除缓存库存信息
+     * 
+     * @param stockId 缓存库存信息主键
+     * @return 结果
+     */
+    public int deleteBasStockHcByStockId(String stockId);
+
+    /**
+     * 批量删除缓存库存信息
+     * 
+     * @param stockIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteBasStockHcByStockIds(String[] stockIds);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/IBasStockHcService.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/IBasStockHcService.java
new file mode 100644
index 0000000..6b9be5b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/IBasStockHcService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.stock.hcstock.service;
+
+import java.util.List;
+import com.ruoyi.stock.hcstock.domain.BasStockHc;
+
+/**
+ * 缓存库存信息Service接口
+ * 
+ * @author ruoyi
+ * @date 2026-03-23
+ */
+public interface IBasStockHcService 
+{
+    /**
+     * 查询缓存库存信息
+     * 
+     * @param stockId 缓存库存信息主键
+     * @return 缓存库存信息
+     */
+    public BasStockHc selectBasStockHcByStockId(String stockId);
+
+    /**
+     * 查询缓存库存信息列表
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 缓存库存信息集合
+     */
+    public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc);
+
+    /**
+     * 新增缓存库存信息
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 结果
+     */
+    public int insertBasStockHc(BasStockHc basStockHc);
+
+    /**
+     * 修改缓存库存信息
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 结果
+     */
+    public int updateBasStockHc(BasStockHc basStockHc);
+
+    /**
+     * 批量删除缓存库存信息
+     * 
+     * @param stockIds 需要删除的缓存库存信息主键集合
+     * @return 结果
+     */
+    public int deleteBasStockHcByStockIds(String[] stockIds);
+
+    /**
+     * 删除缓存库存信息信息
+     * 
+     * @param stockId 缓存库存信息主键
+     * @return 结果
+     */
+    public int deleteBasStockHcByStockId(String stockId);
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/impl/BasStockHcServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/impl/BasStockHcServiceImpl.java
new file mode 100644
index 0000000..94fc4a0
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/stock/hcstock/service/impl/BasStockHcServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.stock.hcstock.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.stock.hcstock.mapper.BasStockHcMapper;
+import com.ruoyi.stock.hcstock.domain.BasStockHc;
+import com.ruoyi.stock.hcstock.service.IBasStockHcService;
+
+/**
+ * 缓存库存信息Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2026-03-23
+ */
+@Service
+public class BasStockHcServiceImpl implements IBasStockHcService 
+{
+    @Autowired
+    private BasStockHcMapper basStockHcMapper;
+
+    /**
+     * 查询缓存库存信息
+     * 
+     * @param stockId 缓存库存信息主键
+     * @return 缓存库存信息
+     */
+    @Override
+    public BasStockHc selectBasStockHcByStockId(String stockId)
+    {
+        return basStockHcMapper.selectBasStockHcByStockId(stockId);
+    }
+
+    /**
+     * 查询缓存库存信息列表
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 缓存库存信息
+     */
+    @Override
+    public List<BasStockHc> selectBasStockHcList(BasStockHc basStockHc)
+    {
+        return basStockHcMapper.selectBasStockHcList(basStockHc);
+    }
+
+    /**
+     * 新增缓存库存信息
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 结果
+     */
+    @Override
+    public int insertBasStockHc(BasStockHc basStockHc)
+    {
+        return basStockHcMapper.insertBasStockHc(basStockHc);
+    }
+
+    /**
+     * 修改缓存库存信息
+     * 
+     * @param basStockHc 缓存库存信息
+     * @return 结果
+     */
+    @Override
+    public int updateBasStockHc(BasStockHc basStockHc)
+    {
+        return basStockHcMapper.updateBasStockHc(basStockHc);
+    }
+
+    /**
+     * 批量删除缓存库存信息
+     * 
+     * @param stockIds 需要删除的缓存库存信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasStockHcByStockIds(String[] stockIds)
+    {
+        return basStockHcMapper.deleteBasStockHcByStockIds(stockIds);
+    }
+
+    /**
+     * 删除缓存库存信息信息
+     * 
+     * @param stockId 缓存库存信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteBasStockHcByStockId(String stockId)
+    {
+        return basStockHcMapper.deleteBasStockHcByStockId(stockId);
+    }
+}
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml
new file mode 100644
index 0000000..d77df5c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/agv/AgvContainerTaskMapper.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.device.agv.mapper.AgvContainerTaskMapper">
+
+    <resultMap type="AgvContainerTask" id="AgvContainerTaskResult">
+        <result property="id"    column="id"    />
+        <result property="container"    column="container"    />
+        <result property="startPoint"    column="start_point"    />
+        <result property="endPoint"    column="end_point"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="taskNo"    column="task_no"    />
+        <result property="status"    column="status"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+    </resultMap>
+
+    <sql id="selectAgvContainerTaskVo">
+        select id, container, start_point, end_point, create_time, start_time, finish_time, task_no, status, spare1, spare2 from agv_container_task
+    </sql>
+
+    <select id="selectAgvContainerTaskList" parameterType="AgvContainerTask" resultMap="AgvContainerTaskResult">
+        <include refid="selectAgvContainerTaskVo"/>
+        <where>
+            <if test="container != null  and container != ''"> and container like concat("%", #{container}, "%")</if>
+            <if test="startPoint != null  and startPoint != ''"> and start_point like concat("%", #{startPoint}, "%")</if>
+            <if test="endPoint != null  and endPoint != ''"> and end_point like concat("%", #{endPoint}, "%")</if>
+            <if test="startTime != null  and startTime != ''"> and start_time like concat("%", #{startTime}, "%")</if>
+            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
+            <if test="taskNo != null  and taskNo != ''"> and task_no like concat("%", #{taskNo}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectAgvContainerTaskById" parameterType="Long" resultMap="AgvContainerTaskResult">
+        <include refid="selectAgvContainerTaskVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertAgvContainerTask" parameterType="AgvContainerTask" useGeneratedKeys="true" keyProperty="id">
+        insert into agv_container_task
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="container != null">container,</if>
+            <if test="startPoint != null">start_point,</if>
+            <if test="endPoint != null">end_point,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="taskNo != null">task_no,</if>
+            <if test="status != null">status,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="container != null">#{container},</if>
+            <if test="startPoint != null">#{startPoint},</if>
+            <if test="endPoint != null">#{endPoint},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="taskNo != null">#{taskNo},</if>
+            <if test="status != null">#{status},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+         </trim>
+    </insert>
+    <insert id="insertHistory">
+        insert into agv_container_task_finish
+        select * from agv_container_task where id = #{id}
+    </insert>
+
+    <update id="updateAgvContainerTask" parameterType="AgvContainerTask">
+        update agv_container_task
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="container != null">container = #{container},</if>
+            <if test="startPoint != null">start_point = #{startPoint},</if>
+            <if test="endPoint != null">end_point = #{endPoint},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="taskNo != null">task_no = #{taskNo},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteAgvContainerTaskById" parameterType="Long">
+        delete from agv_container_task where id = #{id}
+    </delete>
+
+    <delete id="deleteAgvContainerTaskByIds" parameterType="String">
+        delete from agv_container_task where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml
new file mode 100644
index 0000000..60d0853
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ChatMessageMapper.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.ai.message.mapper.ChatMessageMapper">
+
+    <resultMap type="ChatMessage" id="ChatMessageResult">
+        <result property="id"    column="id"    />
+        <result property="sessionId"    column="session_id"    />
+        <result property="conversationId"    column="conversation_id"    />
+        <result property="content"    column="content"    />
+        <result property="role"    column="role"    />
+        <result property="deductCost"    column="deduct_cost"    />
+        <result property="totalTokens"    column="total_tokens"    />
+        <result property="modelName"    column="model_name"    />
+        <result property="createDept"    column="create_dept"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectChatMessageVo">
+        select id, session_id, conversation_id, content, role, deduct_cost, total_tokens, model_name, create_dept, create_by, create_time, update_by, update_time, remark from chat_message
+    </sql>
+
+    <select id="selectChatMessageList" parameterType="ChatMessage" resultMap="ChatMessageResult">
+        <include refid="selectChatMessageVo"/>
+        <where>
+            <if test="sessionId != null "> and session_id like concat("%", #{sessionId}, "%")</if>
+            <if test="conversationId != null "> and conversation_id like concat("%", #{conversationId}, "%")</if>
+            <if test="content != null  and content != ''"> and content like concat("%", #{content}, "%")</if>
+            <if test="role != null  and role != ''"> and role like concat("%", #{role}, "%")</if>
+            <if test="deductCost != null "> and deduct_cost like concat("%", #{deductCost}, "%")</if>
+            <if test="totalTokens != null "> and total_tokens like concat("%", #{totalTokens}, "%")</if>
+            <if test="modelName != null  and modelName != ''"> and model_name like concat('%', #{modelName}, '%')</if>
+            <if test="createDept != null "> and create_dept like concat("%", #{createDept}, "%")</if>
+        </where>
+        order by create_time asc
+    </select>
+
+    <select id="selectChatMessageById" parameterType="Long" resultMap="ChatMessageResult">
+        <include refid="selectChatMessageVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertChatMessage" parameterType="ChatMessage">
+        insert into chat_message
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="sessionId != null">session_id,</if>
+            <if test="conversationId != null">conversation_id,</if>
+            <if test="content != null">content,</if>
+            <if test="role != null">role,</if>
+            <if test="deductCost != null">deduct_cost,</if>
+            <if test="totalTokens != null">total_tokens,</if>
+            <if test="modelName != null">model_name,</if>
+            <if test="createDept != null">create_dept,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="sessionId != null">#{sessionId},</if>
+            <if test="conversationId != null">#{conversationId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="role != null">#{role},</if>
+            <if test="deductCost != null">#{deductCost},</if>
+            <if test="totalTokens != null">#{totalTokens},</if>
+            <if test="modelName != null">#{modelName},</if>
+            <if test="createDept != null">#{createDept},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateChatMessage" parameterType="ChatMessage">
+        update chat_message
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sessionId != null">session_id = #{sessionId},</if>
+            <if test="conversationId != null">conversation_id = #{conversationId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="role != null">role = #{role},</if>
+            <if test="deductCost != null">deduct_cost = #{deductCost},</if>
+            <if test="totalTokens != null">total_tokens = #{totalTokens},</if>
+            <if test="modelName != null">model_name = #{modelName},</if>
+            <if test="createDept != null">create_dept = #{createDept},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteChatMessageById" parameterType="Long">
+        delete from chat_message where id = #{id}
+    </delete>
+
+    <delete id="deleteChatMessageByIds" parameterType="String">
+        delete from chat_message where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteChatMessageByConversationId">
+        delete from chat_message where conversation_id = #{conversationId}
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml
new file mode 100644
index 0000000..aedf6cb
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/ai/ConversationsMapper.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.ai.conversation.mapper.ConversationsMapper">
+
+    <resultMap type="Conversations" id="ConversationsResult">
+        <result property="id"    column="id"    />
+        <result property="sessionId"    column="session_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="title"    column="title"    />
+        <result property="status"    column="status"    />
+        <result property="metadata"    column="metadata"    />
+        <result property="firstQuery"    column="first_query"    />
+        <result property="messageCount"    column="message_count"    />
+        <result property="tokenUsage"    column="token_usage"    />
+        <result property="createdAt"    column="created_at"    />
+        <result property="updatedAt"    column="updated_at"    />
+        <result property="lastInteractionAt"    column="last_interaction_at"    />
+    </resultMap>
+
+    <sql id="selectConversationsVo">
+        select id, session_id, user_id, title, status, metadata, first_query, message_count, token_usage, created_at, updated_at, last_interaction_at from conversations
+    </sql>
+
+    <select id="selectConversationsList" parameterType="Conversations" resultMap="ConversationsResult">
+        <include refid="selectConversationsVo"/>
+        <where>
+            <if test="sessionId != null  and sessionId != ''"> and session_id like concat("%", #{sessionId}, "%")</if>
+            <if test="userId != null  and userId != ''"> and user_id like concat("%", #{userId}, "%")</if>
+            <if test="title != null  and title != ''"> and title like concat("%", #{title}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="metadata != null  and metadata != ''"> and metadata like concat("%", #{metadata}, "%")</if>
+            <if test="firstQuery != null  and firstQuery != ''"> and first_query like concat("%", #{firstQuery}, "%")</if>
+            <if test="messageCount != null "> and message_count like concat("%", #{messageCount}, "%")</if>
+            <if test="tokenUsage != null "> and token_usage like concat("%", #{tokenUsage}, "%")</if>
+            <if test="createdAt != null "> and created_at like concat("%", #{createdAt}, "%")</if>
+            <if test="updatedAt != null "> and updated_at like concat("%", #{updatedAt}, "%")</if>
+            <if test="lastInteractionAt != null "> and last_interaction_at like concat("%", #{lastInteractionAt}, "%")</if>
+             order by id desc
+        </where>
+    </select>
+
+    <select id="selectConversationsById" parameterType="Long" resultMap="ConversationsResult">
+        <include refid="selectConversationsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertConversations" parameterType="Conversations" useGeneratedKeys="true" keyProperty="id">
+        insert into conversations
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="sessionId != null and sessionId != ''">session_id,</if>
+            <if test="userId != null and userId != ''">user_id,</if>
+            <if test="title != null">title,</if>
+            <if test="status != null">status,</if>
+            <if test="metadata != null">metadata,</if>
+            <if test="firstQuery != null">first_query,</if>
+            <if test="messageCount != null">message_count,</if>
+            <if test="tokenUsage != null">token_usage,</if>
+            <if test="createdAt != null">created_at,</if>
+            <if test="updatedAt != null">updated_at,</if>
+            <if test="lastInteractionAt != null">last_interaction_at,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="sessionId != null and sessionId != ''">#{sessionId},</if>
+            <if test="userId != null and userId != ''">#{userId},</if>
+            <if test="title != null">#{title},</if>
+            <if test="status != null">#{status},</if>
+            <if test="metadata != null">#{metadata},</if>
+            <if test="firstQuery != null">#{firstQuery},</if>
+            <if test="messageCount != null">#{messageCount},</if>
+            <if test="tokenUsage != null">#{tokenUsage},</if>
+            <if test="createdAt != null">#{createdAt},</if>
+            <if test="updatedAt != null">#{updatedAt},</if>
+            <if test="lastInteractionAt != null">#{lastInteractionAt},</if>
+         </trim>
+    </insert>
+
+    <update id="updateConversations" parameterType="Conversations">
+        update conversations
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="sessionId != null and sessionId != ''">session_id = #{sessionId},</if>
+            <if test="userId != null and userId != ''">user_id = #{userId},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="metadata != null">metadata = #{metadata},</if>
+            <if test="firstQuery != null">first_query = #{firstQuery},</if>
+            <if test="messageCount != null">message_count = #{messageCount},</if>
+            <if test="tokenUsage != null">token_usage = #{tokenUsage},</if>
+            <if test="createdAt != null">created_at = #{createdAt},</if>
+            <if test="updatedAt != null">updated_at = #{updatedAt},</if>
+            <if test="lastInteractionAt != null">last_interaction_at = #{lastInteractionAt},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteConversationsById" parameterType="Long">
+        delete from conversations where id = #{id}
+    </delete>
+
+    <delete id="deleteConversationsByIds" parameterType="String">
+        delete from conversations where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml
new file mode 100644
index 0000000..ed4264c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/api/JobStatisticsMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.api.mapper.JobStatisticsMapper">
+
+    <!-- 查询当日入库数量 -->
+    <select id="selectDailyInCount" parameterType="String" resultType="Integer">
+        SELECT COUNT(1)
+        FROM mydo_job_finish
+        WHERE CONVERT(varchar(10), create_time, 120) = #{createTime}
+        AND in_or_out &lt; 20
+    </select>
+
+    <!-- 查询当日出库数量 -->
+    <select id="selectDailyOutCount" parameterType="String" resultType="Integer">
+        SELECT COUNT(1)
+        FROM mydo_job_finish
+        WHERE CONVERT(varchar(10), create_time, 120) = #{createTime}
+        AND in_or_out >= 20
+    </select>
+
+    <!-- 查询当月每日入库出库统计 -->
+    <select id="selectMonthlyStatistics" resultType="java.util.Map">
+        SELECT 
+            DAY(create_time) as date,
+            SUM(CASE WHEN in_or_out &lt; 20 THEN 1 ELSE 0 END) as '入库',
+            SUM(CASE WHEN in_or_out >= 20 THEN 1 ELSE 0 END) as '出库'
+        FROM mydo_job_finish
+        WHERE YEAR(create_time) = #{year}
+        AND MONTH(create_time) = #{month}
+        GROUP BY DAY(create_time)
+          ORDER BY date
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml
new file mode 100644
index 0000000..1e2fa32
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/api/KnowledgeFileMapper.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.ai.vector.mapper.KnowledgeFileMapper">
+    
+    <resultMap type="KnowledgeFile" id="KnowledgeFileResult">
+        <result property="id"    column="id"    />
+        <result property="knowledgeBaseId"    column="knowledge_base_id"    />
+        <result property="fileName"    column="file_name"    />
+        <result property="filePath"    column="file_path"    />
+        <result property="fileSize"    column="file_size"    />
+        <result property="fileType"    column="file_type"    />
+        <result property="description"    column="description"    />
+        <result property="isVectorized"    column="is_vectorized"    />
+        <result property="vectorizedTime"    column="vectorized_time"    />
+        <result property="uploadTime"    column="upload_time"    />
+        <result property="updatedAt"    column="updated_at"    />
+        <result property="isDeleted"    column="is_deleted"    />
+    </resultMap>
+
+    <sql id="selectKnowledgeFileVo">
+        select id, knowledge_base_id, file_name, file_path, file_size, file_type, description, is_vectorized, vectorized_time, upload_time, updated_at, is_deleted from knowledge_file
+    </sql>
+
+    <select id="selectKnowledgeFileList" parameterType="KnowledgeFile" resultMap="KnowledgeFileResult">
+        <include refid="selectKnowledgeFileVo"/>
+        <where>  
+            <if test="knowledgeBaseId != null "> and knowledge_base_id like concat("%", #{knowledgeBaseId}, "%")</if>
+            <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+            <if test="filePath != null  and filePath != ''"> and file_path like concat("%", #{filePath}, "%")</if>
+            <if test="fileSize != null "> and file_size like concat("%", #{fileSize}, "%")</if>
+            <if test="fileType != null  and fileType != ''"> and file_type like concat("%", #{fileType}, "%")</if>
+            <if test="description != null  and description != ''"> and description like concat("%", #{description}, "%")</if>
+            <if test="isVectorized != null "> and is_vectorized like concat("%", #{isVectorized}, "%")</if>
+            <if test="vectorizedTime != null "> and vectorized_time like concat("%", #{vectorizedTime}, "%")</if>
+            <if test="uploadTime != null "> and upload_time like concat("%", #{uploadTime}, "%")</if>
+            <if test="updatedAt != null "> and updated_at like concat("%", #{updatedAt}, "%")</if>
+            <if test="isDeleted != null "> and is_deleted like concat("%", #{isDeleted}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectKnowledgeFileById" parameterType="Long" resultMap="KnowledgeFileResult">
+        <include refid="selectKnowledgeFileVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertKnowledgeFile" parameterType="KnowledgeFile" useGeneratedKeys="true" keyProperty="id">
+        insert into knowledge_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="knowledgeBaseId != null">knowledge_base_id,</if>
+            <if test="fileName != null and fileName != ''">file_name,</if>
+            <if test="filePath != null and filePath != ''">file_path,</if>
+            <if test="fileSize != null">file_size,</if>
+            <if test="fileType != null">file_type,</if>
+            <if test="description != null">description,</if>
+            <if test="isVectorized != null">is_vectorized,</if>
+            <if test="vectorizedTime != null">vectorized_time,</if>
+            <if test="uploadTime != null">upload_time,</if>
+            <if test="updatedAt != null">updated_at,</if>
+            <if test="isDeleted != null">is_deleted,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="knowledgeBaseId != null">#{knowledgeBaseId},</if>
+            <if test="fileName != null and fileName != ''">#{fileName},</if>
+            <if test="filePath != null and filePath != ''">#{filePath},</if>
+            <if test="fileSize != null">#{fileSize},</if>
+            <if test="fileType != null">#{fileType},</if>
+            <if test="description != null">#{description},</if>
+            <if test="isVectorized != null">#{isVectorized},</if>
+            <if test="vectorizedTime != null">#{vectorizedTime},</if>
+            <if test="uploadTime != null">#{uploadTime},</if>
+            <if test="updatedAt != null">#{updatedAt},</if>
+            <if test="isDeleted != null">#{isDeleted},</if>
+         </trim>
+    </insert>
+
+    <update id="updateKnowledgeFile" parameterType="KnowledgeFile">
+        update knowledge_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="knowledgeBaseId != null">knowledge_base_id = #{knowledgeBaseId},</if>
+            <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
+            <if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
+            <if test="fileSize != null">file_size = #{fileSize},</if>
+            <if test="fileType != null">file_type = #{fileType},</if>
+            <if test="description != null">description = #{description},</if>
+            <if test="isVectorized != null">is_vectorized = #{isVectorized},</if>
+            <if test="vectorizedTime != null">vectorized_time = #{vectorizedTime},</if>
+            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+            <if test="updatedAt != null">updated_at = #{updatedAt},</if>
+            <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteKnowledgeFileById" parameterType="Long">
+        delete from knowledge_file where id = #{id}
+    </delete>
+
+    <delete id="deleteKnowledgeFileByIds" parameterType="String">
+        delete from knowledge_file where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml
new file mode 100644
index 0000000..16d85c4
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/api/MoveMsgMapper.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.api.moveMsg.mapper.MoveMsgMapper">
+    
+    <resultMap type="MoveMsg" id="MoveMsgResult">
+        <result property="id"    column="id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="oldSpace"    column="old_space"    />
+        <result property="newSpace"    column="new_space"    />
+        <result property="status"    column="status"    />
+        <result property="sendTime"    column="send_time"    />
+        <result property="msg"    column="msg"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+    </resultMap>
+
+    <sql id="selectMoveMsgVo">
+        select id, tray_code, old_space, new_space, status, send_time, msg, spare1, spare2, spare3, spare4, spare5 from move_msg
+    </sql>
+
+    <select id="selectMoveMsgList" parameterType="MoveMsg" resultMap="MoveMsgResult">
+        <include refid="selectMoveMsgVo"/>
+        <where>  
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="oldSpace != null  and oldSpace != ''"> and old_space like concat("%", #{oldSpace}, "%")</if>
+            <if test="newSpace != null  and newSpace != ''"> and new_space like concat("%", #{newSpace}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
+            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectMoveMsgById" parameterType="String" resultMap="MoveMsgResult">
+        <include refid="selectMoveMsgVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertMoveMsg" parameterType="MoveMsg">
+        insert into move_msg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="oldSpace != null">old_space,</if>
+            <if test="newSpace != null">new_space,</if>
+            <if test="status != null">status,</if>
+            <if test="sendTime != null">send_time,</if>
+            <if test="msg != null">msg,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="oldSpace != null">#{oldSpace},</if>
+            <if test="newSpace != null">#{newSpace},</if>
+            <if test="status != null">#{status},</if>
+            <if test="sendTime != null">#{sendTime},</if>
+            <if test="msg != null">#{msg},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMoveMsg" parameterType="MoveMsg">
+        update move_msg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="oldSpace != null">old_space = #{oldSpace},</if>
+            <if test="newSpace != null">new_space = #{newSpace},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
+            <if test="msg != null">msg = #{msg},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteMoveMsgById" parameterType="String">
+        delete from move_msg where id = #{id}
+    </delete>
+
+    <delete id="deleteMoveMsgByIds" parameterType="String">
+        delete from move_msg where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml
new file mode 100644
index 0000000..14345c0
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerDetailsMapper.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.containerDetails.mapper.BasContainerDetailsMapper">
+    
+    <resultMap type="BasContainerDetails" id="BasContainerDetailsResult">
+        <result property="id"    column="id"    />
+        <result property="containerId"    column="container_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="unit"    column="unit"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectBasContainerDetailsVo">
+        select id, container_id, product_id, product_name, quantity, unit, spare1, spare2, spare3 from bas_container_details
+    </sql>
+
+    <select id="selectBasContainerDetailsList" parameterType="BasContainerDetails" resultMap="BasContainerDetailsResult">
+        <include refid="selectBasContainerDetailsVo"/>
+        <where>  
+            <if test="containerId != null  and containerId != ''"> and container_id like concat("%", #{containerId}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectBasContainerDetailsById" parameterType="Long" resultMap="BasContainerDetailsResult">
+        <include refid="selectBasContainerDetailsVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasContainerDetails" parameterType="BasContainerDetails">
+        insert into bas_container_details
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="containerId != null">container_id,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="containerId != null">#{containerId},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasContainerDetails" parameterType="BasContainerDetails">
+        update bas_container_details
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="containerId != null">container_id = #{containerId},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasContainerDetailsById" parameterType="Long">
+        delete from bas_container_details where id = #{id}
+    </delete>
+
+    <delete id="deleteBasContainerDetailsByIds" parameterType="String">
+        delete from bas_container_details where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml
new file mode 100644
index 0000000..5eb173b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasContainerMapper.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.container.mapper.BasContainerMapper">
+    
+    <resultMap type="BasContainer" id="BasContainerResult">
+        <result property="containerId"    column="container_id"    />
+        <result property="portName"    column="port_name"    />
+        <result property="status"    column="status"    />
+        <result property="productTypeQuantity"    column="product_type_quantity"    />
+        <result property="capacity"    column="capacity"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="operationMan"    column="operation_man"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectBasContainerVo">
+        select container_id, port_name, status, product_type_quantity, capacity, create_time, update_time, operation_man, spare1, spare2, spare3 from bas_container
+    </sql>
+
+    <select id="selectBasContainerList" parameterType="BasContainer" resultMap="BasContainerResult">
+        <include refid="selectBasContainerVo"/>
+        <where>  
+            <if test="containerId != null  and containerId != ''"> and container_id like concat('%', #{containerId}, '%')</if>
+            <if test="portName != null  and portName != ''"> and port_name like concat("%", #{portName}, "%")</if>
+            <if test="status != null "> and status like concat("%", #{status}, "%")</if>
+            <if test="productTypeQuantity != null "> and product_type_quantity like concat("%", #{productTypeQuantity}, "%")</if>
+            <if test="updateTime != null  and updateTime != ''"> and update_time like concat("%", #{updateTime}, "%")</if>
+            <if test="operationMan != null  and operationMan != ''"> and operation_man like concat("%", #{operationMan}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectBasContainerByContainerId" parameterType="String" resultMap="BasContainerResult">
+        <include refid="selectBasContainerVo"/>
+        where container_id = #{containerId}
+    </select>
+
+    <insert id="insertBasContainer" parameterType="BasContainer">
+        insert into bas_container
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="containerId != null">container_id,</if>
+            <if test="portName != null">port_name,</if>
+            <if test="status != null">status,</if>
+            <if test="productTypeQuantity != null">product_type_quantity,</if>
+            <if test="capacity != null">capacity,</if>
+            <if test="createTime != null">create_time,</if>
+<!--            <if test="updateTime != null">update_time,</if>-->
+            update_time,
+            <if test="operationMan != null">operation_man,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="containerId != null">#{containerId},</if>
+            <if test="portName != null">#{portName},</if>
+            <if test="status != null">#{status},</if>
+            <if test="productTypeQuantity != null">#{productTypeQuantity},</if>
+            <if test="capacity != null">#{capacity},</if>
+            <if test="createTime != null">#{createTime},</if>
+<!--            <if test="updateTime != null">#{updateTime},</if>-->
+            GETDATE(),
+            <if test="operationMan != null">#{operationMan},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasContainer" parameterType="BasContainer">
+        update bas_container
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="portName != null">port_name = #{portName},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="productTypeQuantity != null">product_type_quantity = #{productTypeQuantity},</if>
+            <if test="capacity != null">capacity = #{capacity},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = GETDATE(),</if>
+            <if test="operationMan != null">operation_man = #{operationMan},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where container_id = #{containerId}
+    </update>
+
+    <delete id="deleteBasContainerByContainerId" parameterType="String">
+        delete from bas_container where container_id = #{containerId}
+    </delete>
+
+    <delete id="deleteBasContainerByContainerIds" parameterType="String">
+        delete from bas_container where container_id in 
+        <foreach item="containerId" collection="array" open="(" separator="," close=")">
+            #{containerId}
+        </foreach>
+    </delete>
+
+    <select id="selectPortNames" resultType="string">
+        SELECT DISTINCT port_name FROM bas_product_port WHERE port_name != null or port_name != ''
+    </select>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml
new file mode 100644
index 0000000..fb0f468
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasCustomerMapper.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.BasCustomer.mapper.BasCustomerMapper">
+    
+    <resultMap type="BasCustomer" id="BasCustomerResult">
+        <result property="id"    column="id"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="customerGroupNo"    column="customer_group_no"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="simpleName"    column="simple_name"    />
+        <result property="useable"    column="useable"    />
+        <result property="remark"    column="remark"    />
+        <result property="businessDepartment"    column="business_department"    />
+        <result property="salesman"    column="salesman"    />
+        <result property="mnemonicCode"    column="mnemonic_code"    />
+        <result property="type"    column="type"    />
+        <result property="taxpayerRegistrationNumber"    column="taxpayer_registration_number"    />
+        <result property="organization"    column="organization"    />
+        <result property="supCustomer"    column="sup_customer"    />
+        <result property="retailInvestor"    column="retail_investor"    />
+        <result property="country"    column="country"    />
+        <result property="timeZone"    column="time_zone"    />
+        <result property="dataFormat"    column="data_format"    />
+        <result property="contactName"    column="contact_name"    />
+        <result property="shipment"    column="shipment"    />
+        <result property="taxCategory"    column="tax_category"    />
+    </resultMap>
+
+    <sql id="selectBasCustomerVo">
+        select id, customer_no, customer_group_no, customer_name, simple_name, useable, remark, business_department, salesman, mnemonic_code, type, taxpayer_registration_number, organization, sup_customer, retail_investor, country, time_zone, data_format, contact_name, shipment, tax_category from bas_customer
+    </sql>
+
+    <select id="selectBasCustomerList" parameterType="BasCustomer" resultMap="BasCustomerResult">
+        <include refid="selectBasCustomerVo"/>
+        <where>  
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat('%', #{customerNo}, '%')</if>
+            <if test="customerGroupNo != null  and customerGroupNo != ''"> and customer_group_no like concat('%', #{customerGroupNo}, '%')</if>
+            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="simpleName != null  and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
+            <if test="useable != null  and useable != ''"> and useable like concat("%", #{useable}, "%")</if>
+            <if test="businessDepartment != null  and businessDepartment != ''"> and business_department like concat('%', #{businessDepartment}, '%')</if>
+            <if test="salesman != null  and salesman != ''"> and salesman like concat('%', #{salesman}, '%')</if>
+            <if test="mnemonicCode != null  and mnemonicCode != ''"> and mnemonic_code like concat('%', #{mnemonicCode}, '%')</if>
+            <if test="type != null  and type != ''"> and type like concat('%', #{type}, '%')</if>
+            <if test="taxpayerRegistrationNumber != null  and taxpayerRegistrationNumber != ''"> and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%')</if>
+            <if test="organization != null  and organization != ''"> and organization like concat('%', #{organization}, '%')</if>
+            <if test="supCustomer != null  and supCustomer != ''"> and sup_customer like concat('%', #{supCustomer}, '%')</if>
+            <if test="retailInvestor != null  and retailInvestor != ''"> and retail_investor like concat('%', #{retailInvestor}, '%')</if>
+            <if test="country != null  and country != ''"> and country like concat('%', #{country}, '%')</if>
+            <if test="timeZone != null  and timeZone != ''"> and time_zone like concat('%', #{timeZone}, '%')</if>
+            <if test="dataFormat != null  and dataFormat != ''"> and data_format like concat('%', #{dataFormat}, '%')</if>
+            <if test="contactName != null  and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
+            <if test="shipment != null  and shipment != ''"> and shipment like concat('%', #{shipment}, '%')</if>
+            <if test="taxCategory != null  and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectBasCustomerById" parameterType="String" resultMap="BasCustomerResult">
+        <include refid="selectBasCustomerVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasCustomer" parameterType="BasCustomer">
+        insert into bas_customer
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">id,</if>
+            <if test="customerNo != null and customerNo != ''">customer_no,</if>
+            <if test="customerGroupNo != null">customer_group_no,</if>
+            <if test="customerName != null">customer_name,</if>
+            <if test="simpleName != null">simple_name,</if>
+            <if test="useable != null">useable,</if>
+            <if test="remark != null">remark,</if>
+            <if test="businessDepartment != null">business_department,</if>
+            <if test="salesman != null">salesman,</if>
+            <if test="mnemonicCode != null">mnemonic_code,</if>
+            <if test="type != null">type,</if>
+            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number,</if>
+            <if test="organization != null">organization,</if>
+            <if test="supCustomer != null">sup_customer,</if>
+            <if test="retailInvestor != null">retail_investor,</if>
+            <if test="country != null">country,</if>
+            <if test="timeZone != null">time_zone,</if>
+            <if test="dataFormat != null">data_format,</if>
+            <if test="contactName != null">contact_name,</if>
+            <if test="shipment != null">shipment,</if>
+            <if test="taxCategory != null">tax_category,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id},</if>
+            <if test="customerNo != null and customerNo != ''">#{customerNo},</if>
+            <if test="customerGroupNo != null">#{customerGroupNo},</if>
+            <if test="customerName != null">#{customerName},</if>
+            <if test="simpleName != null">#{simpleName},</if>
+            <if test="useable != null">#{useable},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="businessDepartment != null">#{businessDepartment},</if>
+            <if test="salesman != null">#{salesman},</if>
+            <if test="mnemonicCode != null">#{mnemonicCode},</if>
+            <if test="type != null">#{type},</if>
+            <if test="taxpayerRegistrationNumber != null">#{taxpayerRegistrationNumber},</if>
+            <if test="organization != null">#{organization},</if>
+            <if test="supCustomer != null">#{supCustomer},</if>
+            <if test="retailInvestor != null">#{retailInvestor},</if>
+            <if test="country != null">#{country},</if>
+            <if test="timeZone != null">#{timeZone},</if>
+            <if test="dataFormat != null">#{dataFormat},</if>
+            <if test="contactName != null">#{contactName},</if>
+            <if test="shipment != null">#{shipment},</if>
+            <if test="taxCategory != null">#{taxCategory},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasCustomer" parameterType="BasCustomer">
+        update bas_customer
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="customerNo != null and customerNo != ''">customer_no = #{customerNo},</if>
+            <if test="customerGroupNo != null">customer_group_no = #{customerGroupNo},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="simpleName != null">simple_name = #{simpleName},</if>
+            <if test="useable != null">useable = #{useable},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="businessDepartment != null">business_department = #{businessDepartment},</if>
+            <if test="salesman != null">salesman = #{salesman},</if>
+            <if test="mnemonicCode != null">mnemonic_code = #{mnemonicCode},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number = #{taxpayerRegistrationNumber},</if>
+            <if test="organization != null">organization = #{organization},</if>
+            <if test="supCustomer != null">sup_customer = #{supCustomer},</if>
+            <if test="retailInvestor != null">retail_investor = #{retailInvestor},</if>
+            <if test="country != null">country = #{country},</if>
+            <if test="timeZone != null">time_zone = #{timeZone},</if>
+            <if test="dataFormat != null">data_format = #{dataFormat},</if>
+            <if test="contactName != null">contact_name = #{contactName},</if>
+            <if test="shipment != null">shipment = #{shipment},</if>
+            <if test="taxCategory != null">tax_category = #{taxCategory},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasCustomerById" parameterType="String">
+        delete from bas_customer where id = #{id}
+    </delete>
+
+    <delete id="deleteBasCustomerByIds" parameterType="String">
+        delete from bas_customer where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml
new file mode 100644
index 0000000..66c83fd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasJobIdMapper.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.basJobId.mapper.BasJobIdMapper">
+
+    <resultMap type="BasJobId" id="BasJobIdResult">
+        <result property="id"    column="id"    />
+        <result property="type"    column="type"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="jobDetail"    column="job_detail"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="exorderId"    column="Exorder_id"    />
+        <result property="jobIdR"    column="job_id_R"    />
+        <result property="jobDetailR"    column="job_detail_R"    />
+        <result property="jobIdC"    column="job_id_C"    />
+        <result property="jobDetailC"    column="job_detail_C"    />
+        <result property="tempOrderId"    column="temp_order_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="planId"    column="plan_id"    />
+        <result property="jobIdY"    column="job_id_y"    />
+        <result property="jobIdS"    column="job_id_s"    />
+    </resultMap>
+
+    <sql id="selectBasJobIdVo">
+        select id, type, job_id, job_detail, stock_id, order_id, Exorder_id, job_id_R, job_detail_R, job_id_C, job_detail_C, temp_order_id, lot_no, stockin_id, stockin_detail_id, stockout_id, stockout_detail_id, plan_id, job_id_y, job_id_s from bas_job_id
+    </sql>
+
+    <select id="selectBasJobIdList" parameterType="BasJobId" resultMap="BasJobIdResult">
+        <include refid="selectBasJobIdVo"/>
+        <where>
+            <if test="type != null  and type != ''"> and type like concat("%", #{type}, "%")</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
+            <if test="jobDetail != null  and jobDetail != ''"> and job_detail like concat("%", #{jobDetail}, "%")</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="orderId != null  and orderId != ''"> and order_id like concat("%", #{orderId}, "%")</if>
+            <if test="exorderId != null  and exorderId != ''"> and Exorder_id like concat("%", #{exorderId}, "%")</if>
+            <if test="jobIdR != null  and jobIdR != ''"> and job_id_R like concat("%", #{jobIdR}, "%")</if>
+            <if test="jobDetailR != null  and jobDetailR != ''"> and job_detail_R like concat("%", #{jobDetailR}, "%")</if>
+            <if test="jobIdC != null  and jobIdC != ''"> and job_id_C like concat("%", #{jobIdC}, "%")</if>
+            <if test="jobDetailC != null  and jobDetailC != ''"> and job_detail_C like concat("%", #{jobDetailC}, "%")</if>
+            <if test="tempOrderId != null  and tempOrderId != ''"> and temp_order_id like concat("%", #{tempOrderId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
+            <if test="planId != null  and planId != ''"> and plan_id like concat("%", #{planId}, "%")</if>
+            <if test="jobIdY != null  and jobIdY != ''"> and job_id_y like concat("%", #{jobIdY}, "%")</if>
+            <if test="jobIdS != null  and jobIdS != ''"> and job_id_s like concat("%", #{jobIdS}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectBasJobIdById" parameterType="String" resultMap="BasJobIdResult">
+        <include refid="selectBasJobIdVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasJobId" parameterType="BasJobId">
+        insert into bas_job_id
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="type != null">type,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="jobDetail != null">job_detail,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="orderId != null">order_id,</if>
+            <if test="exorderId != null">Exorder_id,</if>
+            <if test="jobIdR != null">job_id_R,</if>
+            <if test="jobDetailR != null">job_detail_R,</if>
+            <if test="jobIdC != null">job_id_C,</if>
+            <if test="jobDetailC != null">job_detail_C,</if>
+            <if test="tempOrderId != null">temp_order_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockoutId != null">stockout_id,</if>
+            <if test="stockoutDetailId != null">stockout_detail_id,</if>
+            <if test="planId != null">plan_id,</if>
+            <if test="jobIdY != null">job_id_y,</if>
+            <if test="jobIdS != null">job_id_s,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="type != null">#{type},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="jobDetail != null">#{jobDetail},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="exorderId != null">#{exorderId},</if>
+            <if test="jobIdR != null">#{jobIdR},</if>
+            <if test="jobDetailR != null">#{jobDetailR},</if>
+            <if test="jobIdC != null">#{jobIdC},</if>
+            <if test="jobDetailC != null">#{jobDetailC},</if>
+            <if test="tempOrderId != null">#{tempOrderId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockoutId != null">#{stockoutId},</if>
+            <if test="stockoutDetailId != null">#{stockoutDetailId},</if>
+            <if test="planId != null">#{planId},</if>
+            <if test="jobIdY != null">#{jobIdY},</if>
+            <if test="jobIdS != null">#{jobIdS},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasJobId" parameterType="BasJobId">
+        update bas_job_id
+        <trim prefix="SET" suffixOverrides=",">
+
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="jobDetail != null">job_detail = #{jobDetail},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="exorderId != null">Exorder_id = #{exorderId},</if>
+            <if test="jobIdR != null">job_id_R = #{jobIdR},</if>
+            <if test="jobDetailR != null">job_detail_R = #{jobDetailR},</if>
+            <if test="jobIdC != null">job_id_C = #{jobIdC},</if>
+            <if test="jobDetailC != null">job_detail_C = #{jobDetailC},</if>
+            <if test="tempOrderId != null">temp_order_id = #{tempOrderId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockoutId != null">stockout_id = #{stockoutId},</if>
+            <if test="stockoutDetailId != null">stockout_detail_id = #{stockoutDetailId},</if>
+            <if test="planId != null">plan_id = #{planId},</if>
+            <if test="jobIdY != null">job_id_y = #{jobIdY},</if>
+            <if test="jobIdS != null">job_id_s = #{jobIdS},</if>
+        </trim>
+        where type = #{type}
+    </update>
+
+    <delete id="deleteBasJobIdById" parameterType="String">
+        delete from bas_job_id where id = #{id}
+    </delete>
+
+    <delete id="deleteBasJobIdByIds" parameterType="String">
+        delete from bas_job_id where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="getoutStockIdByDate" parameterType="String" resultType="Integer">
+        select count(*) from bas_job_id where type='CK' and job_id like CONCAT('%', #{date}, '%')
+    </select>
+
+
+
+
+    <select id="getIdByDate" parameterType="BasJobId" resultType="Integer">
+        select count(*) from bas_job_id where type = #{type} and stock_id like CONCAT('%', #{stockId}, '%')
+    </select>
+
+    <select id="getIdByType" resultType="String" parameterType="String">
+        select job_id from bas_job_id where type=#{type}
+    </select>
+
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml
new file mode 100644
index 0000000..8ca0ed2
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductCodeMapper.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.BasProductCode.mapper.BasProductCodeMapper">
+    
+    <resultMap type="BasProductCode" id="BasProductCodeResult">
+        <result property="id"    column="id"    />
+        <result property="model"    column="model"    />
+        <result property="color"    column="color"    />
+        <result property="serial"    column="serial"    />
+        <result property="v"    column="v"    />
+        <result property="hz"    column="hz"    />
+        <result property="ph"    column="ph"    />
+        <result property="nW"    column="n_w"    />
+        <result property="gW"    column="g_w"    />
+        <result property="type"    column="type"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+    </resultMap>
+
+    <sql id="selectBasProductCodeVo">
+        select id, model, color, serial, v, hz, ph, n_w, g_w, type, spare1, spare2, spare3, create_time, spare4, spare5, spare6 from bas_product_code
+    </sql>
+
+    <select id="selectBasProductCodeList" parameterType="BasProductCode" resultMap="BasProductCodeResult">
+        <include refid="selectBasProductCodeVo"/>
+        <where>  
+            <if test="model != null  and model != ''"> and model like concat("%", #{model}, "%")</if>
+            <if test="color != null  and color != ''"> and color like concat('%', #{color}, '%')</if>
+            <if test="serial != null  and serial != ''"> and serial like concat('%', #{serial}, '%')</if>
+            <if test="v != null  and v != ''"> and v like concat('%', #{v}, '%')</if>
+            <if test="hz != null  and hz != ''"> and hz like concat('%', #{hz}, '%')</if>
+            <if test="ph != null  and ph != ''"> and ph like concat('%', #{ph}, '%')</if>
+            <if test="nW != null  and nW != ''"> and n_w like concat('%', #{nW}, '%')</if>
+            <if test="gW != null  and gW != ''"> and g_w like concat('%', #{gW}, '%')</if>
+            <if test="type != null  and type != ''"> and type like concat("%", #{type}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectBasProductCodeById" parameterType="Long" resultMap="BasProductCodeResult">
+        <include refid="selectBasProductCodeVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasProductCode" parameterType="BasProductCode">
+        insert into bas_product_code
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="model != null and model != ''">model,</if>
+            <if test="color != null and color != ''">color,</if>
+            <if test="serial != null and serial != ''">serial,</if>
+            <if test="v != null and v != ''">v,</if>
+            <if test="hz != null and hz != ''">hz,</if>
+            <if test="ph != null and ph != ''">ph,</if>
+            <if test="nW != null and nW != ''">n_w,</if>
+            <if test="gW != null and gW != ''">g_w,</if>
+            <if test="type != null">type,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="model != null and model != ''">#{model},</if>
+            <if test="color != null and color != ''">#{color},</if>
+            <if test="serial != null and serial != ''">#{serial},</if>
+            <if test="v != null and v != ''">#{v},</if>
+            <if test="hz != null and hz != ''">#{hz},</if>
+            <if test="ph != null and ph != ''">#{ph},</if>
+            <if test="nW != null and nW != ''">#{nW},</if>
+            <if test="gW != null and gW != ''">#{gW},</if>
+            <if test="type != null">#{type},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasProductCode" parameterType="BasProductCode">
+        update bas_product_code
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="model != null and model != ''">model = #{model},</if>
+            <if test="color != null and color != ''">color = #{color},</if>
+            <if test="serial != null and serial != ''">serial = #{serial},</if>
+            <if test="v != null and v != ''">v = #{v},</if>
+            <if test="hz != null and hz != ''">hz = #{hz},</if>
+            <if test="ph != null and ph != ''">ph = #{ph},</if>
+            <if test="nW != null and nW != ''">n_w = #{nW},</if>
+            <if test="gW != null and gW != ''">g_w = #{gW},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasProductCodeById" parameterType="Long">
+        delete from bas_product_code where id = #{id}
+    </delete>
+
+    <delete id="deleteBasProductCodeByIds" parameterType="String">
+        delete from bas_product_code where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml
new file mode 100644
index 0000000..8c572db
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductMapper.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.BasProduct.mapper.BasProductMapper">
+    
+    <resultMap type="BasProduct" id="BasProductResult">
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
+    </resultMap>
+
+    <sql id="selectBasProductVo">
+        select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39 from bas_product
+    </sql>
+
+    <select id="selectBasProductList" parameterType="BasProduct" resultMap="BasProductResult">
+        <include refid="selectBasProductVo"/>
+        <where>  
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectBasProductByProductGuid" parameterType="String" resultMap="BasProductResult">
+        <include refid="selectBasProductVo"/>
+        where product_guid = #{productGuid}
+    </select>
+    <select id="selectBasProductByProductId" parameterType="String" resultMap="BasProductResult">
+        <include refid="selectBasProductVo"/>
+        where product_id = #{productId}
+    </select>
+    <insert id="insertBasProduct" parameterType="BasProduct">
+        insert into bas_product
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="remark != null">remark,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="productName != null and productName != ''">product_name,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="productName != null and productName != ''">#{productName},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasProduct" parameterType="BasProduct">
+        update bas_product
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productName != null and productName != ''">product_name = #{productName},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
+        </trim>
+        where product_guid = #{productGuid}
+    </update>
+
+    <delete id="deleteBasProductByProductGuid" parameterType="String">
+        delete from bas_product where product_guid = #{productGuid}
+    </delete>
+
+    <delete id="deleteBasProductByProductGuids" parameterType="String">
+        delete from bas_product where product_guid in 
+        <foreach item="productGuid" collection="array" open="(" separator="," close=")">
+            #{productGuid}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml
new file mode 100644
index 0000000..62ff058
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortMapper.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.port.mapper.BasProductPortMapper">
+    
+    <resultMap type="BasProductPort" id="BasProductPortResult">
+        <result property="id"    column="id"    />
+        <result property="portName"    column="port_name"    />
+        <result property="portType"    column="port_type"    />
+        <result property="portDesc"    column="port_desc"    />
+        <result property="createMan"    column="create_man"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectBasProductPortVo">
+        select id, port_name, port_type, port_desc, create_man, create_time from bas_product_port
+    </sql>
+
+    <select id="selectBasProductPortList" parameterType="BasProductPort" resultMap="BasProductPortResult">
+        <include refid="selectBasProductPortVo"/>
+        <where>  
+            <if test="portName != null  and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
+            <if test="portType != null  and portType != ''"> and port_type like concat("%", #{portType}, "%")</if>
+            <if test="portDesc != null  and portDesc != ''"> and port_desc like concat("%", #{portDesc}, "%")</if>
+            <if test="createMan != null  and createMan != ''"> and create_man like concat("%", #{createMan}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectBasProductPortById" parameterType="String" resultMap="BasProductPortResult">
+        <include refid="selectBasProductPortVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasProductPort" parameterType="BasProductPort">
+        insert into bas_product_port
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="portName != null">port_name,</if>
+            <if test="portType != null">port_type,</if>
+            <if test="portDesc != null">port_desc,</if>
+            <if test="createMan != null">create_man,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="portName != null">#{portName},</if>
+            <if test="portType != null">#{portType},</if>
+            <if test="portDesc != null">#{portDesc},</if>
+            <if test="createMan != null">#{createMan},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasProductPort" parameterType="BasProductPort">
+        update bas_product_port
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="portName != null">port_name = #{portName},</if>
+            <if test="portType != null">port_type = #{portType},</if>
+            <if test="portDesc != null">port_desc = #{portDesc},</if>
+            <if test="createMan != null">create_man = #{createMan},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasProductPortById" parameterType="String">
+        delete from bas_product_port where id = #{id}
+    </delete>
+
+    <delete id="deleteBasProductPortByIds" parameterType="String">
+        delete from bas_product_port where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml
new file mode 100644
index 0000000..7ee65be
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasProductPortRelMapper.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.portrel.mapper.BasProductPortRelMapper">
+
+    <resultMap type="BasProductPortRel" id="BasProductPortRelResult">
+        <result property="id"    column="id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="portId"    column="port_id"    />
+    </resultMap>
+
+    <sql id="selectBasProductPortRelVo">
+        select id, product_guid, product_id, port_id from bas_product_port_rel
+    </sql>
+
+    <resultMap type="BasProduct" id="BasProductResult">
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="productName"    column="product_name"    />
+    </resultMap>
+
+    <sql id="selectBasProductVo">
+        select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name from bas_product
+    </sql>
+
+    <select id="selectBasProductPortRelList" parameterType="BasProductPortRel" resultMap="BasProductPortRelResult">
+        <include refid="selectBasProductPortRelVo"/>
+        <where>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="portId != null  and portId != ''"> and port_id like concat("%", #{portId}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectBasProductPortRelById" parameterType="Long" resultMap="BasProductPortRelResult">
+        <include refid="selectBasProductPortRelVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectNotBindProduct" resultMap="BasProductResult">
+        select product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9
+        from bas_product bp
+        <where>
+            <if test="bindStatus =='1'.toString()">
+                and product_id in (select product_id from bas_product_port_rel where port_id=#{portId})
+            </if>
+            <if test="bindStatus =='0'.toString()">
+                and product_id not in (select product_id from bas_product_port_rel where port_id=#{portId})
+            </if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+        </where>
+
+    </select>
+
+    <insert id="insertBasProductPortRel" parameterType="BasProductPortRel">
+        insert into bas_product_port_rel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="portId != null">port_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="portId != null">#{portId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasProductPortRel" parameterType="BasProductPortRel">
+        update bas_product_port_rel
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="portId != null">port_id = #{portId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasProductPortRelById" parameterType="Long">
+        delete from bas_product_port_rel where id = #{id}
+    </delete>
+
+    <delete id="deleteBasProductPortRelByIds" parameterType="String">
+        delete from bas_product_port_rel where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="deleteBasProductPortRel">
+        delete from bas_product_port_rel where port_id=#{portId} and product_id in
+        <foreach item="productId" collection="productIds" open="(" separator="," close=")">
+            #{productId}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml
new file mode 100644
index 0000000..875bfaf
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasRoadwayMapper.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.roadway.mapper.BasRoadwayMapper">
+    
+    <resultMap type="BasRoadway" id="BasRoadwayResult">
+        <result property="id"    column="id"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="roadwayName"    column="roadway_name"    />
+        <result property="deviceId"    column="device_id"    />
+        <result property="inLocked"    column="in_locked"    />
+        <result property="outLocked"    column="out_locked"    />
+        <result property="inLocked2"    column="in_locked2"    />
+        <result property="outLocked2"    column="out_locked2"    />
+    </resultMap>
+
+    <sql id="selectBasRoadwayVo">
+        select id, roadway_id, warehouse_id, roadway_name, device_id, in_locked, out_locked, in_locked2, out_locked2 from bas_roadway
+    </sql>
+
+    <select id="selectBasRoadwayList" parameterType="BasRoadway" resultMap="BasRoadwayResult">
+        <include refid="selectBasRoadwayVo"/>
+        <where>  
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="roadwayName != null  and roadwayName != ''"> and roadway_name like concat('%', #{roadwayName}, '%')</if>
+            <if test="deviceId != null  and deviceId != ''"> and device_id like concat("%", #{deviceId}, "%")</if>
+            <if test="inLocked != null  and inLocked != ''"> and in_locked like concat("%", #{inLocked}, "%")</if>
+            <if test="outLocked != null  and outLocked != ''"> and out_locked like concat("%", #{outLocked}, "%")</if>
+            <if test="inLocked2 != null  and inLocked2 != ''"> and in_locked2 like concat("%", #{inLocked2}, "%")</if>
+            <if test="outLocked2 != null  and outLocked2 != ''"> and out_locked2 like concat("%", #{outLocked2}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectBasRoadwayById" parameterType="String" resultMap="BasRoadwayResult">
+        <include refid="selectBasRoadwayVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasRoadway" parameterType="BasRoadway">
+        insert into bas_roadway
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">id,</if>
+            <if test="roadwayId != null and roadwayId != ''">roadway_id,</if>
+            <if test="warehouseId != null and warehouseId != ''">warehouse_id,</if>
+            <if test="roadwayName != null">roadway_name,</if>
+            <if test="deviceId != null">device_id,</if>
+            <if test="inLocked != null and inLocked != ''">in_locked,</if>
+            <if test="outLocked != null and outLocked != ''">out_locked,</if>
+            <if test="inLocked2 != null and inLocked2 != ''">in_locked2,</if>
+            <if test="outLocked2 != null and outLocked2 != ''">out_locked2,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id},</if>
+            <if test="roadwayId != null and roadwayId != ''">#{roadwayId},</if>
+            <if test="warehouseId != null and warehouseId != ''">#{warehouseId},</if>
+            <if test="roadwayName != null">#{roadwayName},</if>
+            <if test="deviceId != null">#{deviceId},</if>
+            <if test="inLocked != null and inLocked != ''">#{inLocked},</if>
+            <if test="outLocked != null and outLocked != ''">#{outLocked},</if>
+            <if test="inLocked2 != null and inLocked2 != ''">#{inLocked2},</if>
+            <if test="outLocked2 != null and outLocked2 != ''">#{outLocked2},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasRoadway" parameterType="BasRoadway">
+        update bas_roadway
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="roadwayId != null and roadwayId != ''">roadway_id = #{roadwayId},</if>
+            <if test="warehouseId != null and warehouseId != ''">warehouse_id = #{warehouseId},</if>
+            <if test="roadwayName != null">roadway_name = #{roadwayName},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
+            <if test="inLocked != null and inLocked != ''">in_locked = #{inLocked},</if>
+            <if test="outLocked != null and outLocked != ''">out_locked = #{outLocked},</if>
+            <if test="inLocked2 != null and inLocked2 != ''">in_locked2 = #{inLocked2},</if>
+            <if test="outLocked2 != null and outLocked2 != ''">out_locked2 = #{outLocked2},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasRoadwayById" parameterType="String">
+        delete from bas_roadway where id = #{id}
+    </delete>
+
+    <delete id="deleteBasRoadwayByIds" parameterType="String">
+        delete from bas_roadway where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml
new file mode 100644
index 0000000..750d04c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasSupplierMapper.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.BasSupplier.mapper.BasSupplierMapper">
+    
+    <resultMap type="BasSupplier" id="BasSupplierResult">
+        <result property="id"    column="id"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierGroupNo"    column="supplier_group_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="simpleName"    column="simple_name"    />
+        <result property="useable"    column="useable"    />
+        <result property="remark"    column="remark"    />
+        <result property="supplierArae"    column="supplier_arae"    />
+        <result property="taxpayerRegistrationNumber"    column="taxpayer_registration_number"    />
+        <result property="country"    column="country"    />
+        <result property="timeZone"    column="time_zone"    />
+        <result property="dataFormat"    column="data_format"    />
+        <result property="receivingCountry"    column="receiving_country"    />
+        <result property="taxCategory"    column="tax_category"    />
+        <result property="legalPerson"    column="legal_person"    />
+        <result property="registeredCapital"    column="registered_capital"    />
+        <result property="address"    column="address"    />
+        <result property="contactName"    column="contact_name"    />
+        <result property="contactNumber"    column="contact_number"    />
+    </resultMap>
+
+    <sql id="selectBasSupplierVo">
+        select id, supplier_no, supplier_group_no, supplier_name, simple_name, useable, remark, supplier_arae, taxpayer_registration_number, country, time_zone, data_format, receiving_country, tax_category, legal_person, registered_capital, address, contact_name, contact_number from bas_supplier
+    </sql>
+
+    <select id="selectBasSupplierList" parameterType="BasSupplier" resultMap="BasSupplierResult">
+        <include refid="selectBasSupplierVo"/>
+        <where>  
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat('%', #{supplierNo}, '%')</if>
+            <if test="supplierGroupNo != null  and supplierGroupNo != ''"> and supplier_group_no like concat('%', #{supplierGroupNo}, '%')</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="simpleName != null  and simpleName != ''"> and simple_name like concat('%', #{simpleName}, '%')</if>
+            <if test="useable != null  and useable != ''"> and useable like concat("%", #{useable}, "%")</if>
+            <if test="supplierArae != null  and supplierArae != ''"> and supplier_arae like concat('%', #{supplierArae}, '%')</if>
+            <if test="taxpayerRegistrationNumber != null  and taxpayerRegistrationNumber != ''"> and taxpayer_registration_number like concat('%', #{taxpayerRegistrationNumber}, '%')</if>
+            <if test="country != null  and country != ''"> and country like concat('%', #{country}, '%')</if>
+            <if test="timeZone != null  and timeZone != ''"> and time_zone like concat('%', #{timeZone}, '%')</if>
+            <if test="dataFormat != null  and dataFormat != ''"> and data_format like concat('%', #{dataFormat}, '%')</if>
+            <if test="receivingCountry != null  and receivingCountry != ''"> and receiving_country like concat('%', #{receivingCountry}, '%')</if>
+            <if test="taxCategory != null  and taxCategory != ''"> and tax_category like concat('%', #{taxCategory}, '%')</if>
+            <if test="legalPerson != null  and legalPerson != ''"> and legal_person like concat('%', #{legalPerson}, '%')</if>
+            <if test="registeredCapital != null  and registeredCapital != ''"> and registered_capital like concat('%', #{registeredCapital}, '%')</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="contactName != null  and contactName != ''"> and contact_name like concat('%', #{contactName}, '%')</if>
+            <if test="contactNumber != null  and contactNumber != ''"> and contact_number = like concat('%',#{contactNumber}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectBasSupplierById" parameterType="String" resultMap="BasSupplierResult">
+        <include refid="selectBasSupplierVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasSupplier" parameterType="BasSupplier">
+        insert into bas_supplier
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">id,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="supplierGroupNo != null">supplier_group_no,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="simpleName != null">simple_name,</if>
+            <if test="useable != null and useable != ''">useable,</if>
+            <if test="remark != null">remark,</if>
+            <if test="supplierArae != null">supplier_arae,</if>
+            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number,</if>
+            <if test="country != null">country,</if>
+            <if test="timeZone != null">time_zone,</if>
+            <if test="dataFormat != null">data_format,</if>
+            <if test="receivingCountry != null">receiving_country,</if>
+            <if test="taxCategory != null">tax_category,</if>
+            <if test="legalPerson != null">legal_person,</if>
+            <if test="registeredCapital != null">registered_capital,</if>
+            <if test="address != null">address,</if>
+            <if test="contactName != null">contact_name,</if>
+            <if test="contactNumber != null">contact_number,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="supplierGroupNo != null">#{supplierGroupNo},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="simpleName != null">#{simpleName},</if>
+            <if test="useable != null and useable != ''">#{useable},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="supplierArae != null">#{supplierArae},</if>
+            <if test="taxpayerRegistrationNumber != null">#{taxpayerRegistrationNumber},</if>
+            <if test="country != null">#{country},</if>
+            <if test="timeZone != null">#{timeZone},</if>
+            <if test="dataFormat != null">#{dataFormat},</if>
+            <if test="receivingCountry != null">#{receivingCountry},</if>
+            <if test="taxCategory != null">#{taxCategory},</if>
+            <if test="legalPerson != null">#{legalPerson},</if>
+            <if test="registeredCapital != null">#{registeredCapital},</if>
+            <if test="address != null">#{address},</if>
+            <if test="contactName != null">#{contactName},</if>
+            <if test="contactNumber != null">#{contactNumber},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasSupplier" parameterType="BasSupplier">
+        update bas_supplier
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="supplierGroupNo != null">supplier_group_no = #{supplierGroupNo},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="simpleName != null">simple_name = #{simpleName},</if>
+            <if test="useable != null and useable != ''">useable = #{useable},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="supplierArae != null">supplier_arae = #{supplierArae},</if>
+            <if test="taxpayerRegistrationNumber != null">taxpayer_registration_number = #{taxpayerRegistrationNumber},</if>
+            <if test="country != null">country = #{country},</if>
+            <if test="timeZone != null">time_zone = #{timeZone},</if>
+            <if test="dataFormat != null">data_format = #{dataFormat},</if>
+            <if test="receivingCountry != null">receiving_country = #{receivingCountry},</if>
+            <if test="taxCategory != null">tax_category = #{taxCategory},</if>
+            <if test="legalPerson != null">legal_person = #{legalPerson},</if>
+            <if test="registeredCapital != null">registered_capital = #{registeredCapital},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="contactName != null">contact_name = #{contactName},</if>
+            <if test="contactNumber != null">contact_number = #{contactNumber},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasSupplierById" parameterType="String">
+        delete from bas_supplier where id = #{id}
+    </delete>
+
+    <delete id="deleteBasSupplierByIds" parameterType="String">
+        delete from bas_supplier where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml
new file mode 100644
index 0000000..9aa802b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTagMapper.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.tag.mapper.BasTagMapper">
+
+    <resultMap type="BasTag" id="BasTagResult">
+        <result property="id"    column="id"    />
+        <result property="ip"    column="ip"    />
+        <result property="pickAdd"    column="pick_add"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="curNum"    column="cur_num"    />
+        <result property="sendCompleted"    column="send_completed"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectBasTagVo">
+        select id, ip, pick_add, tray_code, cur_num, send_completed, spare1, spare2, spare3 from bas_tag
+    </sql>
+
+    <select id="selectBasTagList" parameterType="BasTag" resultMap="BasTagResult">
+        <include refid="selectBasTagVo"/>
+        <where>
+            <if test="ip != null  and ip != ''"> and ip like concat("%", #{ip}, "%")</if>
+            <if test="pickAdd != null  and pickAdd != ''"> and pick_add like concat("%", #{pickAdd}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="curNum != null  and curNum != ''"> and cur_num like concat("%", #{curNum}, "%")</if>
+            <if test="sendCompleted != null  and sendCompleted != ''"> and send_completed like concat("%", #{sendCompleted}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectBasTagById" parameterType="Long" resultMap="BasTagResult">
+        <include refid="selectBasTagVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectBasTagByTrayCode" resultMap="BasTagResult">
+        <include refid="selectBasTagVo"/>
+        where tray_code = #{trayCode}
+    </select>
+
+    <insert id="insertBasTag" parameterType="BasTag" useGeneratedKeys="true" keyProperty="id">
+        insert into bas_tag
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="ip != null">ip,</if>
+            <if test="pickAdd != null">pick_add,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="curNum != null">cur_num,</if>
+            <if test="sendCompleted != null">send_completed,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="ip != null">#{ip},</if>
+            <if test="pickAdd != null">#{pickAdd},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="curNum != null">#{curNum},</if>
+            <if test="sendCompleted != null">#{sendCompleted},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasTag" parameterType="BasTag">
+        update bas_tag
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="ip != null">ip = #{ip},</if>
+            <if test="pickAdd != null">pick_add = #{pickAdd},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="curNum != null">cur_num = #{curNum},</if>
+            <if test="sendCompleted != null">send_completed = #{sendCompleted},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasTagById" parameterType="Long">
+        delete from bas_tag where id = #{id}
+    </delete>
+
+    <delete id="deleteBasTagByIds" parameterType="String">
+        delete from bas_tag where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml
new file mode 100644
index 0000000..f7cd878
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTaskNoMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.taskNo.mapper.BasTaskNoMapper">
+
+    <resultMap type="com.ruoyi.bas.taskNo.domain.BasTaskNo" id="BasTaskNoResult">
+        <result property="id" column="id"/>
+        <result property="taskType" column="task_type"/>
+        <result property="typeName" column="type_name"/>
+        <result property="taskNo" column="task_no"/>
+        <result property="minNo" column="min_no"/>
+        <result property="maxNo" column="max_no"/>
+    </resultMap>
+    <sql id="selectBasTaskNoVo">
+        select id, task_type, type_name, task_no, min_no, max_no
+        from bas_task_no
+    </sql>
+    <select id="selectBasTaskNoById" parameterType="String" resultMap="BasTaskNoResult">
+        <include refid="selectBasTaskNoVo"/>
+        where id = #{id}
+    </select>
+
+    <update id="updateBasTaskNo" parameterType="com.ruoyi.bas.taskNo.domain.BasTaskNo">
+        update bas_task_no
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="taskType != null">task_type = #{taskType},</if>
+            <if test="typeName != null">type_name = #{typeName},</if>
+            <if test="taskNo != null">task_no = #{taskNo},</if>
+            <if test="minNo != null">min_no = #{minNo},</if>
+            <if test="maxNo != null">max_no = #{maxNo},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <select id="getTaskNo" resultMap="BasTaskNoResult" parameterType="String">
+        select *
+        from bas_task_no
+        where id = #{id}
+    </select>
+
+    <update id="updateTaskNo" parameterType="com.ruoyi.bas.taskNo.domain.BasTaskNo">
+        update bas_task_no
+        set task_no=#{taskNo}
+        where id = #{id}
+    </update>
+
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml
new file mode 100644
index 0000000..dbe6897
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeFormatMapper.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.traycodeformat.mapper.BasTraycodeFormatMapper">
+    
+    <resultMap type="BasTraycodeFormat" id="BasTraycodeFormatResult">
+        <result property="id"    column="id"    />
+        <result property="barcodeFormat"    column="barcode_format"    />
+        <result property="serialRule"    column="serial_rule"    />
+        <result property="serialExample"    column="serial_example"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="minNum"    column="min_num"    />
+        <result property="maxNum"    column="max_num"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectBasTraycodeFormatVo">
+        select id, barcode_format, serial_rule, serial_example, remarks, min_num, max_num, create_time, update_time, spare1, spare2, spare3 from bas_traycode_format
+    </sql>
+
+    <select id="selectBasTraycodeFormatList" parameterType="BasTraycodeFormat" resultMap="BasTraycodeFormatResult">
+        <include refid="selectBasTraycodeFormatVo"/>
+        <where>  
+            <if test="barcodeFormat != null  and barcodeFormat != ''"> and barcode_format like concat('%', #{barcodeFormat}, '%')</if>
+            <if test="serialRule != null  and serialRule != ''"> and serial_rule like concat('%',#{serialRule}, '%')</if>
+            <if test="serialExample != null  and serialExample != ''"> and serial_example like concat('%',#{serialExample}, '%')</if>
+            <if test="remarks != null  and remarks != ''"> and remarks like concat('%',#{remarks}, '%')</if>
+            <if test="minNum != null "> and min_num like concat('%',#{minNum}, '%')</if>
+            <if test="maxNum != null "> and max_num like concat('%',#{maxNum}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectBasTraycodeFormatById" parameterType="Long" resultMap="BasTraycodeFormatResult">
+        <include refid="selectBasTraycodeFormatVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasTraycodeFormat" parameterType="BasTraycodeFormat">
+        insert into bas_traycode_format
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="barcodeFormat != null">barcode_format,</if>
+            <if test="serialRule != null">serial_rule,</if>
+            <if test="serialExample != null">serial_example,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="minNum != null">min_num,</if>
+            <if test="maxNum != null">max_num,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="barcodeFormat != null">#{barcodeFormat},</if>
+            <if test="serialRule != null">#{serialRule},</if>
+            <if test="serialExample != null">#{serialExample},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="minNum != null">#{minNum},</if>
+            <if test="maxNum != null">#{maxNum},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasTraycodeFormat" parameterType="BasTraycodeFormat">
+        update bas_traycode_format
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="barcodeFormat != null">barcode_format = #{barcodeFormat},</if>
+            <if test="serialRule != null">serial_rule = #{serialRule},</if>
+            <if test="serialExample != null">serial_example = #{serialExample},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="minNum != null">min_num = #{minNum},</if>
+            <if test="maxNum != null">max_num = #{maxNum},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasTraycodeFormatById" parameterType="Long">
+        delete from bas_traycode_format where id = #{id}
+    </delete>
+
+    <delete id="deleteBasTraycodeFormatByIds" parameterType="String">
+        delete from bas_traycode_format where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml
new file mode 100644
index 0000000..6a24c34
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasTraycodeMapper.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.traycode.mapper.BasTraycodeMapper">
+
+    <resultMap type="BasTraycode" id="BasTraycodeResult">
+        <result property="id"    column="id"    />
+        <result property="formatId"    column="format_id"    />
+        <result property="formatName"    column="format_name"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectBasTraycodeVo">
+        select bt.id, bt.format_id, bt.tray_code, bt.create_time, bt.update_time, bt.spare1, bt.spare2, bt.spare3,btf.remarks as format_name
+        from bas_traycode bt
+        left join bas_traycode_format btf on btf.id = bt.format_id
+
+    </sql>
+
+    <select id="selectBasTraycodeList" parameterType="BasTraycode" resultMap="BasTraycodeResult">
+        <include refid="selectBasTraycodeVo"/>
+        <where>
+            <if test="formatId != null "> and bt.format_id like concat("%", #{formatId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and bt.tray_code like concat('%',#{trayCode}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and bt.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and bt.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and bt.spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectBasTraycodeById" parameterType="Long" resultMap="BasTraycodeResult">
+        <include refid="selectBasTraycodeVo"/>
+        where bt.id = #{id}
+    </select>
+
+    <insert id="insertBasTraycode" parameterType="BasTraycode">
+        insert into bas_traycode
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="formatId != null">format_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="formatId != null">#{formatId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+    <insert id="insertBasTraycodeList">
+        insert into bas_traycode( format_id, tray_code) values
+        <foreach item="item" collection="list" separator=",">
+            (
+
+            <if test="item.formatId != null">#{item.formatId},</if>
+            <if test="item.trayCode != null">#{item.trayCode}</if>
+            )
+        </foreach>
+    </insert>
+
+    <update id="updateBasTraycode" parameterType="BasTraycode">
+        update bas_traycode
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="formatId != null">format_id = #{formatId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasTraycodeById" parameterType="Long">
+        delete from bas_traycode where id = #{id}
+    </delete>
+
+    <delete id="deleteBasTraycodeByIds" parameterType="String">
+        delete from bas_traycode where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml
new file mode 100644
index 0000000..84f77ad
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/BasWarehousePortMapper.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.warehousePort.mapper.BasWarehousePortMapper">
+    
+    <resultMap type="BasWarehousePort" id="BasWarehousePortResult">
+        <result property="id"    column="id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="portCode"    column="port_code"    />
+        <result property="portName"    column="port_name"    />
+        <result property="portType"    column="port_type"    />
+    </resultMap>
+
+    <sql id="selectBasWarehousePortVo">
+        select id, warehouse_id, port_code, port_name, port_type from bas_warehouse_port
+    </sql>
+
+    <select id="selectBasWarehousePortList" parameterType="BasWarehousePort" resultMap="BasWarehousePortResult">
+        <include refid="selectBasWarehousePortVo"/>
+        <where>  
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="portCode != null  and portCode != ''"> and port_code like concat("%", #{portCode}, "%")</if>
+            <if test="portName != null  and portName != ''"> and port_name like concat('%', #{portName}, '%')</if>
+            <if test="portType != null  and portType != ''"> and port_type like concat("%", #{portType}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectBasWarehousePortById" parameterType="Long" resultMap="BasWarehousePortResult">
+        <include refid="selectBasWarehousePortVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertBasWarehousePort" parameterType="BasWarehousePort">
+        insert into bas_warehouse_port
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="portCode != null">port_code,</if>
+            <if test="portName != null">port_name,</if>
+            <if test="portType != null">port_type,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="portCode != null">#{portCode},</if>
+            <if test="portName != null">#{portName},</if>
+            <if test="portType != null">#{portType},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasWarehousePort" parameterType="BasWarehousePort">
+        update bas_warehouse_port
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="portCode != null">port_code = #{portCode},</if>
+            <if test="portName != null">port_name = #{portName},</if>
+            <if test="portType != null">port_type = #{portType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteBasWarehousePortById" parameterType="Long">
+        delete from bas_warehouse_port where id = #{id}
+    </delete>
+
+    <delete id="deleteBasWarehousePortByIds" parameterType="String">
+        delete from bas_warehouse_port where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
new file mode 100644
index 0000000..bba33c8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.cargoSpace.mapper.BasCargoSpaceMapper">
+
+    <resultMap type="com.ruoyi.bas.cargoSpace.domain.BasCargoSpace" id="BasCargoSpaceResult">
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="cargoAreaId"    column="cargo_area_id"    />
+        <result property="theType"    column="the_type"    />
+        <result property="theTypeName"    column="the_type_name"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="thePlatoon"    column="the_platoon"    />
+        <result property="theColumn"    column="the_column"    />
+        <result property="theFloor"    column="the_floor"    />
+        <result property="status"    column="status"    />
+        <result property="locked"    column="locked"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="cargoHight"    column="cargo_hight"    />
+        <result property="issDouble"    column="iss_double"    />
+        <result property="groupCodingNo"    column="group_coding_no"    />
+        <result property="groupCoding"    column="group_coding"    />
+        <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
+        <result property="thisCargoArea"    column="this_cargo_area"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="quantity"    column="quantity"    />
+    </resultMap>
+
+    <sql id="selectBasCargoSpaceVo">
+        select
+            bcs.cargo_space_id,
+            bcs.warehouse_id,
+            bcs.roadway_id,
+            bcs.cargo_area_id,
+            bcs.the_type,
+            bcs.the_type_name,
+            bcs.cargo_space_name,
+            bcs.the_platoon,
+            bcs.the_column,
+            bcs.the_floor,
+            bcs.status,
+            bcs.locked,
+            bcs.tray_code,
+            bcs.cargo_hight,
+            bcs.iss_double,
+            bcs.group_coding_no,
+            bcs.group_coding,
+            bcs.cargo_space_logo,
+            bcs.this_cargo_area,
+            bw.warehouse_name
+        from bas_cargo_space bcs
+                 left join bas_warehouse bw on bcs.warehouse_id = bw.warehouse_id
+
+    </sql>
+
+    <select id="selectBasCargoSpaceList" resultMap="BasCargoSpaceResult">
+        <include refid="selectBasCargoSpaceVo"/>
+        <where>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bcs.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and bcs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="cargoAreaId != null  and cargoAreaId != ''"> and bcs.cargo_area_id like concat("%", #{cargoAreaId}, "%")</if>
+            <if test="theType != null  and theType != ''"> and bcs.the_type like concat("%", #{theType}, "%")</if>
+            <if test="theTypeName != null  and theTypeName != ''"> and bcs.the_type_name like concat('%', #{theTypeName}, '%')</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="thePlatoon != null "> and bcs.the_platoon like concat("%", #{thePlatoon}, "%")</if>
+            <if test="theColumn != null "> and bcs.the_column like concat("%", #{theColumn}, "%")</if>
+            <if test="theFloor != null "> and bcs.the_floor like concat("%", #{theFloor}, "%")</if>
+            <if test="status != null  and status != ''"> and bcs.status like concat("%", #{status}, "%")</if>
+            <if test="locked != null  and locked != ''"> and bcs.locked like concat("%", #{locked}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and bcs.tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="cargoHight != null  and cargoHight != ''"> and bcs.cargo_hight like concat("%", #{cargoHight}, "%")</if>
+            <if test="issDouble != null  and issDouble != ''"> and bcs.iss_double like concat("%", #{issDouble}, "%")</if>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and bcs.group_coding_no like concat("%", #{groupCodingNo}, "%")</if>
+            <if test="groupCoding != null  and groupCoding != ''"> and bcs.group_coding like concat("%", #{groupCoding}, "%")</if>
+            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and bcs.cargo_space_logo like concat("%", #{cargoSpaceLogo}, "%")</if>
+            <if test="thisCargoArea != null  and thisCargoArea != ''"> and bcs.this_cargo_area like concat("%", #{thisCargoArea}, "%")</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by the_platoon,the_floor,the_column
+    </select>
+
+    <select id="selectBasCargoSpaceByCargoSpaceId" parameterType="String" resultMap="BasCargoSpaceResult">
+        <include refid="selectBasCargoSpaceVo"/>
+        where cargo_space_id = #{cargoSpaceId}
+    </select>
+
+    <insert id="insertBasCargoSpace" parameterType="BasCargoSpace">
+        insert into bas_cargo_space
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="warehouseId != null and warehouseId != ''">warehouse_id,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoAreaId != null">cargo_area_id,</if>
+            <if test="theType != null">the_type,</if>
+            <if test="theTypeName != null">the_type_name,</if>
+            <if test="cargoSpaceName != null and cargoSpaceName != ''">cargo_space_name,</if>
+            <if test="thePlatoon != null">the_platoon,</if>
+            <if test="theColumn != null">the_column,</if>
+            <if test="theFloor != null">the_floor,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="locked != null and locked != ''">locked,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="cargoHight != null">cargo_hight,</if>
+            <if test="issDouble != null">iss_double,</if>
+            <if test="groupCodingNo != null">group_coding_no,</if>
+            <if test="groupCoding != null">group_coding,</if>
+            <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
+            <if test="thisCargoArea != null">this_cargo_area,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="warehouseId != null and warehouseId != ''">#{warehouseId},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoAreaId != null">#{cargoAreaId},</if>
+            <if test="theType != null">#{theType},</if>
+            <if test="theTypeName != null">#{theTypeName},</if>
+            <if test="cargoSpaceName != null and cargoSpaceName != ''">#{cargoSpaceName},</if>
+            <if test="thePlatoon != null">#{thePlatoon},</if>
+            <if test="theColumn != null">#{theColumn},</if>
+            <if test="theFloor != null">#{theFloor},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="locked != null and locked != ''">#{locked},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="cargoHight != null">#{cargoHight},</if>
+            <if test="issDouble != null">#{issDouble},</if>
+            <if test="groupCodingNo != null">#{groupCodingNo},</if>
+            <if test="groupCoding != null">#{groupCoding},</if>
+            <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
+            <if test="thisCargoArea != null">#{thisCargoArea},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasCargoSpace" parameterType="BasCargoSpace">
+        update bas_cargo_space
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="warehouseId != null and warehouseId != ''">warehouse_id = #{warehouseId},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
+            <if test="theType != null">the_type = #{theType},</if>
+            <if test="theTypeName != null">the_type_name = #{theTypeName},</if>
+            <if test="cargoSpaceName != null and cargoSpaceName != ''">cargo_space_name = #{cargoSpaceName},</if>
+            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
+            <if test="theColumn != null">the_column = #{theColumn},</if>
+            <if test="theFloor != null">the_floor = #{theFloor},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="locked != null and locked != ''">locked = #{locked},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="cargoHight != null">cargo_hight = #{cargoHight},</if>
+            <if test="issDouble != null">iss_double = #{issDouble},</if>
+            <if test="groupCodingNo != null">group_coding_no = #{groupCodingNo},</if>
+            <if test="groupCoding != null">group_coding = #{groupCoding},</if>
+            <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
+            <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
+        </trim>
+        where cargo_space_id = #{cargoSpaceId}
+    </update>
+
+    <delete id="deleteBasCargoSpaceByCargoSpaceId" parameterType="String">
+        delete from bas_cargo_space where cargo_space_id = #{cargoSpaceId}
+    </delete>
+
+    <delete id="deleteBasCargoSpaceByCargoSpaceIds" parameterType="String">
+        delete from bas_cargo_space where cargo_space_id in
+        <foreach item="cargoSpaceId" collection="array" open="(" separator="," close=")">
+            #{cargoSpaceId}
+        </foreach>
+    </delete>
+
+    <select id="selectStatusCount" resultType="java.util.Map">
+        SELECT
+            status,
+            COUNT(*) as count
+        FROM bas_cargo_space
+        GROUP BY status
+    </select>
+    <select id="selectEmptyCargoSpaceByWarehouseId" resultType="com.ruoyi.bas.cargoSpace.domain.BasCargoSpace">
+        SELECT TOP 1 cargo_space_id as cargoSpaceId
+        FROM bas_cargo_space
+        WHERE status = '1'
+          and locked = 'N'
+        <if test="warehouseId != null">
+            and warehouse_id like concat("%", #{warehouseId}, "%")
+        </if>
+        <if test="roadwayId != null">
+            and roadway_id like concat("%", #{roadwayId}, "%")
+        </if>
+        ORDER BY the_platoon, the_floor,the_column
+    </select>
+    <select id="selectCargoSpaceWithStock" resultMap="BasCargoSpaceResult">
+        select
+            bcs.cargo_space_id,
+            bcs.cargo_space_name,
+            bcs.the_platoon,
+            bcs.the_column,
+            bcs.the_floor,
+            bcs.status,
+            bs.tray_code,
+            bs.product_id,
+            bs.product_name
+        from bas_cargo_space bcs
+                 left join bas_stock bs on bcs.cargo_space_id = bs.cargo_space_id
+        where bcs.status in ( '2')
+    </select>
+    <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
+        select bcs.cargo_space_id, bcs.warehouse_id, bcs.roadway_id, bcs.cargo_space_name,
+               bcs.the_platoon, bcs.the_column, bcs.the_floor, bcs.status, bcs.locked, bs.tray_code, bs.product_id,
+               bp.product_name,bs.spare6,bs.quantity,bs.spare7
+        from bas_stock bs,bas_cargo_space bcs,bas_roadway br,bas_product bp
+        where bs.cargo_space_id = bcs.cargo_space_id
+          and br.roadway_id = bcs.roadway_id
+          and bp.product_id = bs.product_id
+          and br.out_locked = 'N'
+        <if test="warehouseId != null  and warehouseId != ''"> and bcs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+        <if test="roadwayId != null  and roadwayId != ''"> and bcs.roadway_id like concat("%", #{roadwayId}, "%")</if>
+        <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+        <if test="thePlatoon != null "> and bcs.the_platoon like concat("%", #{thePlatoon}, "%")</if>
+        <if test="theColumn != null "> and bcs.the_column like concat("%", #{theColumn}, "%")</if>
+        <if test="theFloor != null "> and bcs.the_floor like concat("%", #{theFloor}, "%")</if>
+        <if test="status != null  and status != ''"> and bcs.status like concat("%", #{status}, "%")</if>
+        <if test="locked != null  and locked != ''"> and bcs.locked like concat("%", #{locked}, "%")</if>
+        <if test="trayCode != null  and trayCode != ''"> and bs.tray_code like concat('%', #{trayCode}, '%')</if>
+        <if test="spare7 != null  and spare7 != ''"> and bs.spare7 like concat("%", #{spare7}, "%")</if>
+        <if test="spare6 != null  and spare6 != ''"> and bs.spare6 like concat('%', #{spare6}, '%')</if>
+        <if test="productId != null  and productId != ''"> and bs.product_id like concat('%', #{productId}, '%')</if>
+        <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml
new file mode 100644
index 0000000..060f79e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/bas/warehouse/BasWarehouseMapper.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper">
+
+    <resultMap type="BasWarehouse" id="BasWarehouseResult">
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseNo"    column="warehouse_no"    />
+        <result property="projectNo"    column="project_no"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="address"    column="address"    />
+        <result property="cDesc"    column="c_desc"    />
+        <result property="warehouseKind"    column="warehouse_kind"    />
+        <result property="warehouseType"    column="warehouse_type"    />
+        <result property="isCurrent"    column="is_current"    />
+    </resultMap>
+
+    <sql id="selectBasWarehouseVo">
+        select warehouse_id, warehouse_no, project_no, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current from bas_warehouse
+    </sql>
+
+    <select id="selectBasWarehouseList" parameterType="BasWarehouse" resultMap="BasWarehouseResult">
+        <include refid="selectBasWarehouseVo"/>
+        <where>
+            <if test="warehouseId != null  and warehouseId != ''">and warehouse_id like concat('%',#{warehouseId}, '%')</if>
+            <if test="warehouseNo != null  and warehouseNo != ''">and warehouse_no like concat('%',#{warehouseNo}, '%')</if>
+            <if test="projectNo != null  and projectNo != ''">and project_no like concat('%',#{projectNo}, '%')</if>
+            <if test="warehouseName != null  and warehouseName != ''">and warehouse_name like concat('%',
+                #{warehouseName}, '%')
+            </if>
+            <if test="address != null  and address != ''">and address like concat("%", #{address}, "%")</if>
+            <if test="cDesc != null  and cDesc != ''">and c_desc like concat("%", #{cDesc}, "%")</if>
+            <if test="warehouseKind != null  and warehouseKind != ''">and warehouse_kind like concat("%", #{warehouseKind}, "%")</if>
+            <if test="warehouseType != null  and warehouseType != ''">and warehouse_type like concat("%", #{warehouseType}, "%")</if>
+            <if test="isCurrent != null  and isCurrent != ''">and is_current like concat("%", #{isCurrent}, "%")</if>
+            <if test="dataScope !=null and dataScope.size()>0">
+                and warehouse_id in
+                <foreach item="item" index="index" collection="dataScope" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="typeData != null and typeData.size()>0">
+                and warehouse_type in
+                <foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectBasWarehouseByWarehouseId" parameterType="String" resultMap="BasWarehouseResult">
+        <include refid="selectBasWarehouseVo"/>
+        where warehouse_id = #{warehouseId}
+    </select>
+
+    <insert id="insertBasWarehouse" parameterType="BasWarehouse">
+        insert into bas_warehouse
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="warehouseId != null and warehouseId != ''">warehouse_id,</if>
+            <if test="warehouseNo != null and warehouseNo != ''">warehouse_no,</if>
+            <if test="projectNo != null">project_no,</if>
+            <if test="warehouseName != null and warehouseName != ''">warehouse_name,</if>
+            <if test="address != null">address,</if>
+            <if test="cDesc != null">c_desc,</if>
+            <if test="warehouseKind != null">warehouse_kind,</if>
+            <if test="warehouseType != null">warehouse_type,</if>
+            <if test="isCurrent != null and isCurrent != ''">is_current,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="warehouseId != null and warehouseId != ''">#{warehouseId},</if>
+            <if test="warehouseNo != null and warehouseNo != ''">#{warehouseNo},</if>
+            <if test="projectNo != null">#{projectNo},</if>
+            <if test="warehouseName != null and warehouseName != ''">#{warehouseName},</if>
+            <if test="address != null">#{address},</if>
+            <if test="cDesc != null">#{cDesc},</if>
+            <if test="warehouseKind != null">#{warehouseKind},</if>
+            <if test="warehouseType != null">#{warehouseType},</if>
+            <if test="isCurrent != null and isCurrent != ''">#{isCurrent},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasWarehouse" parameterType="BasWarehouse">
+        update bas_warehouse
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="warehouseNo != null and warehouseNo != ''">warehouse_no = #{warehouseNo},</if>
+            <if test="projectNo != null">project_no = #{projectNo},</if>
+            <if test="warehouseName != null and warehouseName != ''">warehouse_name = #{warehouseName},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="cDesc != null">c_desc = #{cDesc},</if>
+            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
+            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
+            <if test="isCurrent != null and isCurrent != ''">is_current = #{isCurrent},</if>
+        </trim>
+        where warehouse_id = #{warehouseId}
+    </update>
+
+    <delete id="deleteBasWarehouseByWarehouseId" parameterType="String">
+        delete from bas_warehouse where warehouse_id = #{warehouseId}
+    </delete>
+
+    <delete id="deleteBasWarehouseByWarehouseIds" parameterType="String">
+        delete from bas_warehouse where warehouse_id in
+        <foreach item="warehouseId" collection="array" open="(" separator="," close=")">
+            #{warehouseId}
+        </foreach>
+    </delete>
+
+
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml
new file mode 100644
index 0000000..85a7fc8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckCommitRecordMapper.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.check.commit.mapper.CheckCommitRecordMapper">
+    
+    <resultMap type="CheckCommitRecord" id="CheckCommitRecordResult">
+        <result property="pdGuid"    column="pd_guid"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectCheckCommitRecordVo">
+        select pd_guid, tray_code, stock_id, quantity, spare1, spare2, spare3 from check_commit_record
+    </sql>
+
+    <select id="selectCheckCommitRecordList" parameterType="CheckCommitRecord" resultMap="CheckCommitRecordResult">
+        <include refid="selectCheckCommitRecordVo"/>
+        <where>  
+            <if test="pdGuid != null "> and pd_guid like concat("%", #{pdGuid}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectCheckCommitRecordByPdGuid" parameterType="Long" resultMap="CheckCommitRecordResult">
+        <include refid="selectCheckCommitRecordVo"/>
+        where pd_guid = #{pdGuid}
+    </select>
+
+    <insert id="insertCheckCommitRecord" parameterType="CheckCommitRecord" useGeneratedKeys="true" keyProperty="pdGuid">
+        insert into check_commit_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="trayCode != null">tray_code,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCheckCommitRecord" parameterType="CheckCommitRecord">
+        update check_commit_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where pd_guid = #{pdGuid}
+    </update>
+
+    <delete id="deleteCheckCommitRecordByPdGuid" parameterType="Long">
+        delete from check_commit_record where pd_guid = #{pdGuid}
+    </delete>
+
+    <delete id="deleteCheckCommitRecordByPdGuids" parameterType="String">
+        delete from check_commit_record where pd_guid in 
+        <foreach item="pdGuid" collection="array" open="(" separator="," close=")">
+            #{pdGuid}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml
new file mode 100644
index 0000000..303fb5a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordFinishMapper.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.check.DifferenceRecordFinish.mapper.CheckDifferenceRecordFinishMapper">
+
+    <resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
+        <result property="checkGuid" column="check_guid"/>
+        <result property="checkStockDetailId" column="check_stock_detail_id"/>
+        <result property="stockId" column="stock_id"/>
+        <result property="trayCode" column="tray_code"/>
+        <result property="cargoSpaceId" column="cargo_space_id"/>
+        <result property="cargoSpaceName" column="cargo_space_name"/>
+        <result property="productId" column="product_id"/>
+        <result property="lotNo" column="lot_no"/>
+        <result property="supplier" column="supplier"/>
+        <result property="customer" column="customer"/>
+        <result property="oldQuantity" column="old_quantity"/>
+        <result property="newQuantity" column="new_quantity"/>
+        <result property="recordType" column="record_type"/>
+        <result property="createTime" column="create_time"/>
+        <result property="productGuid" column="product_guid"/>
+        <result property="status" column="status"/>
+        <result property="warehouseId" column="warehouse_id"/>
+        <result property="warehouseName" column="warehouse_name"/>
+        <association property="extraField" javaType="ExtraField">
+            <result property="productId" column="product_id"/>
+            <result property="materialDesc" column="product_name"/>
+            <result property="englishDesc" column="englishDesc"/>
+            <result property="length" column="length"/>
+            <result property="width" column="width"/>
+            <result property="height" column="height"/>
+            <result property="volume" column="volume"/>
+            <result property="netWeight" column="netWeight"/>
+        </association>
+    </resultMap>
+
+    <sql id="selectCheckDifferenceRecordVo">
+        select r.check_guid,
+               r.check_stock_detail_id,
+               r.stock_id,
+               r.tray_code,
+               r.cargo_space_id,
+               r.product_id,
+               r.lot_no,
+               r.supplier,
+               r.customer,
+               r.old_quantity,
+               r.new_quantity,
+               r.record_type,
+               r.create_time,
+               r.product_guid,
+               r.status,
+               r.warehouse_id,
+               w.warehouse_name,
+               bp.product_name,
+               bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,
+               bp.spare5 as length,
+               bp.spare6 as width,
+               bp.spare7 as height,
+               bp.spare8 as volume,
+               bcs.cargo_space_name
+        from check_difference_record_finish r
+                 left join bas_warehouse w on r.warehouse_id = w.warehouse_id
+                 left join bas_product bp on r.product_id = bp.product_id
+                 left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id
+    </sql>
+
+    <select id="selectCheckDifferenceRecordFinishList" parameterType="CheckDifferenceRecord"
+            resultMap="CheckDifferenceRecordResult">
+        <include refid="selectCheckDifferenceRecordVo"/>
+        <where>
+            <if test="checkStockDetailId != null  and checkStockDetailId != ''">
+                and r.check_stock_detail_id like concat("%", #{checkStockDetailId}, "%")
+            </if>
+            <if test="stockId != null  and stockId != ''">
+                and r.stock_id like concat("%", #{stockId}, "%")
+            </if>
+            <if test="trayCode != null  and trayCode != ''">
+                and r.tray_code like concat("%", #{trayCode}, "%")
+            </if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">
+                and r.cargo_space_id like concat("%", #{cargoSpaceId}, "%")
+            </if>
+            <if test="productId != null  and productId != ''">
+                and r.product_id like concat("%", #{productId}, "%")
+            </if>
+            <if test="lotNo != null  and lotNo != ''">
+                and r.lot_no like concat("%", #{lotNo}, "%")
+            </if>
+            <if test="supplier != null  and supplier != ''">
+                and r.supplier like concat("%", #{supplier}, "%")
+            </if>
+            <if test="customer != null  and customer != ''">
+                and r.customer like concat("%", #{customer}, "%")
+            </if>
+            <if test="oldQuantity != null  and oldQuantity != ''">
+                and r.old_quantity like concat("%", #{oldQuantity}, "%")
+            </if>
+            <if test="newQuantity != null  and newQuantity != ''">
+                and r.new_quantity like concat("%", #{newQuantity}, "%")
+            </if>
+            <if test="recordType != null ">
+                and r.record_type like concat("%", #{recordType}, "%")
+            </if>
+            <if test="productGuid != null  and productGuid != ''">
+                and r.product_guid like concat("%", #{productGuid}, "%")
+            </if>
+            <if test="status != null  and status != ''">
+                and r.status like concat("%", #{status}, "%")
+            </if>
+            <if test="warehouseId != null  and warehouseId != ''">
+                and r.warehouse_id like concat("%", #{warehouseId}, "%")
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by r.create_time desc
+    </select>
+
+    <select id="selectCheckDifferenceRecordFinishByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
+        <include refid="selectCheckDifferenceRecordVo"/>
+        where check_guid = #{checkGuid}
+    </select>
+
+    <insert id="insertCheckDifferenceRecordFinish" parameterType="CheckDifferenceRecord">
+        insert into check_difference_record_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="checkGuid != null">check_guid,</if>
+            <if test="checkStockDetailId != null">check_stock_detail_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="supplier != null">supplier,</if>
+            <if test="customer != null">customer,</if>
+            <if test="oldQuantity != null">old_quantity,</if>
+            <if test="newQuantity != null">new_quantity,</if>
+            <if test="recordType != null">record_type,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="status != null">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="checkGuid != null">#{checkGuid},</if>
+            <if test="checkStockDetailId != null">#{checkStockDetailId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="supplier != null">#{supplier},</if>
+            <if test="customer != null">#{customer},</if>
+            <if test="oldQuantity != null">#{oldQuantity},</if>
+            <if test="newQuantity != null">#{newQuantity},</if>
+            <if test="recordType != null">#{recordType},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="status != null">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCheckDifferenceRecordFinish" parameterType="CheckDifferenceRecord">
+        update check_difference_record_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="checkStockDetailId != null">check_stock_detail_id = #{checkStockDetailId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="supplier != null">supplier = #{supplier},</if>
+            <if test="customer != null">customer = #{customer},</if>
+            <if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
+            <if test="newQuantity != null">new_quantity = #{newQuantity},</if>
+            <if test="recordType != null">record_type = #{recordType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+        </trim>
+        where check_guid = #{checkGuid}
+    </update>
+
+    <delete id="deleteCheckDifferenceRecordFinishByCheckGuid" parameterType="String">
+        delete
+        from check_difference_record_finish
+        where check_guid = #{checkGuid}
+    </delete>
+
+    <delete id="deleteCheckDifferenceRecordFinishByCheckGuids" parameterType="String">
+        delete from check_difference_record_finish where check_guid in
+        <foreach item="checkGuid" collection="array" open="(" separator="," close=")">
+            #{checkGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml
new file mode 100644
index 0000000..d6fc4fc
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckDifferenceRecordMapper.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.check.difference.mapper.CheckDifferenceRecordMapper">
+
+    <resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
+        <result property="checkGuid" column="check_guid"/>
+        <result property="checkStockDetailId" column="check_stock_detail_id"/>
+        <result property="stockId" column="stock_id"/>
+        <result property="trayCode" column="tray_code"/>
+        <result property="cargoSpaceId" column="cargo_space_id"/>
+        <result property="cargoSpaceName" column="cargo_space_name"/>
+        <result property="productId" column="product_id"/>
+        <result property="lotNo" column="lot_no"/>
+        <result property="supplier" column="supplier"/>
+        <result property="customer" column="customer"/>
+        <result property="oldQuantity" column="old_quantity"/>
+        <result property="newQuantity" column="new_quantity"/>
+        <result property="recordType" column="record_type"/>
+        <result property="createTime" column="create_time"/>
+        <result property="productGuid" column="product_guid"/>
+        <result property="status" column="status"/>
+        <result property="warehouseId" column="warehouse_id"/>
+        <result property="warehouseName" column="warehouse_name"/>
+        <association property="extraField" javaType="ExtraField">
+            <result property="productId" column="product_id"/>
+            <result property="materialDesc" column="product_name"/>
+            <result property="englishDesc" column="englishDesc"/>
+            <result property="length" column="length"/>
+            <result property="width" column="width"/>
+            <result property="height" column="height"/>
+            <result property="volume" column="volume"/>
+            <result property="netWeight" column="netWeight"/>
+        </association>
+    </resultMap>
+
+    <sql id="selectCheckDifferenceRecordVo">
+        select r.check_guid,
+               r.check_stock_detail_id,
+               r.stock_id,
+               r.tray_code,
+               r.cargo_space_id,
+               r.product_id,
+               r.lot_no,
+               r.supplier,
+               r.customer,
+               r.old_quantity,
+               r.new_quantity,
+               r.record_type,
+               r.create_time,
+               r.product_guid,
+               r.status,
+               r.warehouse_id,
+               w.warehouse_name,
+               bp.product_name,
+               bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,
+               bp.spare5 as length,
+               bp.spare6 as width,
+               bp.spare7 as height,
+               bp.spare8 as volume,
+               bcs.cargo_space_name
+        from check_difference_record r
+                 left join bas_warehouse w on r.warehouse_id = w.warehouse_id
+                 left join bas_product bp on r.product_id = bp.product_id
+                 left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id
+    </sql>
+
+    <select id="selectCheckDifferenceRecordList" parameterType="CheckDifferenceRecord"
+            resultMap="CheckDifferenceRecordResult">
+        <include refid="selectCheckDifferenceRecordVo"/>
+        <where>
+            <if test="checkStockDetailId != null  and checkStockDetailId != ''">
+                and r.check_stock_detail_id like concat("%", #{checkStockDetailId}, "%")
+            </if>
+            <if test="stockId != null  and stockId != ''">
+                and r.stock_id like concat("%", #{stockId}, "%")
+            </if>
+            <if test="trayCode != null  and trayCode != ''">
+                and r.tray_code like concat("%", #{trayCode}, "%")
+            </if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''">
+                and r.cargo_space_id like concat("%", #{cargoSpaceId}, "%")
+            </if>
+            <if test="productId != null  and productId != ''">
+                and r.product_id like concat("%", #{productId}, "%")
+            </if>
+            <if test="lotNo != null  and lotNo != ''">
+                and r.lot_no like concat("%", #{lotNo}, "%")
+            </if>
+            <if test="supplier != null  and supplier != ''">
+                and r.supplier like concat("%", #{supplier}, "%")
+            </if>
+            <if test="customer != null  and customer != ''">
+                and r.customer like concat("%", #{customer}, "%")
+            </if>
+            <if test="oldQuantity != null  and oldQuantity != ''">
+                and r.old_quantity like concat("%", #{oldQuantity}, "%")
+            </if>
+            <if test="newQuantity != null  and newQuantity != ''">
+                and r.new_quantity like concat("%", #{newQuantity}, "%")
+            </if>
+            <if test="recordType != null ">
+                and r.record_type like concat("%", #{recordType}, "%")
+            </if>
+            <if test="productGuid != null  and productGuid != ''">
+                and r.product_guid like concat("%", #{productGuid}, "%")
+            </if>
+            <if test="status != null  and status != ''">
+                and r.status like concat("%", #{status}, "%")
+            </if>
+            <if test="warehouseId != null  and warehouseId != ''">
+                and r.warehouse_id like concat("%", #{warehouseId}, "%")
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by r.create_time desc
+    </select>
+
+    <select id="selectCheckDifferenceRecordByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
+        <include refid="selectCheckDifferenceRecordVo"/>
+        where check_guid = #{checkGuid}
+    </select>
+
+    <insert id="insertCheckDifferenceRecord" parameterType="CheckDifferenceRecord">
+        insert into check_difference_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="checkGuid != null">check_guid,</if>
+            <if test="checkStockDetailId != null">check_stock_detail_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="supplier != null">supplier,</if>
+            <if test="customer != null">customer,</if>
+            <if test="oldQuantity != null">old_quantity,</if>
+            <if test="newQuantity != null">new_quantity,</if>
+            <if test="recordType != null">record_type,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="status != null">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="checkGuid != null">#{checkGuid},</if>
+            <if test="checkStockDetailId != null">#{checkStockDetailId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="supplier != null">#{supplier},</if>
+            <if test="customer != null">#{customer},</if>
+            <if test="oldQuantity != null">#{oldQuantity},</if>
+            <if test="newQuantity != null">#{newQuantity},</if>
+            <if test="recordType != null">#{recordType},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="status != null">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCheckDifferenceRecord" parameterType="CheckDifferenceRecord">
+        update check_difference_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="checkStockDetailId != null">check_stock_detail_id = #{checkStockDetailId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="supplier != null">supplier = #{supplier},</if>
+            <if test="customer != null">customer = #{customer},</if>
+            <if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
+            <if test="newQuantity != null">new_quantity = #{newQuantity},</if>
+            <if test="recordType != null">record_type = #{recordType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+        </trim>
+        where check_guid = #{checkGuid}
+    </update>
+
+    <delete id="deleteCheckDifferenceRecordByCheckGuid" parameterType="String">
+        delete
+        from check_difference_record
+        where check_guid = #{checkGuid}
+    </delete>
+
+    <delete id="deleteCheckDifferenceRecordByCheckGuids" parameterType="String">
+        delete from check_difference_record where check_guid in
+        <foreach item="checkGuid" collection="array" open="(" separator="," close=")">
+            #{checkGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml
new file mode 100644
index 0000000..1a61a5f
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailFinishMapper.xml
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.check.stockcheckdetailfinish.mapper.CheckStockinDetailFinishMapper">
+
+    <resultMap type="CheckStockinDetailFinish" id="CheckStockinDetailFinishResult">
+        <result property="stockCheckDetailId"    column="stock_check_detail_id"    />
+        <result property="stockCheckGuid"    column="stock_check_guid"    />
+        <result property="stockCheckId"    column="stock_check_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+    </resultMap>
+    <resultMap type="CheckStockinDetail" id="CheckStockinDetailResult">
+        <result property="stockCheckDetailId"    column="stock_check_detail_id"    />
+        <result property="stockCheckGuid"    column="stock_check_guid"    />
+        <result property="stockCheckId"    column="stock_check_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="productName"    column="product_name"    />
+
+    </resultMap>
+
+    <sql id="selectCheckStockinDetailVo">
+        select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
+               csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
+               csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
+               csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
+               bp.product_name,
+               bcs.cargo_space_name,
+               csd.spare7,
+               csd.spare8,
+               csd.spare9
+        from check_stockin_detail_finish csd
+                 left join bas_product bp on csd.product_id = bp.product_id
+                 left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id
+
+    </sql>
+
+    <sql id="selectCheckStockinDetailFinishVo">
+        select stock_check_detail_id, stock_check_guid, stock_check_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j, print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3, spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j from check_stockin_detail_finish
+    </sql>
+
+    <select id="selectCheckStockinDetailFinishList" parameterType="CheckStockinDetailFinish" resultMap="CheckStockinDetailFinishResult">
+        <include refid="selectCheckStockinDetailFinishVo"/>
+        <where>
+            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and stock_check_guid like concat("%", #{stockCheckGuid}, "%")</if>
+            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id like concat("%", #{stockCheckId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="scanNum != null  and scanNum != ''"> and scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectCheckStockinDetailFinishByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailFinishResult">
+        <include refid="selectCheckStockinDetailFinishVo"/>
+        where stock_check_detail_id = #{stockCheckDetailId}
+    </select>
+    <select id="selectCheckStockinDetailList"
+            resultMap="CheckStockinDetailResult">
+        <include refid="selectCheckStockinDetailVo"/>
+        <where>
+            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and csd.stock_check_guid like concat("%", #{stockCheckGuid}, "%")</if>
+            <if test="stockCheckId != null  and stockCheckId != ''"> and csd.stock_check_id like concat("%", #{stockCheckId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and csd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and csd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and csd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and csd.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null  and quantityX != ''"> and csd.quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and csd.quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null  and price != ''"> and csd.price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and csd.cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null  and assignNum != ''"> and csd.assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and csd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and csd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null  and printDate != ''"> and csd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and csd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and csd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and csd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null  and unit != ''"> and csd.unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and csd.spec like concat("%", #{spec}, "%")</if>
+            <if test="scanNum != null  and scanNum != ''"> and csd.scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and csd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and csd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and csd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and csd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and csd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and csd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and csd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and csd.spare6 like concat("%", #{spare6}, "%")</if>
+        </where>
+    </select>
+
+    <insert id="insertCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
+        insert into check_stockin_detail_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockCheckDetailId != null">stock_check_detail_id,</if>
+            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid,</if>
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumX != null">scan_num_x,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockCheckDetailId != null">#{stockCheckDetailId},</if>
+            <if test="stockCheckGuid != null and stockCheckGuid != ''">#{stockCheckGuid},</if>
+            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumX != null">#{scanNumX},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCheckStockinDetailFinish" parameterType="CheckStockinDetailFinish">
+        update check_stockin_detail_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid = #{stockCheckGuid},</if>
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+        </trim>
+        where stock_check_detail_id = #{stockCheckDetailId}
+    </update>
+
+    <delete id="deleteCheckStockinDetailFinishByStockCheckDetailId" parameterType="String">
+        delete from check_stockin_detail_finish where stock_check_detail_id = #{stockCheckDetailId}
+    </delete>
+
+    <delete id="deleteCheckStockinDetailFinishByStockCheckDetailIds" parameterType="String">
+        delete from check_stockin_detail_finish where stock_check_detail_id in
+        <foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")">
+            #{stockCheckDetailId}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml
new file mode 100644
index 0000000..057a4e0
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinDetailMapper.xml
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.check.stockcheckdetail.mapper.CheckStockinDetailMapper">
+
+    <resultMap type="CheckStockinDetail" id="CheckStockinDetailResult">
+        <result property="stockCheckDetailId"    column="stock_check_detail_id"    />
+        <result property="stockCheckGuid"    column="stock_check_guid"    />
+        <result property="stockCheckId"    column="stock_check_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="productName"    column="product_name"    />
+        <result property="orderId"    column="order_id"    />
+
+    </resultMap>
+
+    <sql id="selectCheckStockinDetailVo">
+        select csd.stock_check_detail_id, csd.stock_check_guid, csd.stock_check_id, csd.lot_no, csd.product_guid, csd.product_id,
+               csd.quantity, csd.quantity_x, csd.quantity_j, csd.price, csd.cargo_no, csd.remark, csd.assign_num, csd.assign_num_x,
+               csd.assign_num_j, csd.print_date, csd.stock_status, csd.supplier_id, csd.customer_id, csd.unit, csd.spec,
+               csd.scan_num, csd.scan_num_x, csd.scan_num_j, csd.spare1, csd.spare2, csd.spare3, csd.spare4,csd.spare5, csd.spare6,
+               bp.product_name,
+               bcs.cargo_space_name,
+               csd.spare7,
+               csd.spare8,
+               csd.spare9,
+               csd.order_id
+        from check_stockin_detail csd
+        left join bas_product bp on csd.product_id = bp.product_id
+        left join bas_cargo_space bcs on csd.cargo_space_id = bcs.cargo_space_id
+    </sql>
+
+    <select id="selectCheckStockinDetailList" parameterType="CheckStockinDetail" resultMap="CheckStockinDetailResult">
+        <include refid="selectCheckStockinDetailVo"/>
+        <where>
+            <if test="stockCheckGuid != null  and stockCheckGuid != ''"> and csd.stock_check_guid like concat("%", #{stockCheckGuid}, "%")</if>
+            <if test="stockCheckId != null  and stockCheckId != ''"> and csd.stock_check_id like concat("%", #{stockCheckId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and csd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and csd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and csd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and csd.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null  and quantityX != ''"> and csd.quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and csd.quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null  and price != ''"> and csd.price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and csd.cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null  and assignNum != ''"> and csd.assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and csd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and csd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null  and printDate != ''"> and csd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and csd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and csd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and csd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null  and unit != ''"> and csd.unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and csd.spec like concat("%", #{spec}, "%")</if>
+            <if test="scanNum != null  and scanNum != ''"> and csd.scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and csd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and csd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and csd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and csd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and csd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and csd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and csd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and csd.spare6 like concat("%", #{spare6}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectCheckStockinDetailByStockCheckDetailId" parameterType="String" resultMap="CheckStockinDetailResult">
+        <include refid="selectCheckStockinDetailVo"/>
+        where stock_check_detail_id = #{stockCheckDetailId}
+    </select>
+
+    <insert id="insertCheckStockinDetail" parameterType="CheckStockinDetail">
+        insert into check_stockin_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockCheckDetailId != null">stock_check_detail_id,</if>
+            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid,</if>
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumX != null">scan_num_x,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="orderId != null">order_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockCheckDetailId != null">#{stockCheckDetailId},</if>
+            <if test="stockCheckGuid != null and stockCheckGuid != ''">#{stockCheckGuid},</if>
+            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumX != null">#{scanNumX},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="orderId != null">#{orderId},</if>
+         </trim>
+    </insert>
+    <insert id="insertCheckStockinDetailHistory">
+        insert into check_stockin_detail_finish
+        select * from check_stockin_detail where stock_check_id = #{stockCheckId}
+    </insert>
+
+    <update id="updateCheckStockinDetail" parameterType="CheckStockinDetail">
+        update check_stockin_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockCheckGuid != null and stockCheckGuid != ''">stock_check_guid = #{stockCheckGuid},</if>
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+        </trim>
+        where stock_check_detail_id = #{stockCheckDetailId}
+    </update>
+
+    <delete id="deleteCheckStockinDetailByStockCheckDetailId" parameterType="String">
+        delete from check_stockin_detail where stock_check_detail_id = #{stockCheckDetailId}
+    </delete>
+
+    <delete id="deleteCheckStockinDetailByStockCheckDetailIds" parameterType="String">
+        delete from check_stockin_detail where stock_check_detail_id in
+        <foreach item="stockCheckDetailId" collection="array" open="(" separator="," close=")">
+            #{stockCheckDetailId}
+        </foreach>
+    </delete>
+    <delete id="deleteCheckStockinDetailByStockinGuid">
+        delete from check_stockin_detail where stock_check_guid = #{stockCheckGuid}
+    </delete>
+
+    <select id="getCheckDetailById" parameterType="String" resultMap="CheckStockinDetailResult">
+        select * from check_stockin_detail where stock_check_id = #{stockCheckId}
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml
new file mode 100644
index 0000000..675d421
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinFinishMapper.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.check.stockcheckfinish.mapper.CheckStockinFinishMapper">
+
+    <resultMap type="CheckStockinFinish" id="CheckStockinFinishResult">
+        <result property="stockGuid"    column="stock_guid"    />
+        <result property="stockCheckId"    column="stock_check_id"    />
+        <result property="checkType"    column="check_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+    </resultMap>
+    <resultMap type="CheckStockin" id="CheckStockinResult">
+        <result property="stockGuid"    column="stock_guid"    />
+        <result property="stockCheckId"    column="stock_check_id"    />
+        <result property="checkType"    column="check_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+    </resultMap>
+    <sql id="selectCheckStockinVo">
+        select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, csf.warehouse_id,warehouse_name, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5
+        from check_stockin_finish csf
+        left join bas_warehouse bw on bw.warehouse_id=  csf.warehouse_id
+    </sql>
+    <sql id="selectCheckStockinFinishVo">
+        select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no from check_stockin_finish
+    </sql>
+
+    <select id="selectCheckStockinFinishList" parameterType="CheckStockinFinish" resultMap="CheckStockinFinishResult">
+        <include refid="selectCheckStockinFinishVo"/>
+        <where>
+            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id like concat("%", #{stockCheckId}, "%")</if>
+            <if test="checkType != null  and checkType != ''"> and check_type like concat("%", #{checkType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectCheckStockinFinishByStockGuid" parameterType="String" resultMap="CheckStockinFinishResult">
+        <include refid="selectCheckStockinFinishVo"/>
+        where stock_guid = #{stockGuid}
+    </select>
+    <select id="selectCheckStockinList" resultMap="CheckStockinResult">
+        <include refid="selectCheckStockinVo"/>
+        <where>
+            <if test="stockCheckId != null  and stockCheckId != ''"> and stock_check_id like concat("%", #{stockCheckId}, "%")</if>
+            <if test="checkType != null  and checkType != ''"> and check_type like concat("%", #{checkType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and csf.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by cs.create_date asc
+    </select>
+
+    <insert id="insertCheckStockinFinish" parameterType="CheckStockinFinish">
+        insert into check_stockin_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockGuid != null">stock_guid,</if>
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
+            <if test="checkType != null and checkType != ''">check_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockGuid != null">#{stockGuid},</if>
+            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
+            <if test="checkType != null and checkType != ''">#{checkType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCheckStockinFinish" parameterType="CheckStockinFinish">
+        update check_stockin_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
+            <if test="checkType != null and checkType != ''">check_type = #{checkType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+        </trim>
+        where stock_guid = #{stockGuid}
+    </update>
+
+    <delete id="deleteCheckStockinFinishByStockGuid" parameterType="String">
+        delete from check_stockin_finish where stock_guid = #{stockGuid}
+    </delete>
+
+    <delete id="deleteCheckStockinFinishByStockGuids" parameterType="String">
+        delete from check_stockin_finish where stock_guid in
+        <foreach item="stockGuid" collection="array" open="(" separator="," close=")">
+            #{stockGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml
new file mode 100644
index 0000000..7028bf3
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/check/CheckStockinMapper.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.check.stockcheck.mapper.CheckStockinMapper">
+
+    <resultMap type="CheckStockin" id="CheckStockinResult">
+        <result property="stockGuid"    column="stock_guid"    />
+        <result property="stockCheckId"    column="stock_check_id"    />
+        <result property="checkType"    column="check_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="departmentName"    column="department_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+    </resultMap>
+
+    <sql id="selectCheckStockinVo">
+        select cs.stock_guid,
+               cs.stock_check_id,
+               cs.check_type,
+               cs.create_date,
+               cs.create_man_id,
+               cs.status,
+               cs.warehouse_id,
+               cs.finish_date,
+               cs.erp_bill,
+               cs.stock_source,
+               cs.department_no,
+               cs.customer_no,
+               cs.class_no,
+               cs.supplier_no,
+               cs.spare1,
+               cs.spare2,
+               cs.spare3,
+               cs.spare4,
+               cs.spare5,
+               bw.warehouse_name,
+               sd.dept_name as department_name
+        from check_stockin cs
+                 left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id
+                 left join sys_dept sd on cs.department_no = sd.dept_id
+    </sql>
+
+    <select id="selectCheckStockinList" parameterType="CheckStockin" resultMap="CheckStockinResult">
+        <include refid="selectCheckStockinVo"/>
+        <where>
+            <if test="stockCheckId != null  and stockCheckId != ''"> and cs.stock_check_id like concat("%", #{stockCheckId}, "%")</if>
+            <if test="checkType != null  and checkType != ''"> and cs.check_type like concat("%", #{checkType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and cs.create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and cs.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and cs.status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and cs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and cs.finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and cs.erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and cs.stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and cs.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and cs.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and cs.class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and cs.supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and cs.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and cs.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and cs.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and cs.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and cs.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+             order by cs.create_date asc
+    </select>
+
+    <select id="selectCheckStockinByStockGuid" parameterType="String" resultMap="CheckStockinResult">
+        <include refid="selectCheckStockinVo"/>
+        where stock_guid = #{stockGuid}
+    </select>
+    <select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
+        {
+            call proc_check_auto_allocation(
+                #{v_stock_check_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=VARCHAR},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+                 )
+            }
+    </select>
+
+    <insert id="insertCheckStockin" parameterType="CheckStockin">
+        insert into check_stockin
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockGuid != null">stock_guid,</if>
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id,</if>
+            <if test="checkType != null and checkType != ''">check_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockGuid != null">#{stockGuid},</if>
+            <if test="stockCheckId != null and stockCheckId != ''">#{stockCheckId},</if>
+            <if test="checkType != null and checkType != ''">#{checkType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+         </trim>
+    </insert>
+    <insert id="insertCheckStockinHistory">
+        insert into check_stockin_finish
+        select * from check_stockin  where stock_guid = #{stockGuid}
+    </insert>
+
+    <update id="updateCheckStockin" parameterType="CheckStockin">
+        update check_stockin
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockCheckId != null and stockCheckId != ''">stock_check_id = #{stockCheckId},</if>
+            <if test="checkType != null and checkType != ''">check_type = #{checkType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+        </trim>
+        where stock_guid = #{stockGuid}
+    </update>
+
+    <delete id="deleteCheckStockinByStockGuid" parameterType="String">
+        delete from check_stockin where stock_guid = #{stockGuid}
+    </delete>
+
+    <delete id="deleteCheckStockinByStockGuids" parameterType="String">
+        delete from check_stockin where stock_guid in
+        <foreach item="stockGuid" collection="array" open="(" separator="," close=")">
+            #{stockGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml
new file mode 100644
index 0000000..52a7b9e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinBackMapper.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockinback.mapper.InStockinBackMapper">
+    
+    <resultMap type="InStockinBack" id="InStockinBackResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="sendStatus"    column="send_status"/>
+        <result property="sendTime"   column="send_time"/>
+        <result property="msg"     column="msg"/>
+        <result property="companyShortName"     column="company_short_name"/>
+        <result property="accountSetNo"     column="account_set_no"/>
+    </resultMap>
+
+    <sql id="selectInStockinBackVo">
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id,
+               spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no,
+               customer_no, class_no, supplier_no,send_status,send_time,msg,company_short_name,account_set_no from in_stockin_back
+    </sql>
+
+    <select id="selectInStockinBackList" parameterType="InStockinBack" resultMap="InStockinBackResult">
+        <include refid="selectInStockinBackVo"/>
+        <where>  
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="sendStatus != null  and sendStatus != ''"> and send_status like concat("%", #{sendStatus}, "%")</if>
+            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
+            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectInStockinBackByStockinGuid" parameterType="String" resultMap="InStockinBackResult">
+        <include refid="selectInStockinBackVo"/>
+        where stockin_guid = #{stockinGuid}
+    </select>
+
+    <insert id="insertInStockinBack" parameterType="InStockinBack">
+        insert into in_stockin_back
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="sendStatus != null">send_status,</if>
+            <if test="sendTime != null">send_time,</if>
+            <if test="msg != null">msg,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="sendStatus != null">#{sendStatus},</if>
+            <if test="sendTime != null">#{sendTime},</if>
+            <if test="msg != null">#{msg},</if>
+         </trim>
+    </insert>
+
+    <insert id="insertInStockinBackById" parameterType="InStockin" >
+        insert into in_stockin_back
+        select * from in_stockin where stockin_guid = #{stockinGuid}
+    </insert>
+
+    <update id="updateInStockinBack" parameterType="InStockinBack">
+        update in_stockin_back
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="sendStatus != null">send_status = #{sendStatus},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
+            <if test="msg != null">msg = #{msg},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteInStockinBackByStockinGuid" parameterType="String">
+        delete from in_stockin_back where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteInStockinBackByStockinGuids" parameterType="String">
+        delete from in_stockin_back where stockin_guid in 
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+
+    <select id="selectTopInStockin" resultMap="InStockinBackResult">
+        select top(1) *
+        from in_stockin_back where send_status= 0 and stock_source =1
+
+    </select>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml
new file mode 100644
index 0000000..4a7495f
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailBackMapper.xml
@@ -0,0 +1,300 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockindeatilback.mapper.InStockinDetailBackMapper">
+    
+    <resultMap type="InStockinDetailBack" id="InStockinDetailBackResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="productName"    column="product_name"    />
+        <result property="sendStatus"    column="send_status"/>
+        <result property="sendTime"   column="send_time"/>
+        <result property="msg"     column="msg"/>
+        <result property="sourceLineId"     column="source_line_id"/>
+        <result property="barCode"     column="bar_code"/>
+        <result property="isBatchManage"     column="is_batch_manage"/>
+        <result property="oldProjectNo"     column="old_project_no"/>
+    </resultMap>
+
+    <sql id="selectInStockinDetailBackVo">
+        select stockin_detail_id,
+               stockin_guid,
+               stockin_id,
+               lot_no,
+               product_guid,
+               product_id,
+               quantity,
+               quantity_x,
+               quantity_j,
+               price,
+               cargo_no,
+               remark,
+               assign_num,
+               assign_num_x,
+               assign_num_j,
+               print_date,
+               stock_status,
+               supplier_id,
+               customer_id,
+               unit,
+               spec,
+               spare1,
+               spare2,
+               spare3,
+               spare4,
+               spare5,
+               spare6,
+               scan_num,
+               scan_num_x,
+               scan_num_j,
+               spare7,
+               spare8,
+               spare9,
+               product_name,
+               send_status,
+               send_time,
+               msg,
+               source_line_id,
+               bar_code,
+               is_batch_manage,
+               old_project_no
+        from in_stockin_detail_back
+    </sql>
+
+    <select id="selectInStockinDetailBackList" parameterType="InStockinDetailBack" resultMap="InStockinDetailBackResult">
+        <include refid="selectInStockinDetailBackVo"/>
+        <where>  
+            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="scanNum != null  and scanNum != ''"> and scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat("%", #{spare9}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="sendStatus != null  and sendStatus != ''"> and send_status like concat("%", #{sendStatus}, "%")</if>
+            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
+            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectInStockinDetailBackByStockinDetailId" parameterType="String" resultMap="InStockinDetailBackResult">
+        <include refid="selectInStockinDetailBackVo"/>
+        where stockin_detail_id = #{stockinDetailId}
+    </select>
+
+    <insert id="insertInStockinDetailBack" parameterType="InStockinDetailBack">
+        insert into in_stockin_detail_back
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumX != null">scan_num_x,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="sendStatus != null">send_status,</if>
+            <if test="sendTime != null">send_time,</if>
+            <if test="msg != null">msg,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumX != null">#{scanNumX},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="sendStatus != null">#{sendStatus},</if>
+            <if test="sendTime != null">#{sendTime},</if>
+            <if test="msg != null">#{msg},</if>
+         </trim>
+    </insert>
+
+
+    <insert id="insertInStockinDetailBackById" parameterType="InStockin">
+        insert into in_stockin_detail_back
+        select * from in_stockin_detail where stockin_guid = #{stockinGuid}
+    </insert>
+
+    <update id="updateInStockinDetailBack" parameterType="InStockinDetailBack">
+        update in_stockin_detail_back
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
+
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="sendStatus != null">send_status = #{sendStatus},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
+            <if test="msg != null">msg = #{msg},</if>
+        </trim>
+        where stockin_id = #{stockinId}
+    </update>
+
+    <delete id="deleteInStockinDetailBackByStockinDetailId" parameterType="String">
+        delete from in_stockin_detail_back where stockin_detail_id = #{stockinDetailId}
+    </delete>
+
+    <delete id="deleteInStockinDetailBackByStockinDetailIds" parameterType="String">
+        delete from in_stockin_detail_back where stockin_detail_id in 
+        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
+            #{stockinDetailId}
+        </foreach>
+    </delete>
+
+    <insert id="insertInStockInDetailBackFinish" parameterType="java.util.List">
+        INSERT INTO in_stockin_detail_back_finish
+        <foreach collection="list" item="item" separator="UNION ALL">
+            SELECT * FROM in_stockin_detail_back
+            WHERE stockin_detail_id = #{item.stockinDetailId}
+        </foreach>
+    </insert>
+
+    <delete id="deleteInStockInDetailList">
+        DELETE FROM in_stockin_detail_back
+        WHERE stockin_detail_id IN
+        <foreach collection="idList" item="item" open="(" separator="," close=")">
+            #{item.stockinDetailId}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml
new file mode 100644
index 0000000..dcf74ec
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailFinishMapper.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper">
+
+    <resultMap type="InStockinDetailFinish" id="InStockinDetailFinishResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+
+    </resultMap>
+    <resultMap type="InStockinDetail" id="InStockinDetailResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+        <result property="productName"    column="product_name"    />
+
+        <!--<association property="extraField" javaType="ExtraField">
+            <result property="productId"    column="product_id"    />
+            <result property="materialDesc"    column="product_name"    />
+            <result property="englishDesc"    column="englishDesc"    />
+            <result property="length"    column="length"    />
+            <result property="width"    column="width"    />
+            <result property="height"    column="height"    />
+            <result property="volume"    column="volume"    />
+            <result property="netWeight"    column="netWeight"    />
+        </association>-->
+    </resultMap>
+    <sql id="selectInStockinDetailFinishVo">
+        select
+            isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
+            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
+            isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
+            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
+            isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
+            isd.product_name,
+            isd.spare7,isd.spare8,isd.spare9
+        from in_stockin_detail_finish isd
+                 left join bas_product bp on bp.product_id = isd.product_id
+    </sql>
+
+    <select id="selectInStockinDetailFinishList" parameterType="InStockinDetailFinish" resultMap="InStockinDetailFinishResult">
+        <include refid="selectInStockinDetailFinishVo"/>
+        <where>
+            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null and productId != ''"> and isd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null and quantity != ''"> and isd.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null and price != ''"> and isd.price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null and printDate != ''"> and isd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null and customerId != ''"> and isd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null and unit != ''"> and isd.unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null and spec != ''"> and isd.spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectInStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="InStockinDetailFinishResult">
+        <include refid="selectInStockinDetailFinishVo"/>
+        where stockin_detail_id = #{stockinDetailId}
+    </select>
+    <select id="selectInStockinDetailFinishListByInStockinDetail"
+            resultMap="InStockinDetailResult">
+        <include refid="selectInStockinDetailFinishVo"/>
+        <where>
+            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null and productId != ''"> and isd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null and quantity != ''"> and isd.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null and price != ''"> and isd.price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null and printDate != ''"> and isd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null and customerId != ''"> and isd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null and unit != ''"> and isd.unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null and spec != ''"> and isd.spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+        </where>
+    </select>
+
+    <insert id="insertInStockinDetailFinish" parameterType="InStockinDetailFinish">
+        insert into in_stockin_detail_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumX != null">scan_num_x,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumX != null">#{scanNumX},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInStockinDetailFinish" parameterType="InStockinDetailFinish">
+        update in_stockin_detail_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+        </trim>
+        where stockin_detail_id = #{stockinDetailId}
+    </update>
+
+    <delete id="deleteInStockinDetailFinishByStockinDetailId" parameterType="String">
+        delete from in_stockin_detail_finish where stockin_detail_id = #{stockinDetailId}
+    </delete>
+
+    <delete id="deleteInStockinDetailFinishByStockinDetailIds" parameterType="String">
+        delete from in_stockin_detail_finish where stockin_detail_id in
+        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
+            #{stockinDetailId}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml
new file mode 100644
index 0000000..b1bcc7f
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinDetailMapper.xml
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper">
+
+    <resultMap type="InStockinDetail" id="InStockinDetailResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="productName"    column="product_name"    />
+<!--        <association property="extraField" javaType="ExtraField">-->
+<!--            <result property="productId"    column="product_id"    />-->
+<!--            <result property="materialDesc"    column="product_name"    />-->
+<!--            <result property="englishDesc"    column="englishDesc"    />-->
+<!--            <result property="length"    column="length"    />-->
+<!--            <result property="width"    column="width"    />-->
+<!--            <result property="height"    column="height"    />-->
+<!--            <result property="volume"    column="volume"    />-->
+<!--            <result property="netWeight"    column="netWeight"    />-->
+<!--        </association>-->
+    </resultMap>
+
+    <sql id="selectInStockinDetailVo">
+        select
+            isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
+            isd.product_id, isd.quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
+            isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
+            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
+            isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
+            isd.product_name,
+            isd.spare7,isd.spare8,isd.spare9
+        from in_stockin_detail isd
+        left join bas_product bp on bp.product_id = isd.product_id
+    </sql>
+
+    <select id="selectInStockinDetailList" parameterType="InStockinDetail" resultMap="InStockinDetailResult">
+        <include refid="selectInStockinDetailVo"/>
+        <where>
+            <if test="stockinGuid != null and stockinGuid != ''"> and isd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null and stockinId != ''"> and isd.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="lotNo != null and lotNo != ''"> and isd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null and productGuid != ''"> and isd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null and productId != ''"> and isd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null and quantity != ''"> and isd.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null and quantityX != ''"> and isd.quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null and quantityJ != ''"> and isd.quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null and price != ''"> and isd.price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null and cargoNo != ''"> and isd.cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null and assignNum != ''"> and isd.assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null and assignNumX != ''"> and isd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null and assignNumJ != ''"> and isd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null and printDate != ''"> and isd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null and stockStatus != ''"> and isd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null and supplierId != ''"> and isd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null and customerId != ''"> and isd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null and unit != ''"> and isd.unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null and spec != ''"> and isd.spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="scanNum != null and scanNum != ''"> and isd.scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumX != null and scanNumX != ''"> and isd.scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="scanNumJ != null and scanNumJ != ''"> and isd.scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectInStockinDetailByStockinDetailId" parameterType="String" resultMap="InStockinDetailResult">
+        <include refid="selectInStockinDetailVo"/>
+        where stockin_detail_id = #{stockinDetailId}
+    </select>
+
+    <insert id="insertInStockinDetail" parameterType="InStockinDetail">
+        insert into in_stockin_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumX != null">scan_num_x,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="sourceLineId != null">source_line_id,</if>
+            <if test="barCode != null">bar_code,</if>
+            <if test="isBatchManage != null">is_batch_manage,</if>
+            <if test="oldProjectNo != null">old_project_no,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumX != null">#{scanNumX},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+            <if test="productName != null">#{productName},</if>
+
+            <if test="sourceLineId != null">#{sourceLineId},</if>
+            <if test="barCode != null">#{barCode},</if>
+            <if test="isBatchManage != null">#{isBatchManage},</if>
+            <if test="oldProjectNo != null">#{oldProjectNo},</if>
+
+        </trim>
+    </insert>
+    <insert id="insertInStockinDetailList">
+        INSERT INTO in_stockin_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <!-- 动态选择字段 -->
+            <if test="list[0].stockinDetailId != null">stockin_detail_id,</if>
+            <if test="list[0].stockinGuid != null and list[0].stockinGuid != ''">stockin_guid,</if>
+            <if test="list[0].stockinId != null and list[0].stockinId != ''">stockin_id,</if>
+            <if test="list[0].lotNo != null and list[0].lotNo != ''">lot_no,</if>
+            <if test="list[0].productGuid != null">product_guid,</if>
+            <if test="list[0].productId != null and list[0].productId != ''">product_id,</if>
+            <if test="list[0].quantity != null">quantity,</if>
+            <if test="list[0].quantityX != null">quantity_x,</if>
+            <if test="list[0].quantityJ != null">quantity_j,</if>
+            <if test="list[0].price != null">price,</if>
+            <if test="list[0].cargoNo != null">cargo_no,</if>
+            <if test="list[0].remark != null">remark,</if>
+            <if test="list[0].assignNum != null">assign_num,</if>
+            <if test="list[0].assignNumX != null">assign_num_x,</if>
+            <if test="list[0].assignNumJ != null">assign_num_j,</if>
+            <if test="list[0].printDate != null">print_date,</if>
+            <if test="list[0].stockStatus != null">stock_status,</if>
+            <if test="list[0].supplierId != null">supplier_id,</if>
+            <if test="list[0].customerId != null">customer_id,</if>
+            <if test="list[0].unit != null">unit,</if>
+            <if test="list[0].spec != null">spec,</if>
+            <if test="list[0].spare1 != null">spare1,</if>
+            <if test="list[0].spare2 != null">spare2,</if>
+            <if test="list[0].spare3 != null">spare3,</if>
+            <if test="list[0].spare4 != null">spare4,</if>
+            <if test="list[0].spare5 != null">spare5,</if>
+            <if test="list[0].spare6 != null">spare6,</if>
+            <if test="list[0].scanNum != null">scan_num,</if>
+            <if test="list[0].scanNumX != null">scan_num_x,</if>
+            <if test="list[0].scanNumJ != null">scan_num_j,</if>
+        </trim>
+
+        <!-- values 部分：遍历列表插入多行 -->
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="item.stockinDetailId != null">#{item.stockinDetailId},</if>
+                <if test="item.stockinGuid != null and item.stockinGuid != ''">#{item.stockinGuid},</if>
+                <if test="item.stockinId != null and item.stockinId != ''">#{item.stockinId},</if>
+                <if test="item.lotNo != null and item.lotNo != ''">#{item.lotNo},</if>
+                <if test="item.productGuid != null">#{item.productGuid},</if>
+                <if test="item.productId != null and item.productId != ''">#{item.productId},</if>
+                <if test="item.quantity != null">#{item.quantity},</if>
+                <if test="item.quantityX != null">#{item.quantityX},</if>
+                <if test="item.quantityJ != null">#{item.quantityJ},</if>
+                <if test="item.price != null">#{item.price},</if>
+                <if test="item.cargoNo != null">#{item.cargoNo},</if>
+                <if test="item.remark != null">#{item.remark},</if>
+                <if test="item.assignNum != null">#{item.assignNum},</if>
+                <if test="item.assignNumX != null">#{item.assignNumX},</if>
+                <if test="item.assignNumJ != null">#{item.assignNumJ},</if>
+                <if test="item.printDate != null">#{item.printDate},</if>
+                <if test="item.stockStatus != null">#{item.stockStatus},</if>
+                <if test="item.supplierId != null">#{item.supplierId},</if>
+                <if test="item.customerId != null">#{item.customerId},</if>
+                <if test="item.unit != null">#{item.unit},</if>
+                <if test="item.spec != null">#{item.spec},</if>
+                <if test="item.spare1 != null">#{item.spare1},</if>
+                <if test="item.spare2 != null">#{item.spare2},</if>
+                <if test="item.spare3 != null">#{item.spare3},</if>
+                <if test="item.spare4 != null">#{item.spare4},</if>
+                <if test="item.spare5 != null">#{item.spare5},</if>
+                <if test="item.spare6 != null">#{item.spare6},</if>
+                <if test="item.scanNum != null">#{item.scanNum},</if>
+                <if test="item.scanNumX != null">#{item.scanNumX},</if>
+                <if test="item.scanNumJ != null">#{item.scanNumJ},</if>
+            </trim>
+        </foreach>
+    </insert>
+    <insert id="insertInStockinDetailHistory">
+        insert into in_stockin_detail_finish
+        select * from in_stockin_detail where stockin_guid = #{stockinGuid}
+    </insert>
+
+    <update id="updateInStockinDetail" parameterType="InStockinDetail">
+        update in_stockin_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+        </trim>
+        where stockin_detail_id = #{stockinDetailId}
+    </update>
+
+    <delete id="deleteInStockinDetailByStockinDetailId" parameterType="String">
+        delete from in_stockin_detail where stockin_detail_id = #{stockinDetailId}
+    </delete>
+
+    <delete id="deleteInStockinDetailByStockinDetailIds" parameterType="String">
+        delete from in_stockin_detail where stockin_detail_id in
+        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
+            #{stockinDetailId}
+        </foreach>
+    </delete>
+    <delete id="deleteInStockinDetailByStockinGuid">
+        delete from in_stockin_detail where stockin_guid = #{stockinGuid}
+    </delete>
+    <select id="selectStockinByDetailById" parameterType="InstockinDetail" resultMap="InStockinDetailResult">
+        select
+            isd.stockin_detail_id, isd.stockin_guid, isd.stockin_id, isd.lot_no, isd.product_guid,
+            isd.product_id, isd.quantity-isd.scan_num as quantity, isd.quantity_x, isd.quantity_j, isd.price, isd.cargo_no, isd.remark,
+            isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
+            isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
+            isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
+            bp.product_name, bp.spare1 as englishDesc,
+            bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,ist.warehouse_id
+            from in_stockin_detail isd
+            left join bas_product bp on bp.product_id = isd.product_id
+        left join in_stockin ist on ist.stockin_guid = isd.stockin_guid
+        left join bas_warehouse bw on bw.warehouse_id = ist.warehouse_id
+        <where>
+        <if  test="stockinDetailId != null and stockinDetailId != '' ">
+            isd.stockin_detail_id = #{stockinDetailId}
+        </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by ist.create_date desc
+    </select>
+
+
+    <select id="selectStockInByDetailByBarCode" parameterType="string" resultType="com.ruoyi.in.stockindetail.domain.InStockinDetail">
+        select a.erp_bill,b.* from in_stockin a left join in_stockin_detail b on a.stockin_id=b.stockin_id where b.bar_code=#{barCode}
+
+
+    </select>
+
+
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml
new file mode 100644
index 0000000..95b6a7e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinFinishMapper.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper">
+
+    <resultMap type="InStockinFinish" id="InStockinFinishResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+    </resultMap>
+
+    <resultMap type="InStockin" id="InStockinResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="createManName"    column="user_name"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="departmentName"    column="dept_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare5"    column="spare5"    />
+    </resultMap>
+
+    <sql id="selectInStockinFinishVo">
+        select is2.stockin_guid,
+               is2.stockin_id,
+               is2.in_type,
+               is2.create_date,
+               is2.create_man_id,
+               is2.status,
+               is2.warehouse_id,
+               is2.finish_date,
+               is2.erp_bill,
+               is2.stock_source,
+               is2.department_no,
+               is2.customer_no,
+               is2.class_no,
+               is2.supplier_no,
+               is2.spare1,
+               is2.spare2,
+               is2.spare4,
+               is2.spare3,
+               is2.spare5,
+               bw.warehouse_name
+--                bs.supplier_name,
+--                sd.dept_name ,
+--                su.user_name
+        from in_stockin_finish is2
+                 left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
+--                  left join bas_supplier bs on bs.supplier_no = is2.supplier_no
+--                  left join sys_dept sd on is2.department_no = sd.dept_id
+--                  left join sys_user su on su.user_id = is2.create_man_id
+                 </sql>
+
+    <select id="selectInStockinFinishList" parameterType="InStockinFinish" resultMap="InStockinFinishResult">
+        <include refid="selectInStockinFinishVo"/>
+        <where>
+            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and is2.in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and is2.create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and is2.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and is2.status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and is2.finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and is2.class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectInStockinFinishByStockinGuid" parameterType="String" resultMap="InStockinFinishResult">
+        <include refid="selectInStockinFinishVo"/>
+        where is2.stockin_guid = #{stockinGuid}
+    </select>
+
+    <select id="selectInStockinFinishByStockinId" parameterType="String" resultMap="InStockinFinishResult">
+        <include refid="selectInStockinFinishVo"/>
+        where is2.stockin_id = #{stockinId}
+    </select>
+
+
+    <select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
+        <include refid="selectInStockinFinishVo"/>
+        <where>
+            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and is2.in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and is2.create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and is2.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and is2.status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and is2.finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and is2.class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="materialDesc !=null and materialDesc!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail_finish isd
+                left join bas_product bp on isd.product_id = bp.product_id
+                where isd.product_name like concat('%',#{materialDesc},'%')
+                )
+            </if>
+            <if test="lotNo !=null and lotNo!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail_finish
+                where lot_no like concat('%',#{lotNo},'%')
+                )
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by is2.create_date desc
+    </select>
+
+    <insert id="insertInStockinFinish" parameterType="InStockinFinish">
+        insert into in_stockin_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+         </trim>
+    </insert>
+
+    <update id="updateInStockinFinish" parameterType="InStockinFinish">
+        update in_stockin_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteInStockinFinishByStockinGuid" parameterType="String">
+        delete from in_stockin_finish where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteInStockinFinishByStockinGuids" parameterType="String">
+        delete from in_stockin_finish where stockin_guid in
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml
new file mode 100644
index 0000000..46bcaff
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/InStockinMapper.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.stockin.mapper.InStockinMapper">
+
+    <resultMap type="InStockin" id="InStockinResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="createManName"    column="user_name"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="departmentName"    column="dept_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare5"    column="spare5"    />
+    </resultMap>
+
+    <sql id="selectInStockinVo">
+        select is2.stockin_guid,
+               is2.stockin_id,
+               is2.in_type,
+               is2.create_date,
+               is2.create_man_id,
+               is2.status,
+               is2.warehouse_id,
+               is2.finish_date,
+               is2.erp_bill,
+               is2.stock_source,
+               is2.department_no,
+               is2.customer_no,
+               is2.class_no,
+               is2.supplier_no,
+               is2.spare1,
+               is2.spare2,
+               is2.spare4,
+               is2.spare3,
+               is2.spare5,
+               bw.warehouse_name
+        from in_stockin is2
+                 left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
+--                  left join bas_supplier bs on bs.supplier_no = is2.supplier_no
+--                  left join sys_dept sd on is2.department_no = sd.dept_id
+--                  left join sys_user su on su.user_id = is2.create_man_id
+    </sql>
+
+    <select id="selectInStockinList" parameterType="InStockin" resultMap="InStockinResult">
+        <include refid="selectInStockinVo"/>
+        <where>
+            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and is2.in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and is2.create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and is2.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and is2.status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="startDate != null  and startDate != ''"> and is2.create_date &gt;= #{startDate}</if>
+            <if test="finishDate != null  and finishDate != ''"> and is2.create_date &lt;= #{finishDate}</if>
+            <if test="erpBill != null  and erpBill != ''"> and is2.erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and is2.stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and is2.department_no like concat('%', #{departmentNo},'%')</if>
+            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and is2.class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="materialDesc !=null and materialDesc!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail isd
+                left join bas_product bp on isd.product_id = bp.product_id
+                where isd.product_name like concat('%',#{materialDesc},'%')
+                )
+            </if>
+            <if test="lotNo !=null and lotNo!=''">
+                and is2.stockin_id in (
+                select distinct stockin_id from in_stockin_detail
+                where lot_no like concat('%',#{lotNo},'%')
+                )
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+            <if test="typeData != null and typeData.size()>0">
+                and bw.warehouse_type in
+                <foreach item="item" index="index" collection="typeData" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+             order by is2.create_date desc
+    </select>
+
+    <select id="selectInStockinByStockinGuid" parameterType="String" resultMap="InStockinResult">
+        <include refid="selectInStockinVo"/>
+        where is2.stockin_guid = #{stockinGuid}
+    </select>
+
+    <select id="selectInStockinByStockinId" parameterType="String" resultMap="InStockinResult">
+        <include refid="selectInStockinVo"/>
+        where is2.stockin_id = #{stockinId}
+    </select>
+
+    <insert id="insertInStockin" parameterType="InStockin">
+        insert into in_stockin
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="companyShortName != null">company_short_name,</if>
+            <if test="accountSetNo != null">account_set_no,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="companyShortName != null">#{companyShortName},</if>
+            <if test="accountSetNo != null">#{accountSetNo},</if>
+        </trim>
+    </insert>
+    <insert id="insertInStockinHistory">
+        insert into in_stockin_finish
+        select * from in_stockin where stockin_guid = #{stockinGuid}
+    </insert>
+
+    <update id="updateInStockin" parameterType="InStockin">
+        update in_stockin
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
+            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteInStockinByStockinGuid" parameterType="String">
+        delete from in_stockin where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteInStockinByStockinGuids" parameterType="String">
+        delete from in_stockin where stockin_guid in
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+
+     <select id="selectStockinByDetail" parameterType="string" resultMap="InStockinResult">
+         select distinct is2.stockin_guid,
+         is2.stockin_id,
+         is2.in_type,
+         is2.create_date,
+         is2.create_man_id,
+         is2.status,
+         is2.warehouse_id,
+         is2.finish_date,
+         is2.erp_bill,
+         is2.stock_source,
+         is2.department_no,
+         is2.customer_no,
+         is2.class_no,
+         is2.supplier_no,
+         is2.spare1,
+         is2.spare2,
+         is2.spare4,
+         is2.spare3,
+         is2.spare5,
+         bw.warehouse_name,
+         bs.supplier_name,
+         sd.dept_name ,
+         su.user_name
+         from in_stockin is2
+         left join bas_warehouse bw on is2.warehouse_id = bw.warehouse_id
+         left join bas_supplier bs on bs.supplier_no = is2.supplier_no
+         left join sys_dept sd on is2.department_no = sd.dept_id
+         left join sys_user su on su.user_id = is2.create_man_id
+         left join in_stockin_detail isd on isd.stockin_id = is2.stockin_id
+         <where>
+             <if  test="stockinDetailId != null and stockinDetailId !=''">  stockin_detail_id=#{stockinDetailId}</if>
+         </where>
+     </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml
new file mode 100644
index 0000000..52e9970
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/in/TransferBillCallbackMapper.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.in.erp.mapper.TransferBillCallbackMapper">
+    
+    <resultMap type="TransferBillCallback" id="TransferBillCallbackResult">
+        <result property="id"    column="id"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="type"    column="type"    />
+        <result property="status"    column="status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectTransferBillCallbackVo">
+        select id, job_id, erp_bill, type, status, create_time, finish_time, spare1, spare2, spare3 from transfer_bill_callback
+    </sql>
+
+    <select id="selectTransferBillCallbackList" parameterType="TransferBillCallback" resultMap="TransferBillCallbackResult">
+        <include refid="selectTransferBillCallbackVo"/>
+        <where>  
+            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="type != null  and type != ''"> and type like concat("%", #{type}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectTransferBillCallbackById" parameterType="Long" resultMap="TransferBillCallbackResult">
+        <include refid="selectTransferBillCallbackVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTransferBillCallback" parameterType="TransferBillCallback" useGeneratedKeys="true" keyProperty="id">
+        insert into transfer_bill_callback
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jobId != null">job_id,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="type != null">type,</if>
+            <if test="status != null">status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobId != null">#{jobId},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="type != null">#{type},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTransferBillCallback" parameterType="TransferBillCallback">
+        update transfer_bill_callback
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTransferBillCallbackById" parameterType="Long">
+        delete from transfer_bill_callback where id = #{id}
+    </delete>
+
+    <delete id="deleteTransferBillCallbackByIds" parameterType="String">
+        delete from transfer_bill_callback where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml
new file mode 100644
index 0000000..74cf270
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/BillStatusCountMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.BillStatusCountMapper">
+    
+    <resultMap type="com.ruoyi.index.domain.BillStatusCount" id="BillStatusCountResult">
+        <result property="id" column="id"/>
+        <result property="status" column="status"/>
+        <result property="type" column="type"/>
+    </resultMap>
+
+    <select id="selectStockinStatusCount" resultMap="BillStatusCountResult">
+        select stockin_id as id, status, '1' as type
+        from in_stockin
+        where status in ('1', '2', '3')
+            ${params.warehouseDataScope}
+    </select>
+
+    <select id="selectStockoutStatusCount" resultMap="BillStatusCountResult">
+        select stockout_id as id, status, '2' as type
+        from out_stockout
+        where status in ('1', '2', '3')
+            ${params.warehouseDataScope}
+    </select>
+
+    <select id="selectStockcheckStatusCount" resultMap="BillStatusCountResult">
+        select stock_check_id as id, status, '3' as type
+        from check_stockin
+        where status in ('1', '2', '3')
+            ${params.warehouseDataScope}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml
new file mode 100644
index 0000000..5263856
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/CargoSpaceCountMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.CargoSpaceCountMapper">
+
+    <select id="selectStatusCount" resultType="java.util.Map">
+        SELECT status, COUNT(*) as count
+        FROM bas_cargo_space
+        WHERE status IN ('1', '2', '3', '4', '5', '6')
+            ${params.warehouseDataScope}
+        GROUP BY status
+        ORDER BY status
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml
new file mode 100644
index 0000000..78a4fe9
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/IndexCountMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.IndexCountMapper">
+    
+    <!-- 查询已完成入库单数量 -->
+    <select id="selectStockinFinishCount" resultType="Integer">
+        select count(1) from in_stockin_finish
+        where 1=1
+        ${params.warehouseDataScope}
+    </select>
+    
+    <!-- 查询已完成出库单数量 -->
+    <select id="selectStockoutFinishCount" resultType="Integer">
+        select count(1) from out_stockout_finish
+        where 1=1
+        ${params.warehouseDataScope}
+    </select>
+    
+    <!-- 查询已完成盘点单数量 -->
+    <select id="selectStockcheckFinishCount" resultType="Integer">
+        select count(1) from check_stockin_finish
+        where 1=1
+        ${params.warehouseDataScope}
+    </select>
+    
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml
new file mode 100644
index 0000000..11eb6df
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/ViewIndexJobMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.ViewIndexJobMapper">
+    
+    <resultMap type="ViewIndexJob" id="ViewIndexJobResult">
+        <result property="jobId" column="job_id" />
+        <result property="status" column="status" />
+        <result property="statusLabel" column="status_label" />
+        <result property="inOrOut" column="in_or_out" />
+        <result property="priority" column="priority" />
+    </resultMap>
+
+    <select id="selectViewIndexJobByStatus" parameterType="String" resultMap="ViewIndexJobResult">
+        select 
+            job_id,
+            status,
+            status_label,
+            in_or_out,
+            priority
+        from view_index_job
+        ${params.warehouseDataScope}
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml
new file mode 100644
index 0000000..4af7e81
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/index/WeekJobCountMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.index.mapper.WeekJobCountMapper">
+
+    <!-- 查询指定日期范围内每天的入库作业数量 -->
+    <select id="selectInJobCounts" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*) as count
+        FROM
+            mydo_job_finish
+        WHERE
+            in_or_out &lt; 20
+            AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate}
+        GROUP BY
+            CAST(create_time AS DATE)
+        ORDER BY
+            CAST(create_time AS DATE)
+            ${baseEntity.params.warehouseDataScope}
+    </select>
+
+    <!-- 查询指定日期范围内每天的出库作业数量 -->
+    <select id="selectOutJobCounts" resultType="java.lang.Integer">
+        SELECT
+            COUNT(*) as count
+        FROM
+            mydo_job_finish
+        WHERE
+            in_or_out >= 20
+            AND CAST(create_time AS DATE) BETWEEN #{startDate} AND #{endDate}
+        GROUP BY
+            CAST(create_time AS DATE)
+        ORDER BY
+            CAST(create_time AS DATE)
+            ${baseEntity.params.warehouseDataScope}
+    </select>
+
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml
new file mode 100644
index 0000000..b055c22
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailFinishMapper.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.job.mydojobdetailfinish.mapper.MydoJobDetailFinishMapper">
+
+    <resultMap type="MydoJobDetail" id="MydoJobDetailFinishResult">
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="layerQuantity"    column="layer_quantity"    />
+        <result property="outLayerQuantity"    column="out_layer_quantity"    />
+        <result property="giveNum"    column="give_num"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="pickQuantity"    column="pick_quantity"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="productName"    column="product_name"    />
+    </resultMap>
+
+
+    <select id="selectMydoJobDetailFinishList" parameterType="MydoJobDetailFinish" resultMap="MydoJobDetailFinishResult">
+        select mjd.job_detail_id,
+        mjd.job_id,
+        mjd.stock_id,
+        mjd.lot_no,
+        mjd.in_date,
+        mjd.in_or_out_id,
+        mjd.in_or_out_d_id,
+        mjd.product_guid,
+        mjd.product_id,
+        mjd.stock_status,
+        mjd.in_quantity,
+        mjd.stock_quantity,
+        mjd.out_quantity,
+        mjd.layer_quantity,
+        mjd.out_layer_quantity,
+        mjd.give_num,
+        mjd.stockin_id,
+        mjd.stacking_id,
+        mjd.exit_id,
+        mjd.print_date,
+        mjd.customer_id,
+        mjd.supplier_id,
+        mjd.spare1,
+        mjd.spare2,
+        mjd.spare3,
+        mjd.spare4,
+        mjd.stockin_detail_id,
+        mjd.pick_quantity,
+        bp.product_name,
+        mjd.spare5,
+        mjd.spare6,
+        mjd.spare7,
+        mjd.spare8,
+        mjd.spare9,
+        mjd.spec,
+        mjd.unit
+        from mydo_job_detail_finish mjd
+        left join bas_product bp on mjd.product_id = bp.product_id
+        <where>
+            <if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id like concat("%", #{jobDetailId}, "%")</if>
+            <if test="jobId != null and jobId != ''"> and mjd.job_id like concat("%", #{jobId}, "%")</if>
+            <if test="stockId != null and stockId != ''"> and mjd.stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="lotNo != null and lotNo != ''"> and mjd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="inDate != null and inDate != ''"> and mjd.in_date like concat("%", #{inDate}, "%")</if>
+            <if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
+            <if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
+            <if test="productGuid != null and productGuid != ''"> and mjd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null and productId != ''"> and mjd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity like concat("%", #{inQuantity}, "%")</if>
+            <if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity like concat("%", #{stockQuantity}, "%")</if>
+            <if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity like concat("%", #{outQuantity}, "%")</if>
+            <if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity like concat("%", #{layerQuantity}, "%")</if>
+            <if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity like concat("%", #{outLayerQuantity}, "%")</if>
+            <if test="giveNum != null and giveNum != ''"> and mjd.give_num like concat("%", #{giveNum}, "%")</if>
+            <if test="stockinId != null and stockinId != ''"> and mjd.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="stackingId != null and stackingId != ''"> and mjd.stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="exitId != null and exitId != ''"> and mjd.exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="printDate != null and printDate != ''"> and mjd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="customerId != null and customerId != ''"> and mjd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="supplierId != null and supplierId != ''"> and mjd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="spare1 != null and spare1 != ''"> and mjd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and mjd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and mjd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and mjd.spare4 like concat("%", #{spare4}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectMydoJobDetailFinishListByJobId" parameterType="String" resultMap="MydoJobDetailFinishResult">
+        select mjd.job_detail_id,
+               mjd.job_id,
+               mjd.stock_id,
+               mjd.lot_no,
+               mjd.in_date,
+               mjd.in_or_out_id,
+               mjd.in_or_out_d_id,
+               mjd.product_guid,
+               mjd.product_id,
+               mjd.stock_status,
+               mjd.in_quantity,
+               mjd.stock_quantity,
+               mjd.out_quantity,
+               mjd.layer_quantity,
+               mjd.out_layer_quantity,
+               mjd.give_num,
+               mjd.stockin_id,
+               mjd.stacking_id,
+               mjd.exit_id,
+               mjd.print_date,
+               mjd.customer_id,
+               mjd.supplier_id,
+               mjd.spare1,
+               mjd.spare2,
+               mjd.spare3,
+               mjd.spare4,
+               mjd.stockin_detail_id,
+               mjd.pick_quantity,
+               mjd.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec,
+               mjd.unit
+        from mydo_job_detail_finish mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
+        where job_id = #{jobId}
+    </select>
+
+    <select id="selectMydoJobDetailFinishByJobDetailId" parameterType="String" resultMap="MydoJobDetailFinishResult">
+        select mjd.job_detail_id,
+               mjd.job_id,
+               mjd.stock_id,
+               mjd.lot_no,
+               mjd.in_date,
+               mjd.in_or_out_id,
+               mjd.in_or_out_d_id,
+               mjd.product_guid,
+               mjd.product_id,
+               mjd.stock_status,
+               mjd.in_quantity,
+               mjd.stock_quantity,
+               mjd.out_quantity,
+               mjd.layer_quantity,
+               mjd.out_layer_quantity,
+               mjd.give_num,
+               mjd.stockin_id,
+               mjd.stacking_id,
+               mjd.exit_id,
+               mjd.print_date,
+               mjd.customer_id,
+               mjd.supplier_id,
+               mjd.spare1,
+               mjd.spare2,
+               mjd.spare3,
+               mjd.spare4,
+               mjd.pick_quantity,
+               bp.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec,
+               mjd.unit
+        from mydo_job_detail_finish mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
+        where job_detail_id = #{jobDetailId}
+    </select>
+
+    <insert id="insertMydoJobDetailFinish" parameterType="MydoJobDetailFinish">
+        insert into mydo_job_detail_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
+            <if test="jobId != null and jobId != ''">job_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="inOrOutId != null">in_or_out_id,</if>
+            <if test="inOrOutDId != null">in_or_out_d_id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="inQuantity != null">in_quantity,</if>
+            <if test="stockQuantity != null">stock_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="layerQuantity != null">layer_quantity,</if>
+            <if test="outLayerQuantity != null">out_layer_quantity,</if>
+            <if test="giveNum != null">give_num,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
+            <if test="jobId != null and jobId != ''">#{jobId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="inOrOutId != null">#{inOrOutId},</if>
+            <if test="inOrOutDId != null">#{inOrOutDId},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="inQuantity != null">#{inQuantity},</if>
+            <if test="stockQuantity != null">#{stockQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="layerQuantity != null">#{layerQuantity},</if>
+            <if test="outLayerQuantity != null">#{outLayerQuantity},</if>
+            <if test="giveNum != null">#{giveNum},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMydoJobDetailFinish" parameterType="MydoJobDetailFinish">
+        update mydo_job_detail_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">job_id = #{jobId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
+            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
+            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="layerQuantity != null">layer_quantity = #{layerQuantity},</if>
+            <if test="outLayerQuantity != null">out_layer_quantity = #{outLayerQuantity},</if>
+            <if test="giveNum != null">give_num = #{giveNum},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+        </trim>
+        where job_detail_id = #{jobDetailId}
+    </update>
+
+    <delete id="deleteMydoJobDetailFinishByJobDetailId" parameterType="String">
+        delete from mydo_job_detail_finish where job_detail_id = #{jobDetailId}
+    </delete>
+
+    <delete id="deleteMydoJobDetailFinishByJobDetailIds" parameterType="String">
+        delete from mydo_job_detail_finish where job_detail_id in
+        <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
+            #{jobDetailId}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml
new file mode 100644
index 0000000..79de6fc
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobDetailMapper.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.job.mydojobdetail.mapper.MydoJobDetailMapper">
+
+    <resultMap type="MydoJobDetail" id="MydoJobDetailResult">
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="layerQuantity"    column="layer_quantity"    />
+        <result property="outLayerQuantity"    column="out_layer_quantity"    />
+        <result property="giveNum"    column="give_num"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="pickQuantity"    column="pick_quantity"    />
+        <result property="pickQuantityReal"    column="pick_quantity_real"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="productName"    column="product_name"    />
+        <result property="trayCode"    column="tray_code"    />
+    </resultMap>
+
+    <select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
+        select mjd.job_detail_id,
+        mjd.job_id,
+        mjd.stock_id,
+        mjd.lot_no,
+        mjd.in_date,
+        mjd.in_or_out_id,
+        mjd.in_or_out_d_id,
+        mjd.product_guid,
+        mjd.product_id,
+        mjd.stock_status,
+        mjd.in_quantity,
+        mjd.stock_quantity,
+        mjd.out_quantity,
+        mjd.layer_quantity,
+        mjd.out_layer_quantity,
+        mjd.give_num,
+        mjd.stockin_id,
+        mjd.stacking_id,
+        mjd.exit_id,
+        mjd.print_date,
+        mjd.customer_id,
+        mjd.supplier_id,
+        mjd.spare1,
+        mjd.spare2,
+        mjd.spare3,
+        mjd.spare4,
+        mjd.stockin_detail_id,
+        mjd.pick_quantity,
+        mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+        mjd.product_name,
+        mjd.spare5,
+        mjd.spare6,
+        mjd.spare7,
+        mjd.spare8,
+        mjd.spare9,
+        mjd.spec,
+        mjd.unit
+
+        from mydo_job_detail mjd
+        left join bas_product bp on mjd.product_id = bp.product_id
+        <where>
+            <if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id like concat("%", #{jobDetailId}, "%")</if>
+            <if test="jobId != null and jobId != ''"> and mjd.job_id like concat("%", #{jobId}, "%")</if>
+            <if test="stockId != null and stockId != ''"> and mjd.stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="lotNo != null and lotNo != ''"> and mjd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="inDate != null and inDate != ''"> and mjd.in_date like concat("%", #{inDate}, "%")</if>
+            <if test="inOrOutId != null and inOrOutId != ''"> and mjd.in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
+            <if test="inOrOutDId != null and inOrOutDId != ''"> and mjd.in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
+            <if test="productGuid != null and productGuid != ''"> and mjd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null and productId != ''"> and mjd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="stockStatus != null and stockStatus != ''"> and mjd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="inQuantity != null and inQuantity != ''"> and mjd.in_quantity like concat("%", #{inQuantity}, "%")</if>
+            <if test="stockQuantity != null and stockQuantity != ''"> and mjd.stock_quantity like concat("%", #{stockQuantity}, "%")</if>
+            <if test="outQuantity != null and outQuantity != ''"> and mjd.out_quantity like concat("%", #{outQuantity}, "%")</if>
+            <if test="layerQuantity != null and layerQuantity != ''"> and mjd.layer_quantity like concat("%", #{layerQuantity}, "%")</if>
+            <if test="outLayerQuantity != null and outLayerQuantity != ''"> and mjd.out_layer_quantity like concat("%", #{outLayerQuantity}, "%")</if>
+            <if test="giveNum != null and giveNum != ''"> and mjd.give_num like concat("%", #{giveNum}, "%")</if>
+            <if test="stockinId != null and stockinId != ''"> and mjd.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="stackingId != null and stackingId != ''"> and mjd.stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="exitId != null and exitId != ''"> and mjd.exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="printDate != null and printDate != ''"> and mjd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="customerId != null and customerId != ''"> and mjd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="supplierId != null and supplierId != ''"> and mjd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="spare1 != null and spare1 != ''"> and mjd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and mjd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and mjd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and mjd.spare4 like concat("%", #{spare4}, "%")</if>
+        </where>
+
+    </select>
+
+    <select id="selectMydoJobDetailByJobDetailId" parameterType="String" resultMap="MydoJobDetailResult">
+        select mjd.job_detail_id,
+               mjd.job_id,
+               mjd.stock_id,
+               mjd.lot_no,
+               mjd.in_date,
+               mjd.in_or_out_id,
+               mjd.in_or_out_d_id,
+               mjd.product_guid,
+               mjd.product_id,
+               mjd.stock_status,
+               mjd.in_quantity,
+               mjd.stock_quantity,
+               mjd.out_quantity,
+               mjd.layer_quantity,
+               mjd.out_layer_quantity,
+               mjd.give_num,
+               mjd.stockin_id,
+               mjd.stacking_id,
+               mjd.exit_id,
+               mjd.print_date,
+               mjd.customer_id,
+               mjd.supplier_id,
+               mjd.spare1,
+               mjd.spare2,
+               mjd.spare3,
+               mjd.spare4,
+               mjd.pick_quantity,
+               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+               bp.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec,
+               mjd.unit
+
+        from mydo_job_detail mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
+        where job_detail_id = #{jobDetailId}
+    </select>
+    <select id="selectMydoJobDetailListByJobId" resultMap="MydoJobDetailResult">
+        select mjd.job_detail_id,
+               mjd.job_id,
+               mjd.stock_id,
+               mjd.lot_no,
+               mjd.in_date,
+               mjd.in_or_out_id,
+               mjd.in_or_out_d_id,
+               mjd.product_guid,
+               mjd.product_id,
+               mjd.stock_status,
+               mjd.in_quantity,
+               mjd.stock_quantity,
+               mjd.out_quantity,
+               mjd.layer_quantity,
+               mjd.out_layer_quantity,
+               mjd.give_num,
+               mjd.stockin_id,
+               mjd.stacking_id,
+               mjd.exit_id,
+               mjd.print_date,
+               mjd.customer_id,
+               mjd.supplier_id,
+               mjd.spare1,
+               mjd.spare2,
+               mjd.spare3,
+               mjd.spare4,
+               mjd.pick_quantity,
+               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+               bp.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec,
+               mjd.unit
+
+        from mydo_job_detail mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
+        where mjd.job_id = #{jobId}
+    </select>
+
+    <insert id="insertMydoJobDetail" parameterType="MydoJobDetail">
+        insert into mydo_job_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
+            <if test="jobId != null and jobId != ''">job_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="inOrOutId != null">in_or_out_id,</if>
+            <if test="inOrOutDId != null">in_or_out_d_id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="inQuantity != null">in_quantity,</if>
+            <if test="stockQuantity != null">stock_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="layerQuantity != null">layer_quantity,</if>
+            <if test="outLayerQuantity != null">out_layer_quantity,</if>
+            <if test="giveNum != null">give_num,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="pickQuantity != null">pick_quantity,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
+            <if test="jobId != null and jobId != ''">#{jobId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="inOrOutId != null">#{inOrOutId},</if>
+            <if test="inOrOutDId != null">#{inOrOutDId},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="inQuantity != null">#{inQuantity},</if>
+            <if test="stockQuantity != null">#{stockQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="layerQuantity != null">#{layerQuantity},</if>
+            <if test="outLayerQuantity != null">#{outLayerQuantity},</if>
+            <if test="giveNum != null">#{giveNum},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="pickQuantity != null">#{pick_quantity},</if>
+         </trim>
+    </insert>
+    <insert id="insertHistory">
+        insert into mydo_job_detail_finish select * from mydo_job_detail where job_id = #{jobId}
+    </insert>
+
+    <update id="updateMydoJobDetail" parameterType="MydoJobDetail">
+        update mydo_job_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">job_id = #{jobId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
+            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
+            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="layerQuantity != null">layer_quantity = #{layerQuantity},</if>
+            <if test="outLayerQuantity != null">out_layer_quantity = #{outLayerQuantity},</if>
+            <if test="giveNum != null">give_num = #{giveNum},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="pickQuantity != null">pick_quantity = #{pickQuantity},</if>
+        </trim>
+        where job_detail_id = #{jobDetailId}
+    </update>
+
+    <delete id="deleteMydoJobDetailByJobDetailId" parameterType="String">
+        delete from mydo_job_detail where job_detail_id = #{jobDetailId}
+    </delete>
+
+    <delete id="deleteMydoJobDetailByJobDetailIds" parameterType="String">
+        delete from mydo_job_detail where job_detail_id in
+        <foreach item="jobDetailId" collection="array" open="(" separator="," close=")">
+            #{jobDetailId}
+        </foreach>
+    </delete>
+    <delete id="deleteMydoJobDetailByJobId">
+        delete from mydo_job_detail where job_id = #{jobId}
+    </delete>
+
+    <select id="selectMydoJobDetailListByTrayCode" parameterType="MydoJob" resultMap="MydoJobDetailResult">
+        select mjd.job_detail_id,
+               mjd.job_id,
+               mjd.stock_id,
+               mjd.lot_no,
+               mjd.in_date,
+               mjd.in_or_out_id,
+               mjd.in_or_out_d_id,
+               mjd.product_guid,
+               mjd.product_id,
+               mjd.stock_status,
+               mjd.in_quantity,
+               mjd.stock_quantity,
+               mjd.out_quantity,
+               mjd.layer_quantity,
+               mjd.out_layer_quantity,
+               mjd.give_num,
+               mjd.stockin_id,
+               mjd.stacking_id,
+               mjd.exit_id,
+               mjd.print_date,
+               mjd.customer_id,
+               mjd.supplier_id,
+               mjd.spare1,
+               mjd.spare2,
+               mjd.spare3,
+               mjd.spare4,
+               mjd.pick_quantity,
+               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+               mjd.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec,
+               mjd.unit,
+               mj.tray_code
+
+        from mydo_job_detail mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
+        left join mydo_job mj on mjd.job_id = mj.job_id
+        where mj.tray_code=#{trayCode}
+        and mj.status='3'
+
+
+    </select>
+    <select id="selectPdMydoJobDetailListByExit" parameterType="MydoJob" resultMap="MydoJobDetailResult">
+        select mjd.job_detail_id,
+               mjd.job_id,
+               mjd.stock_id,
+               mjd.lot_no,
+               mjd.in_date,
+               mjd.in_or_out_id,
+               mjd.in_or_out_d_id,
+               mjd.product_guid,
+               mjd.product_id,
+               mjd.stock_status,
+               mjd.in_quantity,
+               mjd.stock_quantity,
+               mjd.out_quantity,
+               mjd.layer_quantity,
+               mjd.out_layer_quantity,
+               mjd.give_num,
+               mjd.stockin_id,
+               mjd.stacking_id,
+               mjd.exit_id,
+               mjd.print_date,
+               mjd.customer_id,
+               mjd.supplier_id,
+               mjd.spare1,
+               mjd.spare2,
+               mjd.spare3,
+               mjd.spare4,
+               mjd.pick_quantity,
+               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+               bp.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec,
+               mjd.unit,
+               mj.tray_code
+
+        from mydo_job_detail mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
+                 left join mydo_job mj on mjd.job_id = mj.job_id
+        where mj.exit_id=#{exitId}
+          and mj.status='3'
+          and mj.execution_phase=2
+          and mj.in_or_out like concat("%", #{inOrOut}, "%")
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml
new file mode 100644
index 0000000..6c88e70
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobFinishMapper.xml
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.job.mydojobfinish.mapper.MydoJobFinishMapper">
+
+    <resultMap type="MydoJob" id="MydoJobFinishResult">
+        <result property="jobId"    column="job_id"    />
+        <result property="status"    column="status"    />
+        <result property="onLineType"    column="on_line_type"    />
+        <result property="taskNo"    column="task_no"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="departmentId"    column="department_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="targetRoadwayId"    column="target_roadway_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
+        <result property="lineId"    column="line_id"    />
+        <result property="workshopId"    column="workshop_id"    />
+        <result property="priority"    column="priority"    />
+        <result property="executionPhase"    column="execution_phase"    />
+        <result property="inOrOut"    column="in_or_out"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="entranceId"    column="entrance_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="classId"    column="class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="faultFlag"    column="fault_flag"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="targetCargoSpaceName"    column="target_cargo_space_name"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="departmentName"    column="dept_name"    />
+    </resultMap>
+
+
+    <sql id="selectMydoJobFinishVo">
+        select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
+               mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
+               mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
+               mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
+               mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
+               bs.supplier_name as supplier_name, bc.customer_name as customer_name,
+               bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
+               bw.warehouse_name as warehouse_name,sd.dept_name
+        from mydo_job_finish mj
+                 left join bas_supplier bs on mj.supplier_id = bs.id
+                 left join bas_customer bc on mj.customer_id = bc.id
+                 left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
+                 left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
+                 left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
+                 left join sys_dept sd on mj.department_id = sd.dept_id
+    </sql>
+
+    <select id="selectMydoJobFinishList" parameterType="MydoJobFinish" resultMap="MydoJobFinishResult">
+        <include refid="selectMydoJobFinishVo"/>
+        <where>
+            <if test="jobId != null  and jobId != ''"> and mj.job_id like concat("%", #{jobId}, "%")</if>
+            <if test="status != null  and status != ''"> and mj.status like concat("%", #{status}, "%")</if>
+            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type like concat("%", #{onLineType}, "%")</if>
+            <if test="taskNo != null  and taskNo != ''"> and mj.task_no like concat("%", #{taskNo}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and mj.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="departmentId != null  and departmentId != ''"> and mj.department_id like concat("%", #{departmentId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
+            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat("%", #{lineId}, "%")</if>
+            <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
+            <if test="priority != null "> and mj.priority like concat("%", #{priority}, "%")</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase like concat("%", #{executionPhase}, "%")</if>
+            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out like concat("%", #{inOrOut}, "%")</if>
+            <if test="startTime != null  and startTime != ''"> and mj.start_time like concat('%', #{startTime}, '%')</if>
+            <if test="finishTime != null  and finishTime != ''"> and mj.finish_time like concat('%', #{finishTime}, '%')</if>
+            <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat("%", #{entranceId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="classId != null  and classId != ''"> and mj.class_id like concat("%", #{classId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag like concat("%", #{faultFlag}, "%")</if>
+            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20</if>
+            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20</if>
+            <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (25,26)</if>
+            <if test = "inOutIds !=null and inOutIds.size() > 0">
+                and mj.in_or_out in
+                <foreach item="item" index="index" collection="inOutIds" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by mj.create_time desc
+    </select>
+
+    <select id="selectMydoJobFinishListByMydoJob" parameterType="MydoJob" resultMap="MydoJobFinishResult">
+        select distinct mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
+        mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
+        mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
+        mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
+        mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
+        bs.supplier_name as supplier_name, bc.customer_name as customer_name,
+        bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
+        bw.warehouse_name as warehouse_name
+        from mydo_job_finish mj
+        left join bas_supplier bs on mj.supplier_id = bs.id
+        left join bas_customer bc on mj.customer_id = bc.id
+        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
+        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
+        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
+        left join mydo_job_detail mjd on mj.job_id = mjd.job_id
+
+        <where>
+            <if test="jobId != null  and jobId != ''"> and mj.job_id like concat("%", #{jobId}, "%")</if>
+            <if test="status != null  and status != ''"> and mj.status like concat("%", #{status}, "%")</if>
+            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type like concat("%", #{onLineType}, "%")</if>
+            <if test="taskNo != null  and taskNo != ''"> and mj.task_no like concat("%", #{taskNo}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and mj.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="departmentId != null  and departmentId != ''"> and mj.department_id like concat("%", #{departmentId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
+            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
+            <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
+            <if test="priority != null "> and mj.priority like concat("%", #{priority}, "%")</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase like concat("%", #{executionPhase}, "%")</if>
+            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out like concat("%", #{inOrOut}, "%")</if>
+            <if test="startTime != null  and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
+            <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat("%", #{entranceId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="classId != null  and classId != ''"> and mj.class_id like concat("%", #{classId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag like concat("%", #{faultFlag}, "%")</if>
+            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 and mj.in_or_out not in(28)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 and mj.in_or_out not in(5,6)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
+            <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
+            order by mj.create_time desc
+        </where>
+
+    </select>
+
+    <select id="selectMydoJobFinishByJobId" parameterType="String" resultMap="MydoJobFinishResult">
+        <include refid="selectMydoJobFinishVo"/>
+        where mj.job_id = #{jobId}
+    </select>
+
+    <insert id="insertMydoJobFinish" parameterType="MydoJobFinish">
+        insert into mydo_job_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">job_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="onLineType != null">on_line_type,</if>
+            <if test="taskNo != null and taskNo != ''">task_no,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="departmentId != null">department_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="targetRoadwayId != null">target_roadway_id,</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
+            <if test="lineId != null">line_id,</if>
+            <if test="workshopId != null">workshop_id,</if>
+            <if test="priority != null">priority,</if>
+            <if test="executionPhase != null">execution_phase,</if>
+            <if test="inOrOut != null">in_or_out,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="entranceId != null">entrance_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="faultFlag != null">fault_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">#{jobId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="onLineType != null">#{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="departmentId != null">#{departmentId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
+            <if test="lineId != null">#{lineId},</if>
+            <if test="workshopId != null">#{workshopId},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="executionPhase != null">#{executionPhase},</if>
+            <if test="inOrOut != null">#{inOrOut},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="entranceId != null">#{entranceId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="faultFlag != null">#{faultFlag},</if>
+         </trim>
+    </insert>
+
+    <update id="updateMydoJobFinish" parameterType="MydoJobFinish">
+        update mydo_job_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="onLineType != null">on_line_type = #{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
+            <if test="lineId != null">line_id = #{lineId},</if>
+            <if test="workshopId != null">workshop_id = #{workshopId},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
+            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="entranceId != null">entrance_id = #{entranceId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
+        </trim>
+        where job_id = #{jobId}
+    </update>
+
+    <delete id="deleteMydoJobFinishByJobId" parameterType="String">
+        delete from mydo_job_finish where job_id = #{jobId}
+    </delete>
+
+    <delete id="deleteMydoJobFinishByJobIds" parameterType="String">
+        delete from mydo_job_finish where job_id in
+        <foreach item="jobId" collection="array" open="(" separator="," close=")">
+            #{jobId}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml
new file mode 100644
index 0000000..f5d0891
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/job/MydoJobMapper.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.job.mydojob.mapper.MydoJobMapper">
+
+    <resultMap type="MydoJob" id="MydoJobResult">
+        <result property="jobId"    column="job_id"    />
+        <result property="status"    column="status"    />
+        <result property="onLineType"    column="on_line_type"    />
+        <result property="taskNo"    column="task_no"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="departmentId"    column="department_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="targetRoadwayId"    column="target_roadway_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
+        <result property="lineId"    column="line_id"    />
+        <result property="workshopId"    column="workshop_id"    />
+        <result property="priority"    column="priority"    />
+        <result property="executionPhase"    column="execution_phase"    />
+        <result property="inOrOut"    column="in_or_out"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="entranceId"    column="entrance_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="classId"    column="class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="faultFlag"    column="fault_flag"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="targetCargoSpaceName"    column="target_cargo_space_name"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+
+    </resultMap>
+
+    <sql id="selectMydoJobVo">
+        select mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
+               mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
+               mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
+               mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
+               mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
+               bs.supplier_name as supplier_name, bc.customer_name as customer_name,
+               bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
+               bw.warehouse_name as warehouse_name
+        from mydo_job mj
+        left join bas_supplier bs on mj.supplier_id = bs.id
+        left join bas_customer bc on mj.customer_id = bc.id
+        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
+        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
+        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
+
+
+    </sql>
+
+    <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">
+        select distinct mj.job_id, mj.status, mj.on_line_type, mj.task_no, mj.supplier_id,
+        mj.customer_id, mj.department_id, mj.tray_code, mj.roadway_id, mj.cargo_space_id,
+        mj.target_roadway_id, mj.target_cargo_space_id, mj.line_id, mj.workshop_id, mj.priority,
+        mj.execution_phase, mj.in_or_out, mj.create_time, mj.start_time, mj.finish_time, mj.entrance_id,
+        mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
+        bs.supplier_name as supplier_name, bc.customer_name as customer_name,
+        bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
+        bw.warehouse_name as warehouse_name
+        from mydo_job mj
+        left join bas_supplier bs on mj.supplier_id = bs.id
+        left join bas_customer bc on mj.customer_id = bc.id
+        left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
+        left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
+        left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
+        left join mydo_job_detail mjd on mj.job_id = mjd.job_id
+
+        <where>
+            <if test="jobId != null  and jobId != ''"> and mj.job_id like concat("%", #{jobId}, "%")</if>
+            <if test="status != null  and status != ''"> and mj.status like concat("%", #{status}, "%")</if>
+            <if test="onLineType != null  and onLineType != ''"> and mj.on_line_type like concat("%", #{onLineType}, "%")</if>
+            <if test="taskNo != null  and taskNo != ''"> and mj.task_no like concat("%", #{taskNo}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and mj.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and mj.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="departmentId != null  and departmentId != ''"> and mj.department_id like concat("%", #{departmentId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and mj.tray_code like concat('%',#{trayCode},'%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and mj.roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and mj.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and mj.target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and mj.target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
+            <if test="lineId != null  and lineId != ''"> and mj.line_id like concat('%', #{lineId}, '%') </if>
+            <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
+            <if test="priority != null "> and mj.priority like concat("%", #{priority}, "%")</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and mj.execution_phase like concat("%", #{executionPhase}, "%")</if>
+            <if test="inOrOut != null  and inOrOut != ''"> and mj.in_or_out like concat("%", #{inOrOut}, "%")</if>
+            <if test="startTime != null  and startTime != ''"> and mj.create_time &gt;= #{startTime}</if>
+            <if test="finishTime != null  and finishTime != ''"> and mj.create_time &lt;= #{finishTime}</if>
+            <if test="entranceId != null  and entranceId != ''"> and mj.entrance_id like concat('%',#{entranceId},'%')</if>
+            <if test="exitId != null  and exitId != ''"> and mj.exit_id like concat('%', #{exitId}, '%')</if>
+            <if test="classId != null  and classId != ''"> and mj.class_id like concat("%", #{classId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and mj.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="faultFlag != null  and faultFlag != ''"> and mj.fault_flag like concat("%", #{faultFlag}, "%")</if>
+            <if test="inOut != null  and inOut != '' and inOut =='2'.toString "> and mj.in_or_out >=20 </if>
+            <if test="inOut != null  and inOut != '' and inOut =='1'.toString "> and mj.in_or_out &lt; 20 </if>
+            <if test="inOut != null  and inOut != '' and inOut =='3'.toString "> and mj.in_or_out in (5,6)</if>
+            <if test="inOut != null  and inOut != '' and inOut =='4'.toString "> and mj.in_or_out in (28)</if>
+            <if test="productId != null  and productId != ''"> and  mjd.product_id like concat('%', #{productId}, '%')</if>
+        </where>
+        order by mj.create_time desc
+    </select>
+
+    <select id="selectMydoJobByJobId" parameterType="String" resultMap="MydoJobResult">
+        <include refid="selectMydoJobVo"/>
+        where mj.job_id = #{jobId}
+    </select>
+
+    <insert id="insertMydoJob" parameterType="MydoJob">
+        insert into mydo_job
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">job_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="onLineType != null">on_line_type,</if>
+            <if test="taskNo != null and taskNo != ''">task_no,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="departmentId != null">department_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="targetRoadwayId != null">target_roadway_id,</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
+            <if test="lineId != null">line_id,</if>
+            <if test="workshopId != null">workshop_id,</if>
+            <if test="priority != null">priority,</if>
+            <if test="executionPhase != null">execution_phase,</if>
+            <if test="inOrOut != null">in_or_out,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="entranceId != null">entrance_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="faultFlag != null">fault_flag,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">#{jobId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="onLineType != null">#{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="departmentId != null">#{departmentId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
+            <if test="lineId != null">#{lineId},</if>
+            <if test="workshopId != null">#{workshopId},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="executionPhase != null">#{executionPhase},</if>
+            <if test="inOrOut != null">#{inOrOut},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="entranceId != null">#{entranceId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="faultFlag != null">#{faultFlag},</if>
+         </trim>
+    </insert>
+    <insert id="insertHistory">
+        insert into mydo_job_finish
+        select * from mydo_job where job_id = #{jobId}
+    </insert>
+
+    <update id="updateMydoJob" parameterType="MydoJob">
+        update mydo_job
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="onLineType != null">on_line_type = #{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
+            <if test="lineId != null">line_id = #{lineId},</if>
+            <if test="workshopId != null">workshop_id = #{workshopId},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
+            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="entranceId != null">entrance_id = #{entranceId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
+        </trim>
+        where job_id = #{jobId}
+    </update>
+    <select id="ykCompleted" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_yk_complete(
+                #{v_job_id,jdbcType=VARCHAR,mode=IN},
+                #{v_result,mode=OUT,jdbcType=INTEGER}
+              )}
+    </select>
+
+    <delete id="deleteMydoJobByJobId" parameterType="String">
+        delete from mydo_job where job_id = #{jobId}
+    </delete>
+
+    <delete id="deleteMydoJobByJobIds" parameterType="String">
+        delete from mydo_job where job_id in
+        <foreach item="jobId" collection="array" open="(" separator="," close=")">
+            #{jobId}
+        </foreach>
+    </delete>
+
+    <select id="selectCurrentTasks" resultMap="MydoJobResult">
+        <include refid="selectMydoJobVo"/>
+        where mj.status = '3'
+    </select>
+
+    <select id="pointOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_point_out(
+        #{v_tray_code,jdbcType=VARCHAR,mode=IN},
+        #{v_exit_id,jdbcType=VARCHAR,mode=IN},
+        #{v_result,mode=OUT,jdbcType=INTEGER},
+        #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+    <select id="selectByTrayCode" resultMap="MydoJobResult">
+        <include refid="selectMydoJobVo"/>
+        where mj.tray_code = #{trayCode}
+    </select>
+
+    <select id="selectMydoJobByEntranceId" parameterType="MydoJob" resultMap="MydoJobResult">
+        select top(1)* from mydo_job mj
+        where in_or_out&lt;20 and mj.entrance_id like concat("%", #{entranceId}, "%")
+          and mj.status like concat("%", #{status}, "%")
+        <if test="lineId != null  and lineId != ''"> and mj.line_id like concat("%", #{lineId}, "%")</if>
+        <if test="workshopId != null  and workshopId != ''"> and mj.workshop_id like concat("%", #{workshopId}, "%")</if>
+        order by mj.create_time
+    </select>
+
+    <select id="getInJobBySerial" parameterType="String" resultMap="MydoJobResult">
+        select * from mydo_job where tray_code=#{trayCode}
+    </select>
+
+    <select id="manualCompleted" parameterType="java.util.Map"  statementType="CALLABLE">
+        {call proc_complete_in_job(
+        #{v_job_id,jdbcType=VARCHAR,mode=IN},
+        #{v_result,mode=OUT,jdbcType=INTEGER},
+        #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+    <select id="selectInJobByTrayCode" parameterType="String" resultMap="MydoJobResult">
+        select * from mydo_job where tray_code = #{trayCode}
+    </select>
+
+    <select id="selectInJobByTaskNo" parameterType="String" resultMap="MydoJobResult">
+        select * from mydo_job where task_no = #{taskNo}
+    </select>
+
+
+    <select id="allotInJobSpace" parameterType="java.util.Map"  statementType="CALLABLE">
+        {call proc_allot_space(
+                #{v_tray_code,jdbcType=VARCHAR,mode=IN},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml
new file mode 100644
index 0000000..df959ea
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/mp/UserlMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mp.mapper.UserMapper">
+
+
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml
new file mode 100644
index 0000000..580156d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutExceptionRecordMapper.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.exception.mapper.OutExceptionRecordMapper">
+    
+    <resultMap type="OutExceptionRecord" id="OutExceptionRecordResult">
+        <result property="outGuid"    column="out_guid"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="productId"    column="product_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectOutExceptionRecordVo">
+        select out_guid, warehouse_id, stock_id, tray_code, product_id, spare1, spare2, spare3 from out_exception_record
+    </sql>
+
+    <select id="selectOutExceptionRecordList" parameterType="OutExceptionRecord" resultMap="OutExceptionRecordResult">
+        <include refid="selectOutExceptionRecordVo"/>
+        <where>  
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectOutExceptionRecordByOutGuid" parameterType="Long" resultMap="OutExceptionRecordResult">
+        <include refid="selectOutExceptionRecordVo"/>
+        where out_guid = #{outGuid}
+    </select>
+
+    <insert id="insertOutExceptionRecord" parameterType="OutExceptionRecord" useGeneratedKeys="true" keyProperty="outGuid">
+        insert into out_exception_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateOutExceptionRecord" parameterType="OutExceptionRecord">
+        update out_exception_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where out_guid = #{outGuid}
+    </update>
+
+    <delete id="deleteOutExceptionRecordByOutGuid" parameterType="Long">
+        delete from out_exception_record where out_guid = #{outGuid}
+    </delete>
+
+    <delete id="deleteOutExceptionRecordByOutGuids" parameterType="String">
+        delete from out_exception_record where out_guid in 
+        <foreach item="outGuid" collection="array" open="(" separator="," close=")">
+            #{outGuid}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml
new file mode 100644
index 0000000..eb17b7e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutPickSubmitMapper.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.submit.mapper.OutPickSubmitMapper">
+    
+    <resultMap type="OutPickSubmit" id="OutPickSubmitResult">
+        <result property="id"    column="id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+    </resultMap>
+
+    <sql id="selectOutPickSubmitVo">
+        select id, tray_code, job_id, job_detail_id, product_id, quantity, warehouse_id, exit_id, spare1, spare2, spare3 from out_pick_submit
+    </sql>
+
+    <select id="selectOutPickSubmitList" parameterType="OutPickSubmit" resultMap="OutPickSubmitResult">
+        <include refid="selectOutPickSubmitVo"/>
+        <where>  
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
+            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat("%", #{jobDetailId}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectOutPickSubmitById" parameterType="Long" resultMap="OutPickSubmitResult">
+        <include refid="selectOutPickSubmitVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertOutPickSubmit" parameterType="OutPickSubmit" useGeneratedKeys="true" keyProperty="id">
+        insert into out_pick_submit
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="trayCode != null">tray_code,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="jobDetailId != null">job_detail_id,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="jobDetailId != null">#{jobDetailId},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+         </trim>
+    </insert>
+
+    <update id="updateOutPickSubmit" parameterType="OutPickSubmit">
+        update out_pick_submit
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="jobDetailId != null">job_detail_id = #{jobDetailId},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteOutPickSubmitById" parameterType="Long">
+        delete from out_pick_submit where id = #{id}
+    </delete>
+
+    <delete id="deleteOutPickSubmitByIds" parameterType="String">
+        delete from out_pick_submit where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml
new file mode 100644
index 0000000..6cfc269
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutBackMapper.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.outStockoutBack.mapper.OutStockoutBackMapper">
+    
+    <resultMap type="OutStockoutBack" id="OutStockoutBackResult">
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="outType"    column="out_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="stockoutSource"    column="stockout_source"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="classNowId"    column="class_now_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="carNumber"    column="car_number"    />
+        <result property="FID"    column="FID"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="sendStatus"    column="send_status"    />
+        <result property="sendTime"    column="send_time"    />
+        <result property="msg"    column="msg"    />
+        <result property="companyShortName"    column="company_short_name"    />
+        <result property="accountSetNo"    column="account_set_no"    />
+    </resultMap>
+
+    <sql id="selectOutStockoutBackVo">
+        select stockout_guid,
+               stockout_id,
+               out_type,
+               create_date,
+               department_no,
+               customer_no,
+               create_man_id,
+               status,
+               stockout_source,
+               warehouse_id,
+               class_now_id,
+               exit_id,
+               car_number,
+               FID,
+               erp_stockout_id,
+               start_date,
+               finish_date,
+               spare1,
+               spare2,
+               spare3,
+               spare4,
+               spare5,
+               spare6,
+               spare7,
+               spare8,
+               send_status,
+               send_time,
+               msg,
+               company_short_name,
+               account_set_no
+        from out_stockout_back
+    </sql>
+
+    <select id="selectOutStockoutBackList" parameterType="OutStockoutBack" resultMap="OutStockoutBackResult">
+        <include refid="selectOutStockoutBackVo"/>
+        <where>  
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="outType != null  and outType != ''"> and out_type like concat("%", #{outType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat("%", #{stockoutSource}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="classNowId != null  and classNowId != ''"> and class_now_id like concat("%", #{classNowId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="carNumber != null  and carNumber != ''"> and car_number like concat("%", #{carNumber}, "%")</if>
+            <if test="FID != null  and FID != ''"> and FID like concat("%", #{FID}, "%")</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
+            <if test="startDate != null  and startDate != ''"> and start_date like concat("%", #{startDate}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
+            <if test="sendStatus != null  and sendStatus != ''"> and send_status like concat("%", #{sendStatus}, "%")</if>
+            <if test="sendTime != null  and sendTime != ''"> and send_time like concat("%", #{sendTime}, "%")</if>
+            <if test="msg != null  and msg != ''"> and msg like concat("%", #{msg}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectOutStockoutBackByStockoutGuid" parameterType="String" resultMap="OutStockoutBackResult">
+        <include refid="selectOutStockoutBackVo"/>
+        where stockout_guid = #{stockoutGuid}
+    </select>
+
+    <select id="selelctTopOutStockout" resultMap="OutStockoutBackResult">
+        select top(1)* from out_stockout_back where send_status=0 and stockout_source = 1
+    </select>
+
+    <insert id="insertOutStockoutBack" parameterType="OutStockoutBack">
+        insert into out_stockout_back
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
+            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
+            <if test="outType != null and outType != ''">out_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="stockoutSource != null">stockout_source,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="classNowId != null">class_now_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="carNumber != null">car_number,</if>
+            <if test="FID != null">FID,</if>
+            <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="sendStatus != null">send_status,</if>
+            <if test="sendTime != null">send_time,</if>
+            <if test="msg != null">msg,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
+            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
+            <if test="outType != null and outType != ''">#{outType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="stockoutSource != null">#{stockoutSource},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="classNowId != null">#{classNowId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="carNumber != null">#{carNumber},</if>
+            <if test="FID != null">#{FID},</if>
+            <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="sendStatus != null">#{sendStatus},</if>
+            <if test="sendTime != null">#{sendTime},</if>
+            <if test="msg != null">#{msg},</if>
+         </trim>
+    </insert>
+
+    <update id="updateOutStockoutBack" parameterType="OutStockoutBack">
+        update out_stockout_back
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
+            <if test="outType != null and outType != ''">out_type = #{outType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="classNowId != null">class_now_id = #{classNowId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="carNumber != null">car_number = #{carNumber},</if>
+            <if test="FID != null">FID = #{FID},</if>
+            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="sendStatus != null">send_status = #{sendStatus},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
+            <if test="msg != null">msg = #{msg},</if>
+        </trim>
+        where stockout_guid = #{stockoutGuid}
+    </update>
+
+    <delete id="deleteOutStockoutBackByStockoutGuid" parameterType="String">
+        delete from out_stockout_back where stockout_guid = #{stockoutGuid}
+    </delete>
+
+    <delete id="deleteOutStockoutBackByStockoutGuids" parameterType="String">
+        delete from out_stockout_back where stockout_guid in 
+        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
+            #{stockoutGuid}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml
new file mode 100644
index 0000000..89dc8cc
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailBackMapper.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.outStockoutDetailBack.mapper.OutStockoutDetailBackMapper">
+
+    <resultMap type="OutStockoutDetailBack" id="OutStockoutDetailBackResult">
+        <result property="stockoutDetailId" column="stockout_detail_id"/>
+        <result property="stockoutGuid" column="stockout_guid"/>
+        <result property="stockoutId" column="stockout_id"/>
+        <result property="lotNo" column="lot_no"/>
+        <result property="productGuid" column="product_guid"/>
+        <result property="productId" column="product_id"/>
+        <result property="quantity" column="quantity"/>
+        <result property="quantityX" column="quantity_x"/>
+        <result property="quantityJ" column="quantity_j"/>
+        <result property="assignNum" column="assign_num"/>
+        <result property="assignNumX" column="assign_num_x"/>
+        <result property="assignNumJ" column="assign_num_j"/>
+        <result property="allotQuantity" column="allot_quantity"/>
+        <result property="allotQuantityX" column="allot_quantity_x"/>
+        <result property="allotQuantityJ" column="allot_quantity_j"/>
+        <result property="price" column="price"/>
+        <result property="remark" column="remark"/>
+        <result property="warehouseId" column="warehouse_id"/>
+        <result property="outId" column="out_id"/>
+        <result property="bukechaiQuantity" column="bukechai_quantity"/>
+        <result property="kechaiQuantity" column="kechai_quantity"/>
+        <result property="entryid" column="entryid"/>
+        <result property="flatQuantity" column="flat_quantity"/>
+        <result property="fid" column="fid"/>
+        <result property="erpStockoutId" column="erp_stockout_id"/>
+        <result property="unit" column="unit"/>
+        <result property="spec" column="spec"/>
+        <result property="productName" column="product_name"/>
+        <result property="spare1" column="spare1"/>
+        <result property="spare2" column="spare2"/>
+        <result property="spare3" column="spare3"/>
+        <result property="spare4" column="spare4"/>
+        <result property="spare5" column="spare5"/>
+        <result property="spare6" column="spare6"/>
+        <result property="spare7" column="spare7"/>
+        <result property="spare8" column="spare8"/>
+        <result property="spare9" column="spare9"/>
+        <result property="sendStatus" column="send_status"/>
+        <result property="sendTime" column="send_time"/>
+        <result property="msg" column="msg"/>
+        <result property="sourceLineId" column="source_line_id"/>
+        <result property="barCode" column="bar_code"/>
+        <result property="isBatchManage" column="is_batch_manage"/>
+        <result property="oldProjectNo" column="old_project_no"/>
+    </resultMap>
+
+    <sql id="selectOutStockoutDetailBackVo">
+        select stockout_detail_id,
+               stockout_guid,
+               stockout_id,
+               lot_no,
+               product_guid,
+               product_id,
+               quantity,
+               quantity_x,
+               quantity_j,
+               assign_num,
+               assign_num_x,
+               assign_num_j,
+               allot_quantity,
+               allot_quantity_x,
+               allot_quantity_j,
+               price,
+               remark,
+               warehouse_id,
+               out_id,
+               bukechai_quantity,
+               kechai_quantity,
+               entryid,
+               flat_quantity,
+               fid,
+               erp_stockout_id,
+               unit,
+               spec,
+               product_name,
+               spare1,
+               spare2,
+               spare3,
+               spare4,
+               spare5,
+               spare6,
+               spare7,
+               spare8,
+               spare9,
+               send_status,
+               send_time,
+               msg,
+               source_line_id,
+               bar_code,
+               is_batch_manage,
+               old_project_no
+        from out_stockout_detail_back
+    </sql>
+
+    <select id="selectOutStockoutDetailBackList" parameterType="OutStockoutDetailBack"
+            resultMap="OutStockoutDetailBackResult">
+        <include refid="selectOutStockoutDetailBackVo"/>
+        <where>
+            <if test="stockoutDetailId != null  and stockoutDetailId != ''">and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")
+            </if>
+            <if test="stockoutGuid != null  and stockoutGuid != ''">and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''">and stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''">and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''">and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''">and product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null ">and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null ">and quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null ">and quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="assignNum != null ">and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null ">and assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null ">and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="allotQuantity != null ">and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
+            <if test="allotQuantityX != null ">and allot_quantity_x like concat("%", #{allotQuantityX}, "%")</if>
+            <if test="allotQuantityJ != null ">and allot_quantity_j like concat("%", #{allotQuantityJ}, "%")</if>
+            <if test="price != null  and price != ''">and price like concat("%", #{price}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''">and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="outId != null  and outId != ''">and out_id like concat("%", #{outId}, "%")</if>
+            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''">and bukechai_quantity like concat("%", #{bukechaiQuantity}, "%")
+            </if>
+            <if test="kechaiQuantity != null  and kechaiQuantity != ''">and kechai_quantity like concat("%", #{kechaiQuantity}, "%")</if>
+            <if test="entryid != null  and entryid != ''">and entryid like concat("%", #{entryid}, "%")</if>
+            <if test="flatQuantity != null  and flatQuantity != ''">and flat_quantity like concat("%", #{flatQuantity}, "%")</if>
+            <if test="fid != null  and fid != ''">and fid like concat("%", #{fid}, "%")</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''">and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
+            <if test="unit != null  and unit != ''">and unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''">and spec like concat("%", #{spec}, "%")</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="spare1 != null  and spare1 != ''">and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''">and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''">and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''">and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''">and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''">and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="spare7 != null  and spare7 != ''">and spare7 like concat("%", #{spare7}, "%")</if>
+            <if test="spare8 != null  and spare8 != ''">and spare8 like concat("%", #{spare8}, "%")</if>
+            <if test="spare9 != null  and spare9 != ''">and spare9 like concat("%", #{spare9}, "%")</if>
+            <if test="sendStatus != null  and sendStatus != ''">and send_status like concat("%", #{sendStatus}, "%")</if>
+            <if test="sendTime != null  and sendTime != ''">and send_time like concat("%", #{sendTime}, "%")</if>
+            <if test="msg != null  and msg != ''">and msg like concat("%", #{msg}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectOutStockoutDetailBackByStockoutDetailId" parameterType="String"
+            resultMap="OutStockoutDetailBackResult">
+        <include refid="selectOutStockoutDetailBackVo"/>
+        where stockout_detail_id = #{stockoutDetailId}
+    </select>
+
+    <insert id="insertOutStockoutDetailBack" parameterType="OutStockoutDetailBack">
+        insert into out_stockout_detail_back
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
+            <if test="stockoutGuid != null">stockout_guid,</if>
+            <if test="stockoutId != null">stockout_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="allotQuantity != null">allot_quantity,</if>
+            <if test="allotQuantityX != null">allot_quantity_x,</if>
+            <if test="allotQuantityJ != null">allot_quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="remark != null">remark,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="outId != null">out_id,</if>
+            <if test="bukechaiQuantity != null">bukechai_quantity,</if>
+            <if test="kechaiQuantity != null">kechai_quantity,</if>
+            <if test="entryid != null">entryid,</if>
+            <if test="flatQuantity != null">flat_quantity,</if>
+            <if test="fid != null">fid,</if>
+            <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="sendStatus != null">send_status,</if>
+            <if test="sendTime != null">send_time,</if>
+            <if test="msg != null">msg,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
+            <if test="stockoutGuid != null">#{stockoutGuid},</if>
+            <if test="stockoutId != null">#{stockoutId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="allotQuantity != null">#{allotQuantity},</if>
+            <if test="allotQuantityX != null">#{allotQuantityX},</if>
+            <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="outId != null">#{outId},</if>
+            <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
+            <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
+            <if test="entryid != null">#{entryid},</if>
+            <if test="flatQuantity != null">#{flatQuantity},</if>
+            <if test="fid != null">#{fid},</if>
+            <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="sendStatus != null">#{sendStatus},</if>
+            <if test="sendTime != null">#{sendTime},</if>
+            <if test="msg != null">#{msg},</if>
+        </trim>
+    </insert>
+
+    <update id="updateOutStockoutDetailBack" parameterType="OutStockoutDetailBack">
+        update out_stockout_detail_back
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutGuid != null">stockout_guid = #{stockoutGuid},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
+            <if test="allotQuantityX != null">allot_quantity_x = #{allotQuantityX},</if>
+            <if test="allotQuantityJ != null">allot_quantity_j = #{allotQuantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="outId != null">out_id = #{outId},</if>
+            <if test="bukechaiQuantity != null">bukechai_quantity = #{bukechaiQuantity},</if>
+            <if test="kechaiQuantity != null">kechai_quantity = #{kechaiQuantity},</if>
+            <if test="entryid != null">entryid = #{entryid},</if>
+            <if test="flatQuantity != null">flat_quantity = #{flatQuantity},</if>
+            <if test="fid != null">fid = #{fid},</if>
+            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="sendStatus != null">send_status = #{sendStatus},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
+            <if test="msg != null">msg = #{msg},</if>
+        </trim>
+        where stockout_id = #{stockoutId}
+    </update>
+
+    <delete id="deleteOutStockoutDetailBackByStockoutDetailId" parameterType="String">
+        delete
+        from out_stockout_detail_back
+        where stockout_detail_id = #{stockoutDetailId}
+    </delete>
+
+    <delete id="deleteOutStockoutDetailBackByStockoutDetailIds" parameterType="String">
+        delete from out_stockout_detail_back where stockout_detail_id in
+        <foreach item="stockoutDetailId" collection="array" open="(" separator="," close=")">
+            #{stockoutDetailId}
+        </foreach>
+    </delete>
+
+    <insert id="insertOutStockDetailBackFinish" parameterType="java.util.List">
+        INSERT INTO out_stockout_detail_back_finish
+        <foreach collection="list" item="item" separator="UNION ALL">
+            SELECT * FROM out_stockout_detail_back
+            WHERE stockout_detail_id = #{item.stockoutDetailId}
+        </foreach>
+    </insert>
+
+    <delete id="deleteOutStockDetailList">
+        DELETE FROM out_stockout_detail_back
+        WHERE stockout_detail_id IN
+        <foreach collection="list" item="item" open="(" separator="," close=")">
+            #{item.stockoutDetailId}
+        </foreach>
+    </delete>
+
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml
new file mode 100644
index 0000000..1ccd669
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailFinishMapper.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.outStockoutDetailFinish.mapper.OutStockoutDetailFinishMapper">
+
+    <resultMap type="OutStockoutDetailFinish" id="OutStockoutDetailFinishResult">
+        <result property="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="allotQuantity"    column="allot_quantity"    />
+        <result property="allotQuantityX"    column="allot_quantity_x"    />
+        <result property="allotQuantityJ"    column="allot_quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="remark"    column="remark"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="outId"    column="out_id"    />
+        <result property="bukechaiQuantity"    column="bukechai_quantity"    />
+        <result property="kechaiQuantity"    column="kechai_quantity"    />
+        <result property="entryid"    column="entryid"    />
+        <result property="flatQuantity"    column="flat_quantity"    />
+        <result property="fid"    column="fid"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="productName"    column="product_name"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="printDate"    column="print_date"    />
+    </resultMap>
+
+    <resultMap type="OutStockoutDetail" id="OutStockoutDetailResult">
+        <result property="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="allotQuantity"    column="allot_quantity"    />
+        <result property="allotQuantityX"    column="allot_quantity_x"    />
+        <result property="allotQuantityJ"    column="allot_quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="remark"    column="remark"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="outId"    column="out_id"    />
+        <result property="bukechaiQuantity"    column="bukechai_quantity"    />
+        <result property="kechaiQuantity"    column="kechai_quantity"    />
+        <result property="entryid"    column="entryid"    />
+        <result property="flatQuantity"    column="flat_quantity"    />
+        <result property="fid"    column="fid"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="distribution"    column="distribution"    />
+        <result property="model"    column="model"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="productName"    column="product_name"    />
+    </resultMap>
+
+    <sql id="selectOutStockoutDetailFinishVo">
+        select stockout_detail_id, stockout_guid, stockout_id, lot_no, product_guid, product_id, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, allot_quantity, allot_quantity_x, allot_quantity_j, price, remark, warehouse_id, out_id, bukechai_quantity, kechai_quantity, entryid, flat_quantity, fid, erp_stockout_id, unit, spec, product_name, supplier_id, cargo_no, create_time, print_date from out_stockout_detail_finish
+    </sql>
+
+    <select id="selectOutStockoutDetailFinishList" parameterType="OutStockoutDetailFinish" resultMap="OutStockoutDetailFinishResult">
+        <include refid="selectOutStockoutDetailFinishVo"/>
+        <where>
+            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null "> and quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null "> and quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="assignNum != null "> and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null "> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null "> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="allotQuantity != null "> and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
+            <if test="allotQuantityX != null "> and allot_quantity_x like concat("%", #{allotQuantityX}, "%")</if>
+            <if test="allotQuantityJ != null "> and allot_quantity_j like concat("%", #{allotQuantityJ}, "%")</if>
+            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="outId != null  and outId != ''"> and out_id like concat("%", #{outId}, "%")</if>
+            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''"> and bukechai_quantity like concat("%", #{bukechaiQuantity}, "%")</if>
+            <if test="kechaiQuantity != null  and kechaiQuantity != ''"> and kechai_quantity like concat("%", #{kechaiQuantity}, "%")</if>
+            <if test="entryid != null  and entryid != ''"> and entryid like concat("%", #{entryid}, "%")</if>
+            <if test="flatQuantity != null  and flatQuantity != ''"> and flat_quantity like concat("%", #{flatQuantity}, "%")</if>
+            <if test="fid != null  and fid != ''"> and fid like concat("%", #{fid}, "%")</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectOutStockoutDetailFinishByStockoutDetailId" parameterType="String" resultMap="OutStockoutDetailFinishResult">
+        <include refid="selectOutStockoutDetailFinishVo"/>
+        where stockout_detail_id = #{stockoutDetailId}
+    </select>
+
+    <insert id="insertOutStockoutDetailFinish" parameterType="OutStockoutDetailFinish">
+        insert into out_stockout_detail_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
+            <if test="stockoutGuid != null">stockout_guid,</if>
+            <if test="stockoutId != null">stockout_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="allotQuantity != null">allot_quantity,</if>
+            <if test="allotQuantityX != null">allot_quantity_x,</if>
+            <if test="allotQuantityJ != null">allot_quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="remark != null">remark,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="outId != null">out_id,</if>
+            <if test="bukechaiQuantity != null">bukechai_quantity,</if>
+            <if test="kechaiQuantity != null">kechai_quantity,</if>
+            <if test="entryid != null">entryid,</if>
+            <if test="flatQuantity != null">flat_quantity,</if>
+            <if test="fid != null">fid,</if>
+            <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="printDate != null">print_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
+            <if test="stockoutGuid != null">#{stockoutGuid},</if>
+            <if test="stockoutId != null">#{stockoutId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="allotQuantity != null">#{allotQuantity},</if>
+            <if test="allotQuantityX != null">#{allotQuantityX},</if>
+            <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="outId != null">#{outId},</if>
+            <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
+            <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
+            <if test="entryid != null">#{entryid},</if>
+            <if test="flatQuantity != null">#{flatQuantity},</if>
+            <if test="fid != null">#{fid},</if>
+            <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="printDate != null">#{printDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateOutStockoutDetailFinish" parameterType="OutStockoutDetailFinish">
+        update out_stockout_detail_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutGuid != null">stockout_guid = #{stockoutGuid},</if>
+            <if test="stockoutId != null">stockout_id = #{stockoutId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
+            <if test="allotQuantityX != null">allot_quantity_x = #{allotQuantityX},</if>
+            <if test="allotQuantityJ != null">allot_quantity_j = #{allotQuantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="outId != null">out_id = #{outId},</if>
+            <if test="bukechaiQuantity != null">bukechai_quantity = #{bukechaiQuantity},</if>
+            <if test="kechaiQuantity != null">kechai_quantity = #{kechaiQuantity},</if>
+            <if test="entryid != null">entryid = #{entryid},</if>
+            <if test="flatQuantity != null">flat_quantity = #{flatQuantity},</if>
+            <if test="fid != null">fid = #{fid},</if>
+            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+        </trim>
+        where stockout_detail_id = #{stockoutDetailId}
+    </update>
+
+    <delete id="deleteOutStockoutDetailFinishByStockoutDetailId" parameterType="String">
+        delete from out_stockout_detail_finish where stockout_detail_id = #{stockoutDetailId}
+    </delete>
+
+    <delete id="deleteOutStockoutDetailFinishByStockoutDetailIds" parameterType="String">
+        delete from out_stockout_detail_finish where stockout_detail_id in
+        <foreach item="stockoutDetailId" collection="array" open="(" separator="," close=")">
+            #{stockoutDetailId}
+        </foreach>
+    </delete>
+
+    <select id="selectOutStockoutDetailFinishListByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailResult">
+        select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
+               d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
+               d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
+               d.erp_stockout_id, d.unit, d.spec,
+               d.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
+        from out_stockout_detail_finish d left join bas_product p on d.product_id = p.product_id
+        where stockout_guid = #{stockoutGuid}
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml
new file mode 100644
index 0000000..a56d66c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutDetailMapper.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.outStockoutDetail.mapper.OutStockoutDetailMapper">
+
+    <resultMap type="OutStockoutDetail" id="OutStockoutDetailResult">
+        <result property="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="allotQuantity"    column="allot_quantity"    />
+        <result property="allotQuantityX"    column="allot_quantity_x"    />
+        <result property="allotQuantityJ"    column="allot_quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="remark"    column="remark"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="outId"    column="out_id"    />
+        <result property="bukechaiQuantity"    column="bukechai_quantity"    />
+        <result property="kechaiQuantity"    column="kechai_quantity"    />
+        <result property="entryid"    column="entryid"    />
+        <result property="flatQuantity"    column="flat_quantity"    />
+        <result property="fid"    column="fid"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+
+    </resultMap>
+
+    <sql id="selectOutStockoutDetailVo">
+        select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
+               d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
+               d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
+               d.erp_stockout_id, d.unit, d.spec,
+               d.product_name ,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
+        from out_stockout_detail d
+    </sql>
+
+    <select id="selectOutStockoutDetailList" parameterType="OutStockoutDetail" resultMap="OutStockoutDetailResult">
+        <include refid="selectOutStockoutDetailVo"/>
+        <where>
+            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and d.product_id like concat('%', #{productId}, '%')</if>
+            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null "> and quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null "> and quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="assignNum != null "> and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null "> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null "> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="allotQuantity != null "> and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
+            <if test="allotQuantityX != null "> and allot_quantity_x like concat("%", #{allotQuantityX}, "%")</if>
+            <if test="allotQuantityJ != null "> and allot_quantity_j like concat("%", #{allotQuantityJ}, "%")</if>
+            <if test="price != null  and price != ''"> and d.price like concat("%", #{price}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and d.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="outId != null  and outId != ''"> and out_id like concat("%", #{outId}, "%")</if>
+            <if test="bukechaiQuantity != null  and bukechaiQuantity != ''"> and bukechai_quantity like concat("%", #{bukechaiQuantity}, "%")</if>
+            <if test="kechaiQuantity != null  and kechaiQuantity != ''"> and kechai_quantity like concat("%", #{kechaiQuantity}, "%")</if>
+            <if test="entryid != null  and entryid != ''"> and entryid like concat("%", #{entryid}, "%")</if>
+            <if test="flatQuantity != null  and flatQuantity != ''"> and flat_quantity like concat("%", #{flatQuantity}, "%")</if>
+            <if test="fid != null  and fid != ''"> and fid like concat("%", #{fid}, "%")</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
+            <if test="unit != null  and unit != ''"> and d.unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and d.spec like concat('%', #{spec}, '%')</if>
+
+            <if test="spare1 != null and spare1 != ''"> and isd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and isd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and isd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and isd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null and spare5 != ''"> and isd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null and spare6 != ''"> and isd.spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="spare7 != null and spare7 != ''"> and isd.spare7 like concat("%", #{spare7}, "%")</if>
+            <if test="spare8 != null and spare8 != ''"> and isd.spare8 like concat("%", #{spare8}, "%")</if>
+            <if test="spare9 != null and spare9 != ''"> and isd.spare9 like concat("%", #{spare9}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectOutStockoutDetailByStockoutDetailId" parameterType="String" resultMap="OutStockoutDetailResult">
+        <include refid="selectOutStockoutDetailVo"/>
+        where stockout_detail_id = #{stockoutDetailId}
+    </select>
+
+    <insert id="insertOutStockoutDetail" parameterType="OutStockoutDetail">
+        insert into out_stockout_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
+            <if test="stockoutGuid != null">stockout_guid,</if>
+            <if test="stockoutId != null">stockout_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="allotQuantity != null">allot_quantity,</if>
+            <if test="allotQuantityX != null">allot_quantity_x,</if>
+            <if test="allotQuantityJ != null">allot_quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="remark != null">remark,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="outId != null">out_id,</if>
+            <if test="bukechaiQuantity != null">bukechai_quantity,</if>
+            <if test="kechaiQuantity != null">kechai_quantity,</if>
+            <if test="entryid != null">entryid,</if>
+            <if test="flatQuantity != null">flat_quantity,</if>
+            <if test="fid != null">fid,</if>
+            <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="sourceLineId != null">source_line_id,</if>
+            <if test="barCode != null">bar_code,</if>
+            <if test="isBatchManage != null">is_batch_manage,</if>
+            <if test="oldProjectNo != null">old_project_no,</if>
+
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
+            <if test="stockoutGuid != null">#{stockoutGuid},</if>
+            <if test="stockoutId != null">#{stockoutId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="allotQuantity != null">#{allotQuantity},</if>
+            <if test="allotQuantityX != null">#{allotQuantityX},</if>
+            <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="outId != null">#{outId},</if>
+            <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
+            <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
+            <if test="entryid != null">#{entryid},</if>
+            <if test="flatQuantity != null">#{flatQuantity},</if>
+            <if test="fid != null">#{fid},</if>
+            <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="sourceLineId != null">#{sourceLineId},</if>
+            <if test="barCode != null">#{barCode},</if>
+            <if test="isBatchManage != null">#{isBatchManage},</if>
+            <if test="oldProjectNo != null">#{oldProjectNo},</if>
+        </trim>
+    </insert>
+
+    <update id="updateOutStockoutDetail" parameterType="OutStockoutDetail">
+        update out_stockout_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutGuid != null">stockout_guid = #{stockoutGuid},</if>
+            <if test="stockoutId != null">stockout_id = #{stockoutId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
+            <if test="allotQuantityX != null">allot_quantity_x = #{allotQuantityX},</if>
+            <if test="allotQuantityJ != null">allot_quantity_j = #{allotQuantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="outId != null">out_id = #{outId},</if>
+            <if test="bukechaiQuantity != null">bukechai_quantity = #{bukechaiQuantity},</if>
+            <if test="kechaiQuantity != null">kechai_quantity = #{kechaiQuantity},</if>
+            <if test="entryid != null">entryid = #{entryid},</if>
+            <if test="flatQuantity != null">flat_quantity = #{flatQuantity},</if>
+            <if test="fid != null">fid = #{fid},</if>
+            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+
+        </trim>
+        where stockout_detail_id = #{stockoutDetailId}
+    </update>
+
+    <delete id="deleteOutStockoutDetailByStockoutDetailId" parameterType="String">
+        delete from out_stockout_detail where stockout_detail_id = #{stockoutDetailId}
+    </delete>
+
+    <delete id="deleteOutStockoutDetailByStockoutDetailIds" parameterType="String">
+        delete from out_stockout_detail where stockout_detail_id in
+        <foreach item="stockoutDetailId" collection="array" open="(" separator="," close=")">
+            #{stockoutDetailId}
+        </foreach>
+    </delete>
+
+    <select id="selectOutStockoutDetailByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailResult">
+        select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
+               d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
+               d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
+               d.erp_stockout_id, d.unit, d.spec,
+               d.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
+               from out_stockout_detail d left join bas_product p on d.product_id = p.product_id
+        where d.stockout_guid = #{stockoutGuid}
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml
new file mode 100644
index 0000000..ec19b6e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutFinishMapper.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.outStockoutFinish.mapper.OutStockoutFinishMapper">
+
+    <resultMap type="OutStockoutFinish" id="OutStockoutFinishResult">
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="outType"    column="out_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="stockoutSource"    column="stockout_source"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="classNowId"    column="class_now_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="carNumber"    column="car_number"    />
+        <result property="FID"    column="FID"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="customerName"    column="customer_name"    />
+    </resultMap>
+
+    <sql id="selectOutStockoutFinishVo">
+        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id, start_date, finish_date from out_stockout_finish
+    </sql>
+
+    <select id="selectOutStockoutFinishList" parameterType="OutStockoutFinish" resultMap="OutStockoutFinishResult">
+        <include refid="selectOutStockoutFinishVo"/>
+        <where>
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="outType != null  and outType != ''"> and out_type like concat("%", #{outType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat("%", #{stockoutSource}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="classNowId != null  and classNowId != ''"> and class_now_id like concat("%", #{classNowId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="carNumber != null  and carNumber != ''"> and car_number like concat("%", #{carNumber}, "%")</if>
+            <if test="FID != null  and FID != ''"> and FID like concat("%", #{FID}, "%")</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
+            <if test="startDate != null  and startDate != ''"> and start_date like concat("%", #{startDate}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectOutStockoutFinishByStockoutGuid" parameterType="String" resultMap="OutStockoutFinishResult">
+        <include refid="selectOutStockoutFinishVo"/>
+        where stockout_guid = #{stockoutGuid}
+    </select>
+
+    <insert id="insertOutStockoutFinish" parameterType="OutStockoutFinish">
+        insert into out_stockout_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
+            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
+            <if test="outType != null and outType != ''">out_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="stockoutSource != null">stockout_source,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="classNowId != null">class_now_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="carNumber != null">car_number,</if>
+            <if test="FID != null">FID,</if>
+            <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="finishDate != null">finish_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
+            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
+            <if test="outType != null and outType != ''">#{outType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="stockoutSource != null">#{stockoutSource},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="classNowId != null">#{classNowId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="carNumber != null">#{carNumber},</if>
+            <if test="FID != null">#{FID},</if>
+            <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateOutStockoutFinish" parameterType="OutStockoutFinish">
+        update out_stockout_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
+            <if test="outType != null and outType != ''">out_type = #{outType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="classNowId != null">class_now_id = #{classNowId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="carNumber != null">car_number = #{carNumber},</if>
+            <if test="FID != null">FID = #{FID},</if>
+            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+        </trim>
+        where stockout_guid = #{stockoutGuid}
+    </update>
+
+    <delete id="deleteOutStockoutFinishByStockoutGuid" parameterType="String">
+        delete from out_stockout_finish where stockout_guid = #{stockoutGuid}
+    </delete>
+
+    <delete id="deleteOutStockoutFinishByStockoutGuids" parameterType="String">
+        delete from out_stockout_finish where stockout_guid in
+        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
+            #{stockoutGuid}
+        </foreach>
+    </delete>
+
+    <select id="selectOutStockoutFinishListByOutStockout" parameterType="OutStockout" resultMap="OutStockoutFinishResult">
+        select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
+        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name  from out_stockout_finish o
+        left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
+        left join bas_customer bc on bc.customer_no = o.customer_no
+        left join out_stockout_detail_finish d on d.stockout_id = o.stockout_id
+        left join bas_product bp on bp.product_id = d.product_id
+        <where>
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="outType != null  and outType != ''"> and o.out_type like concat("%", #{outType}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and o.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and o.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and o.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and o.status like concat("%", #{status}, "%")</if>
+            <if test="stockoutSource != null  and stockoutSource != ''"> and o.stockout_source like concat("%", #{stockoutSource}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and o.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="classNowId != null  and classNowId != ''"> and o.class_now_id like concat("%", #{classNowId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and o.exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="carNumber != null  and carNumber != ''"> and o.car_number like concat("%", #{carNumber}, "%")</if>
+            <if test="FID != null  and FID != ''"> and o.FID like concat("%", #{FID}, "%")</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
+            <if test="startDate != null  and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
+            <if test="finishDate != null  and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
+            <if test="productId != null  and productId != ''"> and d.product_id like concat("%", #{productId}, "%")</if>
+            <if test="productName != null  and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
+            <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
+        </where>
+        order by o.create_date desc
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml
new file mode 100644
index 0000000..58b314c
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/OutStockoutMapper.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.outStockout.mapper.OutStockoutMapper">
+
+    <resultMap type="OutStockout" id="OutStockoutResult">
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="outType"    column="out_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="stockoutSource"    column="stockout_source"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="classNowId"    column="class_now_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="carNumber"    column="car_number"    />
+        <result property="FID"    column="FID"    />
+        <result property="erpStockoutId"    column="erp_stockout_id"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+    </resultMap>
+
+    <sql id="selectOutStockoutVo">
+        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id,start_date,finish_date,spare1,spare2,spare3,spare4,spare5,spare6,spare7,spare8 from out_stockout
+    </sql>
+
+    <select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
+        select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
+        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.spare1,o.spare2,o.spare3,o.spare4,o.spare5,o.spare8  from out_stockout o
+        left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
+         left join bas_customer bc on bc.customer_no = o.customer_no
+        left join out_stockout_detail d on d.stockout_id = o.stockout_id
+
+        <where>
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and o.stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and o.stockout_id like concat("%", #{stockoutId}, "%")</if>
+            <if test="outType != null  and outType != ''"> and o.out_type like concat("%", #{outType}, "%")</if>
+            <if test="startDate != null  and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
+            <if test="finishDate != null  and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and o.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and o.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and o.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and o.status like concat("%", #{status}, "%")</if>
+            <if test="stockoutSource != null  and stockoutSource != ''"> and o.stockout_source like concat("%", #{stockoutSource}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and o.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="classNowId != null  and classNowId != ''"> and o.class_now_id like concat("%", #{classNowId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and o.exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="carNumber != null  and carNumber != ''"> and o.car_number like concat("%", #{carNumber}, "%")</if>
+            <if test="FID != null  and FID != ''"> and o.FID like concat("%", #{FID}, "%")</if>
+            <if test="erpStockoutId != null  and erpStockoutId != ''"> and o.erp_stockout_id like concat("%", #{erpStockoutId}, "%")</if>
+            <if test="productId != null  and productId != ''"> and d.product_id like concat("%", #{productId}, "%")</if>
+            <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
+            <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare8 != null  and spare8 != ''"> and o.spare8 like concat("%", #{spare8}, "%")</if>
+
+
+        </where>
+        order by o.create_date desc
+    </select>
+
+    <select id="selectOutStockoutByStockoutGuid" parameterType="String" resultMap="OutStockoutResult">
+        <include refid="selectOutStockoutVo"/>
+        where stockout_guid = #{stockoutGuid}
+    </select>
+
+    <insert id="insertOutStockout" parameterType="OutStockout">
+        insert into out_stockout
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
+            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
+            <if test="outType != null and outType != ''">out_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="stockoutSource != null">stockout_source,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="classNowId != null">class_now_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="carNumber != null">car_number,</if>
+            <if test="FID != null">FID,</if>
+            <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="companyShortName != null">company_short_name,</if>
+            <if test="accountSetNo != null">account_set_no,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
+            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
+            <if test="outType != null and outType != ''">#{outType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="stockoutSource != null">#{stockoutSource},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="classNowId != null">#{classNowId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="carNumber != null">#{carNumber},</if>
+            <if test="FID != null">#{FID},</if>
+            <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="companyShortName != null">#{companyShortName},</if>
+            <if test="accountSetNo != null">#{accountSetNo},</if>
+        </trim>
+    </insert>
+
+    <update id="updateOutStockout" parameterType="OutStockout">
+        update out_stockout
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
+            <if test="outType != null and outType != ''">out_type = #{outType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="classNowId != null">class_now_id = #{classNowId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="carNumber != null">car_number = #{carNumber},</if>
+            <if test="FID != null">FID = #{FID},</if>
+            <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
+            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
+        </trim>
+        where stockout_id = #{stockoutId}
+    </update>
+
+    <delete id="deleteOutStockoutByStockoutGuid" parameterType="String">
+        delete from out_stockout where stockout_guid = #{stockoutGuid}
+    </delete>
+
+    <delete id="deleteOutStockoutByStockoutGuids" parameterType="String">
+        delete from out_stockout where stockout_guid in
+        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
+            #{stockoutGuid}
+        </foreach>
+    </delete>
+
+    <select id="updateOutStockoutStatus" parameterType="java.util.Map" statementType="CALLABLE">
+        {
+            call proc_update_outbill_status(
+                #{outStockId,mode=IN,jdbcType=VARCHAR},
+                #{status,mode=IN,jdbcType=VARCHAR},
+                #{newStatus,mode=IN,jdbcType=VARCHAR},
+                #{exitId,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=VARCHAR},
+                #{v_resultString,mode=OUT,jdbcType=VARCHAR}
+            )
+        }
+    </select>
+    <select id="autoAllot" parameterType="java.util.Map" statementType="CALLABLE">
+        {
+            call proc_out_auto_allocation(
+                #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=VARCHAR},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+                 )
+            }
+    </select>
+
+    <select id="manualAllot" parameterType="java.util.Map" statementType="CALLABLE">
+        {
+            call proc_out_hand_allocation(
+                #{v_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_stock_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=VARCHAR},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+                 )
+            }
+    </select>
+    <select id="selectOutStockoutByStockoutId" resultMap="OutStockoutResult">
+        select distinct o.stockout_guid,
+                        o.stockout_id,
+                        o.out_type,
+                        o.create_date,
+                        o.department_no,
+                        o.customer_no,
+                        o.create_man_id,
+                        o.status,
+                        o.stockout_source,
+                        o.warehouse_id,
+                        o.class_now_id,
+                        o.exit_id,
+                        o.car_number,
+                        o.FID,
+                        o.erp_stockout_id,
+                        o.start_date,
+                        o.finish_date,
+                        o.spare1,
+                        o.spare2,
+                        o.spare4,
+                        o.spare3,
+                        o.spare5,
+                        bw.warehouse_name,
+                        bc.customer_name
+        from out_stockout o
+                 left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
+                 left join bas_customer bc on bc.customer_no = o.customer_no
+                 left join out_stockout_detail d on d.stockout_id = o.stockout_id
+                 left join bas_product bp on bp.product_id = d.product_id
+        where o.stockout_id = #{stockoutId}
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml
new file mode 100644
index 0000000..f1db0d0
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/out/ViewHandAllotStockMapper.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.handAllotStock.mapper.ViewHandAllotStockMapper">
+    
+    <resultMap type="ViewHandAllotStock" id="ViewHandAllotStockResult">
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="distribution"    column="distribution"    />
+        <result property="model"    column="model"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="thePlatoon"    column="the_platoon"    />
+        <result property="theColumn"    column="the_column"    />
+        <result property="theFloor"    column="the_floor"    />
+        <result property="status"    column="status"    />
+        <result property="locked"    column="locked"    />
+    </resultMap>
+
+    <sql id="selectViewHandAllotStockVo">
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, roadway_id, the_platoon, the_column, the_floor, status, locked from view_hand_allot_stock
+    </sql>
+
+    <select id="selectViewHandAllotStockList" parameterType="ViewHandAllotStock" resultMap="ViewHandAllotStockResult">
+        <include refid="selectViewHandAllotStockVo"/>
+        <where>  
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
+            <if test="backDate != null  and backDate != ''"> and back_date like concat("%", #{backDate}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat("%", #{inClassId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="voltage != null  and voltage != ''"> and voltage like concat("%", #{voltage}, "%")</if>
+            <if test="power != null  and power != ''"> and power like concat("%", #{power}, "%")</if>
+            <if test="phase != null  and phase != ''"> and phase like concat("%", #{phase}, "%")</if>
+            <if test="netWeight != null  and netWeight != ''"> and net_weight like concat("%", #{netWeight}, "%")</if>
+            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight like concat("%", #{grossWeight}, "%")</if>
+            <if test="distribution != null  and distribution != ''"> and distribution like concat("%", #{distribution}, "%")</if>
+            <if test="model != null  and model != ''"> and model like concat("%", #{model}, "%")</if>
+            <if test="orderId != null  and orderId != ''"> and order_id like concat("%", #{orderId}, "%")</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="thePlatoon != null "> and the_platoon like concat("%", #{thePlatoon}, "%")</if>
+            <if test="theColumn != null "> and the_column like concat("%", #{theColumn}, "%")</if>
+            <if test="theFloor != null "> and the_floor like concat("%", #{theFloor}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectViewHandAllotStockByStockId" parameterType="String" resultMap="ViewHandAllotStockResult">
+        <include refid="selectViewHandAllotStockVo"/>
+        where stock_id = #{stockId}
+    </select>
+
+    <insert id="insertViewHandAllotStock" parameterType="ViewHandAllotStock">
+        insert into view_hand_allot_stock
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="productStatus != null">product_status,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="backDate != null">back_date,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="inType != null">in_type,</if>
+            <if test="inClassId != null">in_class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="voltage != null">voltage,</if>
+            <if test="power != null">power,</if>
+            <if test="phase != null">phase,</if>
+            <if test="netWeight != null">net_weight,</if>
+            <if test="grossWeight != null">gross_weight,</if>
+            <if test="distribution != null">distribution,</if>
+            <if test="model != null">model,</if>
+            <if test="orderId != null">order_id,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="thePlatoon != null">the_platoon,</if>
+            <if test="theColumn != null">the_column,</if>
+            <if test="theFloor != null">the_floor,</if>
+            <if test="status != null">status,</if>
+            <if test="locked != null">locked,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="productStatus != null">#{productStatus},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="backDate != null">#{backDate},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="inType != null">#{inType},</if>
+            <if test="inClassId != null">#{inClassId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="voltage != null">#{voltage},</if>
+            <if test="power != null">#{power},</if>
+            <if test="phase != null">#{phase},</if>
+            <if test="netWeight != null">#{netWeight},</if>
+            <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="distribution != null">#{distribution},</if>
+            <if test="model != null">#{model},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="thePlatoon != null">#{thePlatoon},</if>
+            <if test="theColumn != null">#{theColumn},</if>
+            <if test="theFloor != null">#{theFloor},</if>
+            <if test="status != null">#{status},</if>
+            <if test="locked != null">#{locked},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewHandAllotStock" parameterType="ViewHandAllotStock">
+        update view_hand_allot_stock
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="backDate != null">back_date = #{backDate},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <if test="inClassId != null">in_class_id = #{inClassId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="voltage != null">voltage = #{voltage},</if>
+            <if test="power != null">power = #{power},</if>
+            <if test="phase != null">phase = #{phase},</if>
+            <if test="netWeight != null">net_weight = #{netWeight},</if>
+            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="distribution != null">distribution = #{distribution},</if>
+            <if test="model != null">model = #{model},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
+            <if test="theColumn != null">the_column = #{theColumn},</if>
+            <if test="theFloor != null">the_floor = #{theFloor},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="locked != null">locked = #{locked},</if>
+        </trim>
+        where stock_id = #{stockId}
+    </update>
+
+    <delete id="deleteViewHandAllotStockByStockId" parameterType="String">
+        delete from view_hand_allot_stock where stock_id = #{stockId}
+    </delete>
+
+    <delete id="deleteViewHandAllotStockByStockIds" parameterType="String">
+        delete from view_hand_allot_stock where stock_id in 
+        <foreach item="stockId" collection="array" open="(" separator="," close=")">
+            #{stockId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
new file mode 100644
index 0000000..62c82e9
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/pda/PdaMapper.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.pda.mapper.PdaMapper">
+
+    <select id="bindTray" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_bind_tray_msg(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_is_bound_accord,mode=IN,jdbcType=VARCHAR},
+                #{v_quantity,mode=IN,jdbcType=INTEGER},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+    <select id="tpIn" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_tp_in(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_tray_type,mode=IN,jdbcType=VARCHAR},
+                #{v_quantity,mode=IN,jdbcType=INTEGER},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+
+    <select id="tpOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_tp_out(
+
+                #{v_tray_type,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+    <select id="halfTrayOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_half_tray_out(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+
+
+
+
+
+
+    <select id="outMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_out_makesure(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+
+    <select id="emptyTrayIn" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_tray_in(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_quantity,mode=IN,jdbcType=VARCHAR},
+                #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+    <select id="emptyBoxIn" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_box_in(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_entrance_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+    <select id="emptyTrayOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_tray_out(
+                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_cargo_space_id,mode=IN,jdbcType=VARCHAR},
+                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+    <select id="emptyBoxOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_box_out(
+                #{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
+                #{v_exit_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+    <select id="bindTrayMsg" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_bind_tray_msg(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_quantity,mode=IN,jdbcType=INTEGER},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+
+    <select id="addInJob" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_add_in_job(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_is_full,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+        )}
+    </select>
+    <select id="checkMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_check_makesure(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+    <select id="outMakeSureException" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_out_makesure_exception(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_type,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+
+    <select id="pkIn" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_pk_in(
+                #{v_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
+                #{v_in_quantity,mode=IN,jdbcType=INTEGER},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+
+    <select id="pkOut" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_pk_out(
+                #{v_job_id,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+    </select>
+
+    <select id="hcoutMakesure" parameterType="java.util.Map" statementType="CALLABLE">
+
+        {call proc_hc_out_make_sure(
+                #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_result,mode=OUT,jdbcType=INTEGER},
+                #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
+              )}
+
+    </select>
+    <select id="completeInPk" parameterType="java.util.Map" statementType="CALLABLE">
+        {call proc_complete_in_pk(#{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                                  #{v_in_stockin_detail_id,mode=IN,jdbcType=VARCHAR},
+                                  #{v_quantity,mode=IN,jdbcType=VARCHAR},
+                                  #{v_result,mode=OUT,jdbcType=INTEGER},
+                                  #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
+    </select>
+    <select id="selectByTrayCodeAndProduct" parameterType="string" resultType="java.lang.Integer">
+        select count(1)
+        from mydo_job_detail
+        where job_id in (select job_id from mydo_job where tray_code = #{trayCode} and in_or_out > 20)
+          and product_id = #{productId}
+    </select>
+<select id="completeOutPk" parameterType="java.util.Map" statementType="CALLABLE">
+    {call proc_complete_out_pk(#{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                              #{v_out_stockout_detail_id,mode=IN,jdbcType=VARCHAR},
+                              #{v_quantity,mode=IN,jdbcType=VARCHAR},
+                              #{v_result,mode=OUT,jdbcType=INTEGER},
+                              #{v_result_msg,mode=OUT,jdbcType=VARCHAR})}
+</select>
+
+
+    <select id="selectBasStockHcCount" resultType="java.lang.Integer">
+
+    </select>
+
+
+
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml
new file mode 100644
index 0000000..746fdd9
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/pda/TrayMsgMapper.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.pda.trayMsg.mapper.TrayMsgMapper">
+    
+    <resultMap type="TrayMsg" id="TrayMsgResult">
+        <result property="id"    column="id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="productName"    column="product_name"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="warehouseType"    column="warehouse_type"    />
+    </resultMap>
+
+    <sql id="selectTrayMsgVo">
+        select id, tray_code, stockin_detail_id, quantity,warehouse_id from tray_msg
+    </sql>
+
+    <select id="selectTrayMsgList" parameterType="TrayMsg" resultMap="TrayMsgResult">
+        select t.id, t.tray_code, t.stockin_detail_id, t.quantity,p.product_name,t.warehouse_id,w.warehouse_name,w.warehouse_type from tray_msg t
+            left join in_stockin_detail d on t.stockin_detail_id = d.stockin_detail_id
+            left join bas_product p on d.product_id=p.product_id
+             left join bas_warehouse w on t.warehouse_id=w.warehouse_id
+        <where>  
+            <if test="trayCode != null  and trayCode != ''"> and t.tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and t.stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and t.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+
+        </where>
+    </select>
+    
+    <select id="selectTrayMsgById" parameterType="String" resultMap="TrayMsgResult">
+        <include refid="selectTrayMsgVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertTrayMsg" parameterType="TrayMsg">
+        insert into tray_msg
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTrayMsg" parameterType="TrayMsg">
+        update tray_msg
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTrayMsgById" parameterType="String">
+        delete from tray_msg where id = #{id}
+    </delete>
+
+    <delete id="deleteTrayMsgByIds" parameterType="String">
+        delete from tray_msg where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml
new file mode 100644
index 0000000..7cf3c89
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/productAndStock/ViewProductAndStockMapper.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.out.productAndStock.mapper.ViewProductAndStockMapper">
+
+    <resultMap type="ViewProductAndStock" id="ViewProductAndStockResult">
+        <result property="onlyIdentity"    column="only_identity"    />
+        <result property="productId"    column="product_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productName"    column="product_name"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
+    </resultMap>
+
+    <sql id="selectViewProductAndStockVo">
+        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock
+    </sql>
+    <sql id="selectViewProductAndStockPdVo">
+        select only_identity, product_id, lot_no, product_name, quantity, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, voltage, power, phase from view_product_and_stock_pd
+    </sql>
+
+    <select id="selectViewProductAndStockList" parameterType="ViewProductAndStock" resultMap="ViewProductAndStockResult">
+        <include refid="selectViewProductAndStockVo"/>
+        <where>
+            <if test="onlyIdentity != null "> and only_identity like concat("%", #{onlyIdentity}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="voltage != null  and voltage != ''"> and voltage like concat("%", #{voltage}, "%")</if>
+            <if test="power != null  and power != ''"> and power like concat("%", #{power}, "%")</if>
+            <if test="phase != null  and phase != ''"> and phase like concat("%", #{phase}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectViewProductAndStockByOnlyIdentity" parameterType="Long" resultMap="ViewProductAndStockResult">
+        <include refid="selectViewProductAndStockVo"/>
+        where only_identity = #{onlyIdentity}
+    </select>
+    <select id="selectViewProductAndStockPdList" parameterType="ViewProductAndStock"
+            resultMap="ViewProductAndStockResult">
+        <include refid="selectViewProductAndStockPdVo"/>
+        <where>
+            <if test="onlyIdentity != null ">and only_identity like concat("%", #{onlyIdentity}, "%")</if>
+            <if test="productId != null  and productId != ''">and product_id like concat("%", #{productId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''">and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
+                '%')
+            </if>
+            <if test="quantity != null  and quantity != ''">and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''">and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stackingId != null  and stackingId != ''">and stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''">and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''">and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''">and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''">and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''">and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''">and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="voltage != null  and voltage != ''">and voltage like concat("%", #{voltage}, "%")</if>
+            <if test="power != null  and power != ''">and power like concat("%", #{power}, "%")</if>
+            <if test="phase != null  and phase != ''">and phase like concat("%", #{phase}, "%")</if>
+        </where>
+    </select>
+
+    <insert id="insertViewProductAndStock" parameterType="ViewProductAndStock">
+        insert into view_product_and_stock
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="onlyIdentity != null">only_identity,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="voltage != null">voltage,</if>
+            <if test="power != null">power,</if>
+            <if test="phase != null">phase,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="onlyIdentity != null">#{onlyIdentity},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="voltage != null">#{voltage},</if>
+            <if test="power != null">#{power},</if>
+            <if test="phase != null">#{phase},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewProductAndStock" parameterType="ViewProductAndStock">
+        update view_product_and_stock
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="voltage != null">voltage = #{voltage},</if>
+            <if test="power != null">power = #{power},</if>
+            <if test="phase != null">phase = #{phase},</if>
+        </trim>
+        where only_identity = #{onlyIdentity}
+    </update>
+
+    <delete id="deleteViewProductAndStockByOnlyIdentity" parameterType="Long">
+        delete from view_product_and_stock where only_identity = #{onlyIdentity}
+    </delete>
+
+    <delete id="deleteViewProductAndStockByOnlyIdentitys" parameterType="String">
+        delete from view_product_and_stock where only_identity in
+        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
+            #{onlyIdentity}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml
new file mode 100644
index 0000000..f57ee75
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailFinishMapper.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper">
+
+    <resultMap type="ReceiveStockinDetailFinish" id="ReceiveStockinDetailFinishResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+    </resultMap>
+    <resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <association property="extraField" javaType="ExtraField">
+            <result property="productId"    column="product_id"    />
+            <result property="materialDesc"    column="product_name"    />
+            <result property="englishDesc"    column="englishDesc"    />
+            <result property="length"    column="length"    />
+            <result property="width"    column="width"    />
+            <result property="height"    column="height"    />
+            <result property="volume"    column="volume"    />
+            <result property="netWeight"    column="netWeight"    />
+        </association>
+    </resultMap>
+
+    <sql id="selectReceiveStockinDetailFinishVo">
+        select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id,
+               rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num,
+               rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id,
+               rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6,
+               bp.product_name,bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+        from receive_stockin_detail_finish rsd
+                 left join bas_product bp on rsd.product_id = bp.product_id
+    </sql>
+
+    <select id="selectReceiveStockinDetailFinishList" parameterType="ReceiveStockinDetailFinish" resultMap="ReceiveStockinDetailFinishResult">
+        <include refid="selectReceiveStockinDetailFinishVo"/>
+        <where>
+            <if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null and stockinId != ''"> and rsd.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="lotNo != null and lotNo != ''"> and rsd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null and productGuid != ''"> and rsd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null and productId != ''"> and rsd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null and quantity != ''"> and rsd.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null and quantityX != ''"> and rsd.quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null and price != ''"> and rsd.price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null and assignNum != ''"> and rsd.assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null and printDate != ''"> and rsd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null and supplierId != ''"> and rsd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null and customerId != ''"> and rsd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null and unit != ''"> and rsd.unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null and spec != ''"> and rsd.spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null and spare1 != ''"> and rsd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and rsd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and rsd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and rsd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null and spare5 != ''"> and rsd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null and spare6 != ''"> and rsd.spare6 like concat("%", #{spare6}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectReceiveStockinDetailFinishByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailFinishResult">
+        <include refid="selectReceiveStockinDetailFinishVo"/>
+        where stockin_detail_id = #{stockinDetailId}
+    </select>
+    <select id="selectReceiveStockinDetailList"
+            resultMap="ReceiveStockinDetailResult">
+        <include refid="selectReceiveStockinDetailFinishVo"/>
+        <where>
+            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null  and price != ''"> and price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+        </where>
+    </select>
+
+    <insert id="insertReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
+        insert into receive_stockin_detail_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+         </trim>
+    </insert>
+
+    <update id="updateReceiveStockinDetailFinish" parameterType="ReceiveStockinDetailFinish">
+        update receive_stockin_detail_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+        </trim>
+        where stockin_detail_id = #{stockinDetailId}
+    </update>
+
+    <delete id="deleteReceiveStockinDetailFinishByStockinDetailId" parameterType="String">
+        delete from receive_stockin_detail_finish where stockin_detail_id = #{stockinDetailId}
+    </delete>
+
+    <delete id="deleteReceiveStockinDetailFinishByStockinDetailIds" parameterType="String">
+        delete from receive_stockin_detail_finish where stockin_detail_id in
+        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
+            #{stockinDetailId}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml
new file mode 100644
index 0000000..6790d91
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinDetailMapper.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.receive.stockindetail.mapper.ReceiveStockinDetailMapper">
+
+    <resultMap type="ReceiveStockinDetail" id="ReceiveStockinDetailResult">
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <association property="extraField" javaType="ExtraField">
+            <result property="productId"    column="product_id"    />
+            <result property="materialDesc"    column="product_name"    />
+            <result property="englishDesc"    column="englishDesc"    />
+            <result property="length"    column="length"    />
+            <result property="width"    column="width"    />
+            <result property="height"    column="height"    />
+            <result property="volume"    column="volume"    />
+            <result property="netWeight"    column="netWeight"    />
+        </association>
+    </resultMap>
+
+    <sql id="selectReceiveStockinDetailVo">
+        select rsd.stockin_detail_id, rsd.stockin_guid, rsd.stockin_id, rsd.lot_no, rsd.product_guid, rsd.product_id,
+               rsd.quantity, rsd.quantity_x, rsd.quantity_j, rsd.price, rsd.cargo_no, rsd.remark, rsd.assign_num,
+               rsd.assign_num_x, rsd.assign_num_j, rsd.print_date, rsd.stock_status, rsd.supplier_id, rsd.customer_id,
+               rsd.unit, rsd.spec, rsd.spare1, rsd.spare2, rsd.spare3, rsd.spare4, rsd.spare5, rsd.spare6,
+               bp.product_name,bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+        from receive_stockin_detail rsd
+        left join bas_product bp on rsd.product_id = bp.product_id
+    </sql>
+
+    <select id="selectReceiveStockinDetailList" parameterType="ReceiveStockinDetail" resultMap="ReceiveStockinDetailResult">
+        <include refid="selectReceiveStockinDetailVo"/>
+        <where>
+            <if test="stockinGuid != null and stockinGuid != ''"> and rsd.stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null and stockinId != ''"> and rsd.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="lotNo != null and lotNo != ''"> and rsd.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productGuid != null and productGuid != ''"> and rsd.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null and productId != ''"> and rsd.product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null and quantity != ''"> and rsd.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityX != null and quantityX != ''"> and rsd.quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="quantityJ != null and quantityJ != ''"> and rsd.quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="price != null and price != ''"> and rsd.price like concat("%", #{price}, "%")</if>
+            <if test="cargoNo != null and cargoNo != ''"> and rsd.cargo_no like concat("%", #{cargoNo}, "%")</if>
+            <if test="assignNum != null and assignNum != ''"> and rsd.assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumX != null and assignNumX != ''"> and rsd.assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="assignNumJ != null and assignNumJ != ''"> and rsd.assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="printDate != null and printDate != ''"> and rsd.print_date like concat("%", #{printDate}, "%")</if>
+            <if test="stockStatus != null and stockStatus != ''"> and rsd.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="supplierId != null and supplierId != ''"> and rsd.supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null and customerId != ''"> and rsd.customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="unit != null and unit != ''"> and rsd.unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null and spec != ''"> and rsd.spec like concat("%", #{spec}, "%")</if>
+            <if test="spare1 != null and spare1 != ''"> and rsd.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null and spare2 != ''"> and rsd.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null and spare3 != ''"> and rsd.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null and spare4 != ''"> and rsd.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null and spare5 != ''"> and rsd.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null and spare6 != ''"> and rsd.spare6 like concat("%", #{spare6}, "%")</if>
+        </where>
+
+    </select>
+
+    <select id="selectReceiveStockinDetailByStockinDetailId" parameterType="String" resultMap="ReceiveStockinDetailResult">
+        <include refid="selectReceiveStockinDetailVo"/>
+        where stockin_detail_id = #{stockinDetailId}
+    </select>
+
+    <insert id="insertReceiveStockinDetail" parameterType="ReceiveStockinDetail">
+        insert into receive_stockin_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="lotNo != null and lotNo != ''">lot_no,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">#{lotNo},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+         </trim>
+    </insert>
+    <insert id="insertReceiveStockinDetailHistory">
+        insert into receive_stockin_detail_finish
+        select * from receive_stockin_detail where stockin_guid = #{receiveStockinGuid}
+    </insert>
+
+    <update id="updateReceiveStockinDetail" parameterType="ReceiveStockinDetail">
+        update receive_stockin_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid = #{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="lotNo != null and lotNo != ''">lot_no = #{lotNo},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+        </trim>
+        where stockin_detail_id = #{stockinDetailId}
+    </update>
+
+    <delete id="deleteReceiveStockinDetailByStockinDetailId" parameterType="String">
+        delete from receive_stockin_detail where stockin_detail_id = #{stockinDetailId}
+    </delete>
+
+    <delete id="deleteReceiveStockinDetailByStockinDetailIds" parameterType="String">
+        delete from receive_stockin_detail where stockin_detail_id in
+        <foreach item="stockinDetailId" collection="array" open="(" separator="," close=")">
+            #{stockinDetailId}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml
new file mode 100644
index 0000000..7acb93b
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinFinishMapper.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper">
+
+    <resultMap type="ReceiveStockinFinish" id="ReceiveStockinFinishResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+    </resultMap>
+    <resultMap type="ReceiveStockin" id="ReceiveStockinResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="createManName"    column="user_name"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="departmentName"    column="dept_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+    </resultMap>
+
+    <sql id="selectReceiveStockinFinishVo">
+        select
+            rs.stockin_guid ,
+            rs.stockin_id ,
+            rs.in_type ,
+            rs.create_date ,
+            rs.create_man_id ,
+            rs.status ,
+            rs.warehouse_id ,
+            bw.warehouse_name ,
+            rs.spare5 ,
+            rs.spare4 ,
+            rs.spare3 ,
+            rs.finish_date ,
+            rs.spare2 ,
+            rs.spare1,
+            rs.erp_bill ,
+            rs.stock_source,
+            rs.department_no,
+            rs.customer_no,
+            rs.class_no,
+            rs.supplier_no,
+            bs.supplier_name,
+            sd.dept_name,
+            su.user_name
+        from receive_stockin_finish rs
+                 left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
+                 left join bas_supplier bs on rs.supplier_no = bs.supplier_no
+                 left join sys_dept sd on rs.department_no = sd.dept_id
+                 left join sys_user su on su.user_id = rs.create_man_id
+    </sql>
+
+    <select id="selectReceiveStockinFinishList" parameterType="ReceiveStockinFinish" resultMap="ReceiveStockinFinishResult">
+        <include refid="selectReceiveStockinFinishVo"/>
+        <where>
+            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and rs.in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and rs.create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and rs.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and rs.status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and rs.class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no like concat("%", #{supplierNo}, "%")</if>
+        </where>
+    </select>
+
+    <select id="selectReceiveStockinFinishByStockinGuid" parameterType="String" resultMap="ReceiveStockinFinishResult">
+        <include refid="selectReceiveStockinFinishVo"/>
+        where stockin_guid = #{stockinGuid}
+    </select>
+    <select id="selectReceiveStockinList" resultMap="ReceiveStockinResult">
+        <include refid="selectReceiveStockinFinishVo"/>
+        <where>
+            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and rs.in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and rs.create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and rs.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and rs.status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and rs.class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="materialDesc !=null and materialDesc!=''">
+                and rs.stockin_id in (
+                select distinct stockin_id from receive_stockin_detail_finish rsd
+                left join bas_product bp on rsd.product_id = bp.product_id
+                where bp.product_name like concat('%',#{materialDesc},'%')
+                )
+            </if>
+            <if test="lotNo !=null and lotNo!=''">
+                and rs.stockin_id in (
+                select distinct stockin_id from receive_stockin_detail_finish rsd
+                where rsd.lot_no like concat('%',#{lotNo},'%')
+                )
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+             order by rs.create_date desc
+    </select>
+
+    <insert id="insertReceiveStockinFinish" parameterType="ReceiveStockinFinish">
+        insert into receive_stockin_finish
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+         </trim>
+    </insert>
+
+    <update id="updateReceiveStockinFinish" parameterType="ReceiveStockinFinish">
+        update receive_stockin_finish
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteReceiveStockinFinishByStockinGuid" parameterType="String">
+        delete from receive_stockin_finish where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteReceiveStockinFinishByStockinGuids" parameterType="String">
+        delete from receive_stockin_finish where stockin_guid in
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml
new file mode 100644
index 0000000..bd93721
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/receive/ReceiveStockinMapper.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.receive.stockin.mapper.ReceiveStockinMapper">
+
+    <resultMap type="ReceiveStockin" id="ReceiveStockinResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="createManName"    column="user_name"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="departmentName"    column="dept_name"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="supplierName"    column="supplier_name"    />
+    </resultMap>
+
+    <sql id="selectReceiveStockinVo">
+        select
+            rs.stockin_guid ,
+            rs.stockin_id ,
+            rs.in_type ,
+            rs.create_date ,
+            rs.create_man_id ,
+            rs.status ,
+            rs.warehouse_id ,
+            bw.warehouse_name ,
+            rs.spare5 ,
+            rs.spare4 ,
+            rs.spare3 ,
+            rs.finish_date ,
+            rs.spare2 ,
+            rs.spare1,
+            rs.erp_bill ,
+            rs.stock_source,
+            rs.department_no,
+            rs.customer_no,
+            rs.class_no,
+            rs.supplier_no,
+            bs.supplier_name,
+            sd.dept_name,
+            su.user_name
+        from receive_stockin rs
+        left join bas_warehouse bw on rs.warehouse_id = bw.warehouse_id
+        left join bas_supplier bs on rs.supplier_no = bs.supplier_no
+        left join sys_dept sd on rs.department_no = sd.dept_id
+        left join sys_user su on su.user_id = rs.create_man_id
+
+    </sql>
+
+    <select id="selectReceiveStockinList" parameterType="ReceiveStockin" resultMap="ReceiveStockinResult">
+        <include refid="selectReceiveStockinVo"/>
+        <where>
+            <if test="stockinId != null  and stockinId != ''"> and rs.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and rs.in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and rs.create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and rs.create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and rs.status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and rs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and rs.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and rs.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and rs.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and rs.finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and rs.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and rs.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and rs.erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and rs.stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and rs.department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and rs.customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and rs.class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and rs.supplier_no like concat("%", #{supplierNo}, "%")</if>
+             <if test="materialDesc !=null and materialDesc!=''">
+                 and rs.stockin_id in (
+                 select distinct stockin_id from receive_stockin_detail rsd
+                 left join bas_product bp on rsd.product_id = bp.product_id
+                 where bp.product_name like concat('%',#{materialDesc},'%')
+                 )
+             </if>
+            <if test="lotNo !=null and lotNo!=''">
+                and rs.stockin_id in (
+                select distinct stockin_id from receive_stockin_detail rsd
+                where rsd.lot_no like concat('%',#{lotNo},'%')
+                )
+            </if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+             order by rs.create_date desc
+    </select>
+
+    <select id="selectReceiveStockinByStockinGuid" parameterType="String" resultMap="ReceiveStockinResult">
+        <include refid="selectReceiveStockinVo"/>
+        where rs.stockin_guid = #{stockinGuid}
+    </select>
+
+    <insert id="insertReceiveStockin" parameterType="ReceiveStockin">
+        insert into receive_stockin
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+         </trim>
+    </insert>
+    <insert id="insertReceiveStockinHistory">
+        insert into receive_stockin_finish
+        select * from receive_stockin where stockin_guid = #{stockinGuid}
+    </insert>
+
+    <update id="updateReceiveStockin" parameterType="ReceiveStockin">
+        update receive_stockin
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteReceiveStockinByStockinGuid" parameterType="String">
+        delete from receive_stockin where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteReceiveStockinByStockinGuids" parameterType="String">
+        delete from receive_stockin where stockin_guid in
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml
new file mode 100644
index 0000000..56a21c2
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/requestInterface/RequestLogMapper.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.log.mapper.RequestLogMapper">
+    
+    <resultMap type="RequestLog" id="RequestLogResult">
+        <result property="requestId"    column="request_id"    />
+        <result property="requestTime"    column="request_time"    />
+        <result property="sourceSystem"    column="source_system"    />
+        <result property="targetSystem"    column="target_system"    />
+        <result property="endpoint"    column="endpoint"    />
+        <result property="requestUrl"    column="request_url"    />
+        <result property="requestMethod"    column="request_method"    />
+        <result property="requestHeaders"    column="request_headers"    />
+        <result property="requestBody"    column="request_body"    />
+        <result property="responseTime"    column="response_time"    />
+        <result property="responseBody"    column="response_body"    />
+        <result property="responseStatus"    column="response_status"    />
+        <result property="errorDetails"    column="error_details"    />
+        <result property="duration"    column="duration"    />
+        <result property="isSuccessful"    column="Is_successful"    />
+    </resultMap>
+
+    <sql id="selectRequestLogVo">
+        select request_id, request_time, source_system, target_system, endpoint, request_url, request_method, request_headers, request_body, response_time, response_body, response_status, error_details, duration, Is_successful from request_log
+    </sql>
+
+    <select id="selectRequestLogList" parameterType="RequestLog" resultMap="RequestLogResult">
+        <include refid="selectRequestLogVo"/>
+        <where>  
+            <if test="requestTime != null  and requestTime != ''"> and request_time like concat("%", #{requestTime}, "%")</if>
+            <if test="sourceSystem != null  and sourceSystem != ''"> and source_system like concat("%", #{sourceSystem}, "%")</if>
+            <if test="targetSystem != null  and targetSystem != ''"> and target_system like concat("%", #{targetSystem}, "%")</if>
+            <if test="endpoint != null  and endpoint != ''"> and endpoint like concat("%", #{endpoint}, "%")</if>
+            <if test="requestUrl != null  and requestUrl != ''"> and request_url like concat("%", #{requestUrl}, "%")</if>
+            <if test="requestMethod != null  and requestMethod != ''"> and request_method like concat("%", #{requestMethod}, "%")</if>
+            <if test="requestHeaders != null  and requestHeaders != ''"> and request_headers like concat("%", #{requestHeaders}, "%")</if>
+            <if test="requestBody != null  and requestBody != ''"> and request_body like concat("%", #{requestBody}, "%")</if>
+            <if test="responseTime != null  and responseTime != ''"> and response_time like concat("%", #{responseTime}, "%")</if>
+            <if test="responseBody != null  and responseBody != ''"> and response_body like concat("%", #{responseBody}, "%")</if>
+            <if test="responseStatus != null  and responseStatus != ''"> and response_status like concat("%", #{responseStatus}, "%")</if>
+            <if test="errorDetails != null  and errorDetails != ''"> and error_details like concat("%", #{errorDetails}, "%")</if>
+            <if test="duration != null  and duration != ''"> and duration like concat("%", #{duration}, "%")</if>
+            <if test="isSuccessful != null  and isSuccessful != ''"> and Is_successful like concat("%", #{isSuccessful}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectRequestLogByRequestId" parameterType="Long" resultMap="RequestLogResult">
+        <include refid="selectRequestLogVo"/>
+        where request_id = #{requestId}
+    </select>
+
+    <insert id="insertRequestLog" parameterType="RequestLog" useGeneratedKeys="true" keyProperty="requestId">
+        insert into request_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="requestTime != null">request_time,</if>
+            <if test="sourceSystem != null">source_system,</if>
+            <if test="targetSystem != null">target_system,</if>
+            <if test="endpoint != null">endpoint,</if>
+            <if test="requestUrl != null">request_url,</if>
+            <if test="requestMethod != null">request_method,</if>
+            <if test="requestHeaders != null">request_headers,</if>
+            <if test="requestBody != null">request_body,</if>
+            <if test="responseTime != null">response_time,</if>
+            <if test="responseBody != null">response_body,</if>
+            <if test="responseStatus != null">response_status,</if>
+            <if test="errorDetails != null">error_details,</if>
+            <if test="duration != null">duration,</if>
+            <if test="isSuccessful != null">Is_successful,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="requestTime != null">#{requestTime},</if>
+            <if test="sourceSystem != null">#{sourceSystem},</if>
+            <if test="targetSystem != null">#{targetSystem},</if>
+            <if test="endpoint != null">#{endpoint},</if>
+            <if test="requestUrl != null">#{requestUrl},</if>
+            <if test="requestMethod != null">#{requestMethod},</if>
+            <if test="requestHeaders != null">#{requestHeaders},</if>
+            <if test="requestBody != null">#{requestBody},</if>
+            <if test="responseTime != null">#{responseTime},</if>
+            <if test="responseBody != null">#{responseBody},</if>
+            <if test="responseStatus != null">#{responseStatus},</if>
+            <if test="errorDetails != null">#{errorDetails},</if>
+            <if test="duration != null">#{duration},</if>
+            <if test="isSuccessful != null">#{isSuccessful},</if>
+         </trim>
+    </insert>
+
+    <update id="updateRequestLog" parameterType="RequestLog">
+        update request_log
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="requestTime != null">request_time = #{requestTime},</if>
+            <if test="sourceSystem != null">source_system = #{sourceSystem},</if>
+            <if test="targetSystem != null">target_system = #{targetSystem},</if>
+            <if test="endpoint != null">endpoint = #{endpoint},</if>
+            <if test="requestUrl != null">request_url = #{requestUrl},</if>
+            <if test="requestMethod != null">request_method = #{requestMethod},</if>
+            <if test="requestHeaders != null">request_headers = #{requestHeaders},</if>
+            <if test="requestBody != null">request_body = #{requestBody},</if>
+            <if test="responseTime != null">response_time = #{responseTime},</if>
+            <if test="responseBody != null">response_body = #{responseBody},</if>
+            <if test="responseStatus != null">response_status = #{responseStatus},</if>
+            <if test="errorDetails != null">error_details = #{errorDetails},</if>
+            <if test="duration != null">duration = #{duration},</if>
+            <if test="isSuccessful != null">Is_successful = #{isSuccessful},</if>
+        </trim>
+        where request_id = #{requestId}
+    </update>
+
+    <delete id="deleteRequestLogByRequestId" parameterType="Long">
+        delete from request_log where request_id = #{requestId}
+    </delete>
+
+    <delete id="deleteRequestLogByRequestIds" parameterType="String">
+        delete from request_log where request_id in 
+        <foreach item="requestId" collection="array" open="(" separator="," close=")">
+            #{requestId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml
new file mode 100644
index 0000000..81e64fe
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/StockSummaryMapper.xml
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.StockSummary.mapper.StockSummaryMapper">
+
+    <resultMap type="StockSummary" id="StockSummaryResult">
+        <result property="onlyIdentity"    column="only_identity"    />
+        <result property="stockId" column="stock_id" />
+        <result property="cargoSpaceId" column="cargo_space_id" />
+        <result property="stockStatus" column="stock_status" />
+        <result property="productStatus" column="product_status" />
+        <result property="lotNo" column="lot_no" />
+        <result property="inDate" column="in_date" />
+        <result property="backDate" column="back_date" />
+        <result property="productGuid" column="product_guid" />
+        <result property="quantity" column="quantity" />
+        <result property="jobId" column="job_id" />
+        <result property="trayCode" column="tray_code" />
+        <result property="outQuantity" column="out_quantity" />
+        <result property="stockinDetailId" column="stockin_detail_id" />
+        <result property="stockinId" column="stockin_id" />
+        <result property="inType" column="in_type" />
+        <result property="inClassId" column="in_class_id" />
+        <result property="warehouseId" column="warehouse_id" />
+        <result property="stackingId" column="stacking_id" />
+        <result property="productId" column="product_id" />
+        <result property="productName" column="product_name" />
+        <result property="voltage" column="voltage" />
+        <result property="power" column="power" />
+        <result property="phase" column="phase" />
+        <result property="orderId" column="order_id" />
+        <result property="cargoSpaceName" column="cargo_space_name" />
+        <result property="cargoSpaceStatus" column="cargo_space_status" />
+        <result property="locked" column="locked" />
+        <result property="spare1" column="spare1" />
+        <result property="spare2" column="spare2" />
+        <result property="spare3" column="spare3" />
+        <result property="spare4" column="spare4" />
+        <result property="spare5" column="spare5" />
+        <result property="spare6" column="spare6" />
+        <result property="spare7" column="spare7" />
+        <result property="spare8" column="spare8" />
+        <result property="netWeight" column="net_weight" />
+        <result property="grossWeight" column="gross_weight" />
+        <result property="distribution" column="distribution" />
+        <result property="model" column="model" />
+    </resultMap>
+
+    <sql id="selectStockSummaryVo">
+        SELECT
+            <choose>
+                <when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupByOrderId != null and groupByOrderId or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByCargoSpaceId != null and groupByCargoSpaceId or groupByStockId != null and groupByStockId or groupByStockStatus != null and groupByStockStatus or groupByProductStatus != null and groupByProductStatus or groupByInDate != null and groupByInDate or groupByBackDate != null and groupByBackDate or groupByProductGuid != null and groupByProductGuid or groupByJobId != null and groupByJobId or groupByTrayCode != null and groupByTrayCode or groupByOutQuantity != null and groupByOutQuantity or groupByStockinDetailId != null and groupByStockinDetailId or groupByStockinId != null and groupByStockinId or groupByInType != null and groupByInType or groupByInClassId != null and groupByInClassId or groupByStackingId != null and groupByStackingId or groupByVoltage != null and groupByVoltage or groupByPower != null and groupByPower or groupByPhase != null and groupByPhase or groupByCargoSpaceName != null and groupByCargoSpaceName or groupByCargoSpaceStatus != null and groupByCargoSpaceStatus or groupByLocked != null and groupByLocked or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare3 != null and groupBySpare3 or groupBySpare4 != null and groupBySpare4 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8 or groupByNetWeight != null and groupByNetWeight or groupByGrossWeight != null and groupByGrossWeight or groupByDistribution != null and groupByDistribution or groupByModel != null and groupByModel">
+                    <if test="groupByStockId != null and groupByStockId">s.stock_id,</if>
+                    <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">s.cargo_space_id,</if>
+                    <if test="groupByStockStatus != null and groupByStockStatus">s.stock_status,</if>
+                    <if test="groupByProductStatus != null and groupByProductStatus">s.product_status,</if>
+                    <if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
+                    <if test="groupByInDate != null and groupByInDate">s.in_date,</if>
+                    <if test="groupByBackDate != null and groupByBackDate">s.back_date,</if>
+                    <if test="groupByProductGuid != null and groupByProductGuid">s.product_guid,</if>
+                    <if test="groupByJobId != null and groupByJobId">s.job_id,</if>
+                    <if test="groupByTrayCode != null and groupByTrayCode">s.tray_code,</if>
+                    <if test="groupByOutQuantity != null and groupByOutQuantity">s.out_quantity,</if>
+                    <if test="groupByStockinDetailId != null and groupByStockinDetailId">s.stockin_detail_id,</if>
+                    <if test="groupByStockinId != null and groupByStockinId">s.stockin_id,</if>
+                    <if test="groupByInType != null and groupByInType">s.in_type,</if>
+                    <if test="groupByInClassId != null and groupByInClassId">s.in_class_id,</if>
+                    <if test="groupByWarehouseId != null and groupByWarehouseId">s.warehouse_id,</if>
+                    <if test="groupByStackingId != null and groupByStackingId">s.stacking_id,</if>
+                    <if test="groupByProductId != null and groupByProductId">s.product_id,</if>
+                    <if test="groupByProductName != null and groupByProductName">s.product_name,</if>
+                    <if test="groupByVoltage != null and groupByVoltage">s.voltage,</if>
+                    <if test="groupByPower != null and groupByPower">s.power,</if>
+                    <if test="groupByPhase != null and groupByPhase">s.phase,</if>
+                    <if test="groupByOrderId != null and groupByOrderId">s.order_id,</if>
+                    <if test="groupByCargoSpaceName != null and groupByCargoSpaceName">bcs.cargo_space_name,</if>
+                    <if test="groupByCargoSpaceStatus != null and groupByCargoSpaceStatus">bcs.status as cargo_space_status,</if>
+                    <if test="groupByLocked != null and groupByLocked">bcs.locked,</if>
+                    <if test="groupBySpare1 != null and groupBySpare1">s.spare1,</if>
+                    <if test="groupBySpare2 != null and groupBySpare2">s.spare2,</if>
+                    <if test="groupBySpare3 != null and groupBySpare3">s.spare3,</if>
+                    <if test="groupBySpare4 != null and groupBySpare4">s.spare4,</if>
+                    <if test="groupBySpare5 != null and groupBySpare5">s.spare5,</if>
+                    <if test="groupBySpare6 != null and groupBySpare6">s.spare6,</if>
+                    <if test="groupBySpare7 != null and groupBySpare7">s.spare7,</if>
+                    <if test="groupBySpare8 != null and groupBySpare8">s.spare8,</if>
+                    <if test="groupByNetWeight != null and groupByNetWeight">s.net_weight,</if>
+                    <if test="groupByGrossWeight != null and groupByGrossWeight">s.gross_weight,</if>
+                    <if test="groupByDistribution != null and groupByDistribution">s.distribution,</if>
+                    <if test="groupByModel != null and groupByModel">s.model,</if>
+                    SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
+                    FROM bas_stock s
+                    LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id
+                    <where>
+                        <if test="stockId != null and stockId != ''"> AND s.stock_id like concat('%', #{stockId}, '%')</if>
+                        <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+                        <if test="stockStatus != null and stockStatus != ''"> AND s.stock_status like concat('%', #{stockStatus}, '%')</if>
+                        <if test="productStatus != null and productStatus != ''"> AND s.product_status like concat('%', #{productStatus}, '%')</if>
+                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
+                        <if test="inDate != null and inDate != ''"> AND s.in_date like concat('%', #{inDate}, '%')</if>
+                        <if test="backDate != null and backDate != ''"> AND s.back_date like concat('%', #{backDate}, '%')</if>
+                        <if test="productGuid != null and productGuid != ''"> AND s.product_guid like concat('%', #{productGuid}, '%')</if>
+                        <if test="jobId != null and jobId != ''"> AND s.job_id like concat('%', #{jobId}, '%')</if>
+                        <if test="trayCode != null and trayCode != ''"> AND s.tray_code like concat('%', #{trayCode}, '%')</if>
+                        <if test="outQuantity != null and outQuantity != ''"> AND s.out_quantity like concat('%', #{outQuantity}, '%')</if>
+                        <if test="stockinDetailId != null and stockinDetailId != ''"> AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+                        <if test="stockinId != null and stockinId != ''"> AND s.stockin_id like concat('%', #{stockinId}, '%')</if>
+                        <if test="inType != null and inType != ''"> AND s.in_type like concat('%', #{inType}, '%')</if>
+                        <if test="inClassId != null and inClassId != ''"> AND s.in_class_id like concat('%', #{inClassId}, '%')</if>
+                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
+                        <if test="stackingId != null and stackingId != ''"> AND s.stacking_id like concat('%', #{stackingId}, '%')</if>
+                        <if test="productId != null and productId != ''"> AND s.product_id like concat('%', #{productId}, '%')</if>
+                        <if test="productName != null and productName != ''"> AND s.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="voltage != null and voltage != ''"> AND s.voltage like concat('%', #{voltage}, '%')</if>
+                        <if test="power != null and power != ''"> AND s.power like concat('%', #{power}, '%')</if>
+                        <if test="phase != null and phase != ''"> AND s.phase like concat('%', #{phase}, '%')</if>
+                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
+                        <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+                        <if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> AND bcs.status like concat('%', #{cargoSpaceStatus}, '%')</if>
+                        <if test="locked != null and locked != ''"> AND bcs.locked like concat('%', #{locked}, '%')</if>
+                        <if test="spare1 != null and spare1 != ''"> AND s.spare1 like concat('%', #{spare1}, '%')</if>
+                        <if test="spare2 != null and spare2 != ''"> AND s.spare2 like concat('%', #{spare2}, '%')</if>
+                        <if test="spare3 != null and spare3 != ''"> AND s.spare3 like concat('%', #{spare3}, '%')</if>
+                        <if test="spare4 != null and spare4 != ''"> AND s.spare4 like concat('%', #{spare4}, '%')</if>
+                        <if test="spare5 != null and spare5 != ''"> AND s.spare5 like concat('%', #{spare5}, '%')</if>
+                        <if test="spare6 != null and spare6 != ''"> AND s.spare6 like concat('%', #{spare6}, '%')</if>
+                        <if test="spare7 != null and spare7 != ''"> AND s.spare7 like concat('%', #{spare7}, '%')</if>
+                        <if test="spare8 != null and spare8 != ''"> AND s.spare8 like concat('%', #{spare8}, '%')</if>
+                        <if test="netWeight != null and netWeight != ''"> AND s.net_weight like concat('%', #{netWeight}, '%')</if>
+                        <if test="grossWeight != null and grossWeight != ''"> AND s.gross_weight like concat('%', #{grossWeight}, '%')</if>
+                        <if test="distribution != null and distribution != ''"> AND s.distribution like concat('%', #{distribution}, '%')</if>
+                        <if test="model != null and model != ''"> AND s.model like concat('%', #{model}, '%')</if>
+                    </where>
+                    GROUP BY
+                    <trim prefixOverrides=",">
+                        <if test="groupByStockId != null and groupByStockId">,s.stock_id</if>
+                        <if test="groupByCargoSpaceId != null and groupByCargoSpaceId">,s.cargo_space_id</if>
+                        <if test="groupByStockStatus != null and groupByStockStatus">,s.stock_status</if>
+                        <if test="groupByProductStatus != null and groupByProductStatus">,s.product_status</if>
+                        <if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
+                        <if test="groupByInDate != null and groupByInDate">,s.in_date</if>
+                        <if test="groupByBackDate != null and groupByBackDate">,s.back_date</if>
+                        <if test="groupByProductGuid != null and groupByProductGuid">,s.product_guid</if>
+                        <if test="groupByJobId != null and groupByJobId">,s.job_id</if>
+                        <if test="groupByTrayCode != null and groupByTrayCode">,s.tray_code</if>
+                        <if test="groupByOutQuantity != null and groupByOutQuantity">,s.out_quantity</if>
+                        <if test="groupByStockinDetailId != null and groupByStockinDetailId">,s.stockin_detail_id</if>
+                        <if test="groupByStockinId != null and groupByStockinId">,s.stockin_id</if>
+                        <if test="groupByInType != null and groupByInType">,s.in_type</if>
+                        <if test="groupByInClassId != null and groupByInClassId">,s.in_class_id</if>
+                        <if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
+                        <if test="groupByStackingId != null and groupByStackingId">,s.stacking_id</if>
+                        <if test="groupByProductId != null and groupByProductId">,s.product_id</if>
+                        <if test="groupByProductName != null and groupByProductName">,s.product_name</if>
+                        <if test="groupByVoltage != null and groupByVoltage">,s.voltage</if>
+                        <if test="groupByPower != null and groupByPower">,s.power</if>
+                        <if test="groupByPhase != null and groupByPhase">,s.phase</if>
+                        <if test="groupByOrderId != null and groupByOrderId">,s.order_id</if>
+                        <if test="groupByCargoSpaceName != null and groupByCargoSpaceName">,bcs.cargo_space_name</if>
+                        <if test="groupByCargoSpaceStatus != null and groupByCargoSpaceStatus">,bcs.status</if>
+                        <if test="groupByLocked != null and groupByLocked">,bcs.locked</if>
+                        <if test="groupBySpare1 != null and groupBySpare1">,s.spare1</if>
+                        <if test="groupBySpare2 != null and groupBySpare2">,s.spare2</if>
+                        <if test="groupBySpare3 != null and groupBySpare3">,s.spare3</if>
+                        <if test="groupBySpare4 != null and groupBySpare4">,s.spare4</if>
+                        <if test="groupBySpare5 != null and groupBySpare5">,s.spare5</if>
+                        <if test="groupBySpare6 != null and groupBySpare6">,s.spare6</if>
+                        <if test="groupBySpare7 != null and groupBySpare7">,s.spare7</if>
+                        <if test="groupBySpare8 != null and groupBySpare8">,s.spare8</if>
+                        <if test="groupByNetWeight != null and groupByNetWeight">,s.net_weight</if>
+                        <if test="groupByGrossWeight != null and groupByGrossWeight">,s.gross_weight</if>
+                        <if test="groupByDistribution != null and groupByDistribution">,s.distribution</if>
+                        <if test="groupByModel != null and groupByModel">,s.model</if>
+                    </trim>
+                </when>
+                <otherwise>
+                    1 as group_all,
+                    SUM(CAST(s.quantity AS DECIMAL(18,2))) as quantity
+                    FROM bas_stock s
+                    LEFT JOIN bas_cargo_space bcs ON bcs.cargo_space_id = s.cargo_space_id
+                    <where>
+                        <if test="stockId != null and stockId != ''"> AND s.stock_id like concat('%', #{stockId}, '%')</if>
+                        <if test="cargoSpaceId != null and cargoSpaceId != ''"> AND s.cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+                        <if test="stockStatus != null and stockStatus != ''"> AND s.stock_status like concat('%', #{stockStatus}, '%')</if>
+                        <if test="productStatus != null and productStatus != ''"> AND s.product_status like concat('%', #{productStatus}, '%')</if>
+                        <if test="lotNo != null and lotNo != ''"> AND s.lot_no like concat('%', #{lotNo}, '%')</if>
+                        <if test="inDate != null and inDate != ''"> AND s.in_date like concat('%', #{inDate}, '%')</if>
+                        <if test="backDate != null and backDate != ''"> AND s.back_date like concat('%', #{backDate}, '%')</if>
+                        <if test="productGuid != null and productGuid != ''"> AND s.product_guid like concat('%', #{productGuid}, '%')</if>
+                        <if test="jobId != null and jobId != ''"> AND s.job_id like concat('%', #{jobId}, '%')</if>
+                        <if test="trayCode != null and trayCode != ''"> AND s.tray_code like concat('%', #{trayCode}, '%')</if>
+                        <if test="outQuantity != null and outQuantity != ''"> AND s.out_quantity like concat('%', #{outQuantity}, '%')</if>
+                        <if test="stockinDetailId != null and stockinDetailId != ''"> AND s.stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+                        <if test="stockinId != null and stockinId != ''"> AND s.stockin_id like concat('%', #{stockinId}, '%')</if>
+                        <if test="inType != null and inType != ''"> AND s.in_type like concat('%', #{inType}, '%')</if>
+                        <if test="inClassId != null and inClassId != ''"> AND s.in_class_id like concat('%', #{inClassId}, '%')</if>
+                        <if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id like concat('%', #{warehouseId}, '%')</if>
+                        <if test="stackingId != null and stackingId != ''"> AND s.stacking_id like concat('%', #{stackingId}, '%')</if>
+                        <if test="productId != null and productId != ''"> AND s.product_id like concat('%', #{productId}, '%')</if>
+                        <if test="productName != null and productName != ''"> AND s.product_name like concat('%', #{productName}, '%')</if>
+                        <if test="voltage != null and voltage != ''"> AND s.voltage like concat('%', #{voltage}, '%')</if>
+                        <if test="power != null and power != ''"> AND s.power like concat('%', #{power}, '%')</if>
+                        <if test="phase != null and phase != ''"> AND s.phase like concat('%', #{phase}, '%')</if>
+                        <if test="orderId != null and orderId != ''"> AND s.order_id like concat('%', #{orderId}, '%')</if>
+                        <if test="cargoSpaceName != null and cargoSpaceName != ''"> AND bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+                        <if test="cargoSpaceStatus != null and cargoSpaceStatus != ''"> AND bcs.status like concat('%', #{cargoSpaceStatus}, '%')</if>
+                        <if test="locked != null and locked != ''"> AND bcs.locked like concat('%', #{locked}, '%')</if>
+                        <if test="spare1 != null and spare1 != ''"> AND s.spare1 like concat('%', #{spare1}, '%')</if>
+                        <if test="spare2 != null and spare2 != ''"> AND s.spare2 like concat('%', #{spare2}, '%')</if>
+                        <if test="spare3 != null and spare3 != ''"> AND s.spare3 like concat('%', #{spare3}, '%')</if>
+                        <if test="spare4 != null and spare4 != ''"> AND s.spare4 like concat('%', #{spare4}, '%')</if>
+                        <if test="spare5 != null and spare5 != ''"> AND s.spare5 like concat('%', #{spare5}, '%')</if>
+                        <if test="spare6 != null and spare6 != ''"> AND s.spare6 like concat('%', #{spare6}, '%')</if>
+                        <if test="spare7 != null and spare7 != ''"> AND s.spare7 like concat('%', #{spare7}, '%')</if>
+                        <if test="spare8 != null and spare8 != ''"> AND s.spare8 like concat('%', #{spare8}, '%')</if>
+                        <if test="netWeight != null and netWeight != ''"> AND s.net_weight like concat('%', #{netWeight}, '%')</if>
+                        <if test="grossWeight != null and grossWeight != ''"> AND s.gross_weight like concat('%', #{grossWeight}, '%')</if>
+                        <if test="distribution != null and distribution != ''"> AND s.distribution like concat('%', #{distribution}, '%')</if>
+                        <if test="model != null and model != ''"> AND s.model like concat('%', #{model}, '%')</if>
+                    </where>
+                </otherwise>
+            </choose>
+    </sql>
+
+    <select id="selectStockSummaryList" parameterType="StockSummary" resultMap="StockSummaryResult">
+        <include refid="selectStockSummaryVo"/>
+    </select>
+
+    <select id="selectStockSummaryByOnlyIdentity" parameterType="Long" resultMap="StockSummaryResult">
+        <include refid="selectStockSummaryVo"/>
+        where only_identity = #{onlyIdentity}
+    </select>
+
+    <insert id="insertStockSummary" parameterType="StockSummary">
+        insert into stock_summary
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="onlyIdentity != null">only_identity,</if>
+            <if test="productId != null and productId != ''">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="price != null">price,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
+            <if test="remark != null">remark,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="quantity != null">quantity,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="onlyIdentity != null">#{onlyIdentity},</if>
+            <if test="productId != null and productId != ''">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="price != null">#{price},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="quantity != null">#{quantity},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStockSummary" parameterType="StockSummary">
+        update stock_summary
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="productId != null and productId != ''">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+        </trim>
+        where only_identity = #{onlyIdentity}
+    </update>
+
+    <delete id="deleteStockSummaryByOnlyIdentity" parameterType="Long">
+        delete from stock_summary where only_identity = #{onlyIdentity}
+    </delete>
+
+    <delete id="deleteStockSummaryByOnlyIdentitys" parameterType="String">
+        delete from stock_summary where only_identity in
+        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
+            #{onlyIdentity}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml
new file mode 100644
index 0000000..79a1a0a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseInFlowMapper.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewFlatWarehouseInFlow.mapper.ViewFlatWarehouseInFlowMapper">
+
+    <resultMap type="ViewFlatWarehouseInFlow" id="ViewFlatWarehouseInFlowResult">
+        <result property="id"    column="id"    />
+        <result property="inOrOut"    column="in_or_out"    />
+        <result property="inOrOutSotckId"    column="in_or_out_sotck_id"    />
+        <result property="inOrOutSotckDetailId"    column="in_or_out_sotck_detail_id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createMan"    column="create_man"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="address"    column="address"    />
+        <result property="cDesc"    column="c_desc"    />
+        <result property="warehouseKind"    column="warehouse_kind"    />
+        <result property="warehouseType"    column="warehouse_type"    />
+        <result property="isCurrent"    column="is_current"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="price"    column="price"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectViewFlatWarehouseInFlowVo">
+        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow vfwif
+    </sql>
+
+    <select id="selectViewFlatWarehouseInFlowList" parameterType="ViewFlatWarehouseInFlow" resultMap="ViewFlatWarehouseInFlowResult">
+        <include refid="selectViewFlatWarehouseInFlowVo"/>
+        <where>
+            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
+            <if test="inOrOutSotckId != null  and inOrOutSotckId != ''"> and in_or_out_sotck_id like concat('%', #{inOrOutSotckId}, '%')</if>
+            <if test="inOrOutSotckDetailId != null  and inOrOutSotckDetailId != ''"> and in_or_out_sotck_detail_id like concat('%', #{inOrOutSotckDetailId}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
+            <if test="createMan != null  and createMan != ''"> and create_man like concat('%', #{createMan}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
+            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectViewFlatWarehouseInFlowById" parameterType="Long" resultMap="ViewFlatWarehouseInFlowResult">
+        <include refid="selectViewFlatWarehouseInFlowVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertViewFlatWarehouseInFlow" parameterType="ViewFlatWarehouseInFlow">
+        insert into view_flat_warehouse_in_flow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="inOrOut != null">in_or_out,</if>
+            <if test="inOrOutSotckId != null">in_or_out_sotck_id,</if>
+            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createMan != null">create_man,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="address != null">address,</if>
+            <if test="cDesc != null">c_desc,</if>
+            <if test="warehouseKind != null">warehouse_kind,</if>
+            <if test="warehouseType != null">warehouse_type,</if>
+            <if test="isCurrent != null">is_current,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="price != null">price,</if>
+            <if test="remark != null">remark,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="inOrOut != null">#{inOrOut},</if>
+            <if test="inOrOutSotckId != null">#{inOrOutSotckId},</if>
+            <if test="inOrOutSotckDetailId != null">#{inOrOutSotckDetailId},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createMan != null">#{createMan},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="address != null">#{address},</if>
+            <if test="cDesc != null">#{cDesc},</if>
+            <if test="warehouseKind != null">#{warehouseKind},</if>
+            <if test="warehouseType != null">#{warehouseType},</if>
+            <if test="isCurrent != null">#{isCurrent},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="price != null">#{price},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewFlatWarehouseInFlow" parameterType="ViewFlatWarehouseInFlow">
+        update view_flat_warehouse_in_flow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
+            <if test="inOrOutSotckId != null">in_or_out_sotck_id = #{inOrOutSotckId},</if>
+            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id = #{inOrOutSotckDetailId},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createMan != null">create_man = #{createMan},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="cDesc != null">c_desc = #{cDesc},</if>
+            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
+            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
+            <if test="isCurrent != null">is_current = #{isCurrent},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteViewFlatWarehouseInFlowById" parameterType="Long">
+        delete from view_flat_warehouse_in_flow where id = #{id}
+    </delete>
+
+    <delete id="deleteViewFlatWarehouseInFlowByIds" parameterType="String">
+        delete from view_flat_warehouse_in_flow where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml
new file mode 100644
index 0000000..5b617ec
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewFlatWarehouseOutFlowMapper.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewFlatWarehouseOutFlow.mapper.ViewFlatWarehouseOutFlowMapper">
+
+    <resultMap type="ViewFlatWarehouseOutFlow" id="ViewFlatWarehouseOutFlowResult">
+        <result property="id"    column="id"    />
+        <result property="inOrOut"    column="in_or_out"    />
+        <result property="inOrOutSotckId"    column="in_or_out_sotck_id"    />
+        <result property="inOrOutSotckDetailId"    column="in_or_out_sotck_detail_id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createMan"    column="create_man"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="address"    column="address"    />
+        <result property="cDesc"    column="c_desc"    />
+        <result property="warehouseKind"    column="warehouse_kind"    />
+        <result property="warehouseType"    column="warehouse_type"    />
+        <result property="isCurrent"    column="is_current"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="price"    column="price"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+    </resultMap>
+
+    <sql id="selectViewFlatWarehouseOutFlowVo">
+        select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec,  unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_out_flow vfwof
+    </sql>
+
+    <select id="selectViewFlatWarehouseOutFlowList" parameterType="ViewFlatWarehouseOutFlow" resultMap="ViewFlatWarehouseOutFlowResult">
+        <include refid="selectViewFlatWarehouseOutFlowVo"/>
+        <where>
+            <if test="inOrOut != null  and inOrOut != ''"> and in_or_out like concat('%', #{inOrOut}, '%')</if>
+            <if test="inOrOutSotckId != null  and inOrOutSotckId != ''"> and in_or_out_sotck_id like concat('%', #{inOrOutSotckId}, '%')</if>
+            <if test="inOrOutSotckDetailId != null  and inOrOutSotckDetailId != ''"> and in_or_out_sotck_detail_id like concat('%', #{inOrOutSotckDetailId}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
+            <if test="createMan != null  and createMan != ''"> and create_man like concat('%', #{createMan}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
+            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectViewFlatWarehouseOutFlowById" parameterType="Long" resultMap="ViewFlatWarehouseOutFlowResult">
+        <include refid="selectViewFlatWarehouseOutFlowVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertViewFlatWarehouseOutFlow" parameterType="ViewFlatWarehouseOutFlow">
+        insert into view_flat_warehouse_out_flow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="inOrOut != null">in_or_out,</if>
+            <if test="inOrOutSotckId != null">in_or_out_sotck_id,</if>
+            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createMan != null">create_man,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="address != null">address,</if>
+            <if test="cDesc != null">c_desc,</if>
+            <if test="warehouseKind != null">warehouse_kind,</if>
+            <if test="warehouseType != null">warehouse_type,</if>
+            <if test="isCurrent != null">is_current,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="price != null">price,</if>
+            <if test="remark != null">remark,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="inOrOut != null">#{inOrOut},</if>
+            <if test="inOrOutSotckId != null">#{inOrOutSotckId},</if>
+            <if test="inOrOutSotckDetailId != null">#{inOrOutSotckDetailId},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createMan != null">#{createMan},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="address != null">#{address},</if>
+            <if test="cDesc != null">#{cDesc},</if>
+            <if test="warehouseKind != null">#{warehouseKind},</if>
+            <if test="warehouseType != null">#{warehouseType},</if>
+            <if test="isCurrent != null">#{isCurrent},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="price != null">#{price},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewFlatWarehouseOutFlow" parameterType="ViewFlatWarehouseOutFlow">
+        update view_flat_warehouse_out_flow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
+            <if test="inOrOutSotckId != null">in_or_out_sotck_id = #{inOrOutSotckId},</if>
+            <if test="inOrOutSotckDetailId != null">in_or_out_sotck_detail_id = #{inOrOutSotckDetailId},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createMan != null">create_man = #{createMan},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="cDesc != null">c_desc = #{cDesc},</if>
+            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
+            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
+            <if test="isCurrent != null">is_current = #{isCurrent},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteViewFlatWarehouseOutFlowById" parameterType="Long">
+        delete from view_flat_warehouse_out_flow where id = #{id}
+    </delete>
+
+    <delete id="deleteViewFlatWarehouseOutFlowByIds" parameterType="String">
+        delete from view_flat_warehouse_out_flow where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml
new file mode 100644
index 0000000..827b64a
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewInJobFlowMapper.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewInJobFlow.mapper.ViewInJobFlowMapper">
+    
+    <resultMap type="ViewInJobFlow" id="ViewInJobFlowResult">
+        <result property="jobId"    column="job_id"    />
+        <result property="status"    column="status"    />
+        <result property="onLineType"    column="on_line_type"    />
+        <result property="taskNo"    column="task_no"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="departmentId"    column="department_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="targetRoadwayId"    column="target_roadway_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
+        <result property="lineId"    column="line_id"    />
+        <result property="workshopId"    column="workshop_id"    />
+        <result property="priority"    column="priority"    />
+        <result property="executionPhase"    column="execution_phase"    />
+        <result property="inOrOut"    column="in_or_out"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="entranceId"    column="entrance_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="classId"    column="class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="faultFlag"    column="fault_flag"    />
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+    </resultMap>
+
+    <sql id="selectViewInJobFlowVo">
+        select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_in_job_flow
+    </sql>
+
+    <select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
+        <include refid="selectViewInJobFlowVo"/>
+        <where>  
+            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="onLineType != null  and onLineType != ''"> and on_line_type like concat("%", #{onLineType}, "%")</if>
+            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="departmentId != null  and departmentId != ''"> and department_id like concat("%", #{departmentId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
+            <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
+            <if test="workshopId != null  and workshopId != ''"> and workshop_id like concat("%", #{workshopId}, "%")</if>
+            <if test="priority != null "> and priority like concat("%", #{priority}, "%")</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase like concat("%", #{executionPhase}, "%")</if>
+            <if test="inOrOut != null "> and in_or_out like concat("%", #{inOrOut}, "%")</if>
+            <if test="startTime != null  and startTime != ''"> and start_time like concat("%", #{startTime}, "%")</if>
+            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
+            <if test="entranceId != null  and entranceId != ''"> and entrance_id like concat("%", #{entranceId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="classId != null  and classId != ''"> and class_id like concat("%", #{classId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag like concat("%", #{faultFlag}, "%")</if>
+            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat("%", #{jobDetailId}, "%")</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
+            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
+            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity like concat("%", #{inQuantity}, "%")</if>
+            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity like concat("%", #{stockQuantity}, "%")</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectViewInJobFlowByJobId" parameterType="String" resultMap="ViewInJobFlowResult">
+        <include refid="selectViewInJobFlowVo"/>
+        where job_id = #{jobId}
+    </select>
+
+    <insert id="insertViewInJobFlow" parameterType="ViewInJobFlow">
+        insert into view_in_job_flow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">job_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="onLineType != null">on_line_type,</if>
+            <if test="taskNo != null and taskNo != ''">task_no,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="departmentId != null">department_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="targetRoadwayId != null">target_roadway_id,</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
+            <if test="lineId != null">line_id,</if>
+            <if test="workshopId != null">workshop_id,</if>
+            <if test="priority != null">priority,</if>
+            <if test="executionPhase != null">execution_phase,</if>
+            <if test="inOrOut != null">in_or_out,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="entranceId != null">entrance_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="faultFlag != null">fault_flag,</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="inOrOutId != null">in_or_out_id,</if>
+            <if test="inOrOutDId != null">in_or_out_d_id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="inQuantity != null">in_quantity,</if>
+            <if test="stockQuantity != null">stock_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">#{jobId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="onLineType != null">#{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="departmentId != null">#{departmentId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
+            <if test="lineId != null">#{lineId},</if>
+            <if test="workshopId != null">#{workshopId},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="executionPhase != null">#{executionPhase},</if>
+            <if test="inOrOut != null">#{inOrOut},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="entranceId != null">#{entranceId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="faultFlag != null">#{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="inOrOutId != null">#{inOrOutId},</if>
+            <if test="inOrOutDId != null">#{inOrOutDId},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="inQuantity != null">#{inQuantity},</if>
+            <if test="stockQuantity != null">#{stockQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewInJobFlow" parameterType="ViewInJobFlow">
+        update view_in_job_flow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="onLineType != null">on_line_type = #{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
+            <if test="lineId != null">line_id = #{lineId},</if>
+            <if test="workshopId != null">workshop_id = #{workshopId},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
+            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="entranceId != null">entrance_id = #{entranceId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id = #{jobDetailId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
+            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
+            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
+        </trim>
+        where job_id = #{jobId}
+    </update>
+
+    <delete id="deleteViewInJobFlowByJobId" parameterType="String">
+        delete from view_in_job_flow where job_id = #{jobId}
+    </delete>
+
+    <delete id="deleteViewInJobFlowByJobIds" parameterType="String">
+        delete from view_in_job_flow where job_id in 
+        <foreach item="jobId" collection="array" open="(" separator="," close=")">
+            #{jobId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml
new file mode 100644
index 0000000..0b54225
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewOutJobFlowMapper.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewOutJobFlow.mapper.ViewOutJobFlowMapper">
+    
+    <resultMap type="ViewOutJobFlow" id="ViewOutJobFlowResult">
+        <result property="jobId"    column="job_id"    />
+        <result property="status"    column="status"    />
+        <result property="onLineType"    column="on_line_type"    />
+        <result property="taskNo"    column="task_no"    />
+        <result property="supplierId"    column="supplier_id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="departmentId"    column="department_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="targetRoadwayId"    column="target_roadway_id"    />
+        <result property="targetCargoSpaceId"    column="target_cargo_space_id"    />
+        <result property="lineId"    column="line_id"    />
+        <result property="workshopId"    column="workshop_id"    />
+        <result property="priority"    column="priority"    />
+        <result property="executionPhase"    column="execution_phase"    />
+        <result property="inOrOut"    column="in_or_out"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="startTime"    column="start_time"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="entranceId"    column="entrance_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="classId"    column="class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="faultFlag"    column="fault_flag"    />
+        <result property="jobDetailId"    column="job_detail_id"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="inOrOutId"    column="in_or_out_id"    />
+        <result property="inOrOutDId"    column="in_or_out_d_id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="inQuantity"    column="in_quantity"    />
+        <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spec"    column="spec"    />
+        <result property="unit"    column="unit"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+    </resultMap>
+
+    <sql id="selectViewOutJobFlowVo">
+        select job_id, status, on_line_type, task_no, supplier_id, customer_id, department_id, tray_code, roadway_id, cargo_space_id, target_roadway_id, target_cargo_space_id, line_id, workshop_id, priority, execution_phase, in_or_out, create_time, start_time, finish_time, entrance_id, exit_id, class_id, warehouse_id, fault_flag, job_detail_id, stock_id, lot_no, in_date, in_or_out_id, in_or_out_d_id, product_guid, stock_status, in_quantity, stock_quantity, out_quantity, stockin_id, stacking_id, spare1, spare2, spare3, stockin_detail_id, spare5, spare6, spec, unit, product_id, product_name, cargo_space_name from view_out_job_flow
+    </sql>
+
+    <select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
+        <include refid="selectViewOutJobFlowVo"/>
+        <where>  
+            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="onLineType != null  and onLineType != ''"> and on_line_type like concat("%", #{onLineType}, "%")</if>
+            <if test="taskNo != null  and taskNo != ''"> and task_no like concat('%', #{taskNo}, '%')</if>
+            <if test="supplierId != null  and supplierId != ''"> and supplier_id like concat("%", #{supplierId}, "%")</if>
+            <if test="customerId != null  and customerId != ''"> and customer_id like concat("%", #{customerId}, "%")</if>
+            <if test="departmentId != null  and departmentId != ''"> and department_id like concat("%", #{departmentId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat("%", #{roadwayId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="targetRoadwayId != null  and targetRoadwayId != ''"> and target_roadway_id like concat("%", #{targetRoadwayId}, "%")</if>
+            <if test="targetCargoSpaceId != null  and targetCargoSpaceId != ''"> and target_cargo_space_id like concat("%", #{targetCargoSpaceId}, "%")</if>
+            <if test="lineId != null  and lineId != ''"> and line_id like concat('%', #{lineId}, '%')</if>
+            <if test="workshopId != null  and workshopId != ''"> and workshop_id like concat("%", #{workshopId}, "%")</if>
+            <if test="priority != null "> and priority like concat("%", #{priority}, "%")</if>
+            <if test="executionPhase != null  and executionPhase != ''"> and execution_phase like concat("%", #{executionPhase}, "%")</if>
+            <if test="inOrOut != null "> and in_or_out like concat("%", #{inOrOut}, "%")</if>
+            <if test="startTime != null  and startTime != ''"> and start_time like concat("%", #{startTime}, "%")</if>
+            <if test="finishTime != null  and finishTime != ''"> and finish_time like concat("%", #{finishTime}, "%")</if>
+            <if test="entranceId != null  and entranceId != ''"> and entrance_id like concat("%", #{entranceId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="classId != null  and classId != ''"> and class_id like concat("%", #{classId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="faultFlag != null  and faultFlag != ''"> and fault_flag like concat("%", #{faultFlag}, "%")</if>
+            <if test="jobDetailId != null  and jobDetailId != ''"> and job_detail_id like concat("%", #{jobDetailId}, "%")</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
+            <if test="inOrOutId != null  and inOrOutId != ''"> and in_or_out_id like concat("%", #{inOrOutId}, "%")</if>
+            <if test="inOrOutDId != null  and inOrOutDId != ''"> and in_or_out_d_id like concat("%", #{inOrOutDId}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="inQuantity != null  and inQuantity != ''"> and in_quantity like concat("%", #{inQuantity}, "%")</if>
+            <if test="stockQuantity != null  and stockQuantity != ''"> and stock_quantity like concat("%", #{stockQuantity}, "%")</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectViewOutJobFlowByJobId" parameterType="String" resultMap="ViewOutJobFlowResult">
+        <include refid="selectViewOutJobFlowVo"/>
+        where job_id = #{jobId}
+    </select>
+
+    <insert id="insertViewOutJobFlow" parameterType="ViewOutJobFlow">
+        insert into view_out_job_flow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">job_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="onLineType != null">on_line_type,</if>
+            <if test="taskNo != null and taskNo != ''">task_no,</if>
+            <if test="supplierId != null">supplier_id,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="departmentId != null">department_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="targetRoadwayId != null">target_roadway_id,</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id,</if>
+            <if test="lineId != null">line_id,</if>
+            <if test="workshopId != null">workshop_id,</if>
+            <if test="priority != null">priority,</if>
+            <if test="executionPhase != null">execution_phase,</if>
+            <if test="inOrOut != null">in_or_out,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="entranceId != null">entrance_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="classId != null">class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="faultFlag != null">fault_flag,</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="inOrOutId != null">in_or_out_id,</if>
+            <if test="inOrOutDId != null">in_or_out_d_id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="inQuantity != null">in_quantity,</if>
+            <if test="stockQuantity != null">stock_quantity,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spec != null">spec,</if>
+            <if test="unit != null">unit,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="jobId != null and jobId != ''">#{jobId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="onLineType != null">#{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">#{taskNo},</if>
+            <if test="supplierId != null">#{supplierId},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="departmentId != null">#{departmentId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">#{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">#{targetCargoSpaceId},</if>
+            <if test="lineId != null">#{lineId},</if>
+            <if test="workshopId != null">#{workshopId},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="executionPhase != null">#{executionPhase},</if>
+            <if test="inOrOut != null">#{inOrOut},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="entranceId != null">#{entranceId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="classId != null">#{classId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="faultFlag != null">#{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">#{jobDetailId},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="inOrOutId != null">#{inOrOutId},</if>
+            <if test="inOrOutDId != null">#{inOrOutDId},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="inQuantity != null">#{inQuantity},</if>
+            <if test="stockQuantity != null">#{stockQuantity},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewOutJobFlow" parameterType="ViewOutJobFlow">
+        update view_out_job_flow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="onLineType != null">on_line_type = #{onLineType},</if>
+            <if test="taskNo != null and taskNo != ''">task_no = #{taskNo},</if>
+            <if test="supplierId != null">supplier_id = #{supplierId},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="departmentId != null">department_id = #{departmentId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="targetRoadwayId != null">target_roadway_id = #{targetRoadwayId},</if>
+            <if test="targetCargoSpaceId != null">target_cargo_space_id = #{targetCargoSpaceId},</if>
+            <if test="lineId != null">line_id = #{lineId},</if>
+            <if test="workshopId != null">workshop_id = #{workshopId},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="executionPhase != null">execution_phase = #{executionPhase},</if>
+            <if test="inOrOut != null">in_or_out = #{inOrOut},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="entranceId != null">entrance_id = #{entranceId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="faultFlag != null">fault_flag = #{faultFlag},</if>
+            <if test="jobDetailId != null and jobDetailId != ''">job_detail_id = #{jobDetailId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="inOrOutId != null">in_or_out_id = #{inOrOutId},</if>
+            <if test="inOrOutDId != null">in_or_out_d_id = #{inOrOutDId},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="inQuantity != null">in_quantity = #{inQuantity},</if>
+            <if test="stockQuantity != null">stock_quantity = #{stockQuantity},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
+        </trim>
+        where job_id = #{jobId}
+    </update>
+
+    <delete id="deleteViewOutJobFlowByJobId" parameterType="String">
+        delete from view_out_job_flow where job_id = #{jobId}
+    </delete>
+
+    <delete id="deleteViewOutJobFlowByJobIds" parameterType="String">
+        delete from view_out_job_flow where job_id in 
+        <foreach item="jobId" collection="array" open="(" separator="," close=")">
+            #{jobId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml
new file mode 100644
index 0000000..1d1885e
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockDetailMapper.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewStockDetail.mapper.ViewStockDetailMapper">
+    
+    <resultMap type="ViewStockDetail" id="ViewStockDetailResult">
+        <result property="onlyIdentity"    column="only_identity"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="distribution"    column="distribution"    />
+        <result property="model"    column="model"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="cargoSpaceStatus"    column="cargo_space_status"    />
+        <result property="locked"    column="locked"    />
+    </resultMap>
+
+    <sql id="selectViewStockDetailVo">
+        select only_identity, stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8, cargo_space_name, cargo_space_status, locked from view_stock_detail
+    </sql>
+
+    <select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
+        <include refid="selectViewStockDetailVo"/>
+        <where>  
+            <if test="onlyIdentity != null "> and only_identity like concat("%", #{onlyIdentity}, "%")</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="inDate != null  and inDate != ''"> and in_date like concat("%", #{inDate}, "%")</if>
+            <if test="backDate != null  and backDate != ''"> and back_date like concat("%", #{backDate}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat("%", #{jobId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat("%", #{outQuantity}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat("%", #{inClassId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="voltage != null  and voltage != ''"> and voltage like concat("%", #{voltage}, "%")</if>
+            <if test="power != null  and power != ''"> and power like concat("%", #{power}, "%")</if>
+            <if test="phase != null  and phase != ''"> and phase like concat("%", #{phase}, "%")</if>
+            <if test="netWeight != null  and netWeight != ''"> and net_weight like concat("%", #{netWeight}, "%")</if>
+            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight like concat("%", #{grossWeight}, "%")</if>
+            <if test="distribution != null  and distribution != ''"> and distribution like concat("%", #{distribution}, "%")</if>
+            <if test="model != null  and model != ''"> and model like concat("%", #{model}, "%")</if>
+            <if test="orderId != null  and orderId != ''"> and order_id like concat("%", #{orderId}, "%")</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat("%", #{spare7}, "%")</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat("%", #{spare8}, "%")</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="cargoSpaceStatus != null  and cargoSpaceStatus != ''"> and cargo_space_status like concat("%", #{cargoSpaceStatus}, "%")</if>
+            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectViewStockDetailByOnlyIdentity" parameterType="Long" resultMap="ViewStockDetailResult">
+        <include refid="selectViewStockDetailVo"/>
+        where only_identity = #{onlyIdentity}
+    </select>
+
+    <insert id="insertViewStockDetail" parameterType="ViewStockDetail">
+        insert into view_stock_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="onlyIdentity != null">only_identity,</if>
+            <if test="stockId != null and stockId != ''">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="productStatus != null">product_status,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="backDate != null">back_date,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="inType != null">in_type,</if>
+            <if test="inClassId != null">in_class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="voltage != null">voltage,</if>
+            <if test="power != null">power,</if>
+            <if test="phase != null">phase,</if>
+            <if test="netWeight != null">net_weight,</if>
+            <if test="grossWeight != null">gross_weight,</if>
+            <if test="distribution != null">distribution,</if>
+            <if test="model != null">model,</if>
+            <if test="orderId != null">order_id,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
+            <if test="cargoSpaceStatus != null">cargo_space_status,</if>
+            <if test="locked != null">locked,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="onlyIdentity != null">#{onlyIdentity},</if>
+            <if test="stockId != null and stockId != ''">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="productStatus != null">#{productStatus},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="backDate != null">#{backDate},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="inType != null">#{inType},</if>
+            <if test="inClassId != null">#{inClassId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="voltage != null">#{voltage},</if>
+            <if test="power != null">#{power},</if>
+            <if test="phase != null">#{phase},</if>
+            <if test="netWeight != null">#{netWeight},</if>
+            <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="distribution != null">#{distribution},</if>
+            <if test="model != null">#{model},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
+            <if test="cargoSpaceStatus != null">#{cargoSpaceStatus},</if>
+            <if test="locked != null">#{locked},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewStockDetail" parameterType="ViewStockDetail">
+        update view_stock_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">stock_id = #{stockId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="backDate != null">back_date = #{backDate},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <if test="inClassId != null">in_class_id = #{inClassId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="voltage != null">voltage = #{voltage},</if>
+            <if test="power != null">power = #{power},</if>
+            <if test="phase != null">phase = #{phase},</if>
+            <if test="netWeight != null">net_weight = #{netWeight},</if>
+            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="distribution != null">distribution = #{distribution},</if>
+            <if test="model != null">model = #{model},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
+            <if test="cargoSpaceStatus != null">cargo_space_status = #{cargoSpaceStatus},</if>
+            <if test="locked != null">locked = #{locked},</if>
+        </trim>
+        where only_identity = #{onlyIdentity}
+    </update>
+
+    <delete id="deleteViewStockDetailByOnlyIdentity" parameterType="Long">
+        delete from view_stock_detail where only_identity = #{onlyIdentity}
+    </delete>
+
+    <delete id="deleteViewStockDetailByOnlyIdentitys" parameterType="String">
+        delete from view_stock_detail where only_identity in 
+        <foreach item="onlyIdentity" collection="array" open="(" separator="," close=")">
+            #{onlyIdentity}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml
new file mode 100644
index 0000000..888dfc5
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockSecureMapper.xml
@@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper">
+    
+    <resultMap type="ViewStockSecure" id="ViewStockSecureResult">
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="address"    column="address"    />
+        <result property="cDesc"    column="c_desc"    />
+        <result property="warehouseKind"    column="warehouse_kind"    />
+        <result property="warehouseType"    column="warehouse_type"    />
+        <result property="isCurrent"    column="is_current"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="cargoAreaId"    column="cargo_area_id"    />
+        <result property="theType"    column="the_type"    />
+        <result property="theTypeName"    column="the_type_name"    />
+        <result property="thePlatoon"    column="the_platoon"    />
+        <result property="theColumn"    column="the_column"    />
+        <result property="theFloor"    column="the_floor"    />
+        <result property="cargoStatus"    column="cargo_status"    />
+        <result property="locked"    column="locked"    />
+        <result property="cargoHight"    column="cargo_hight"    />
+        <result property="issDouble"    column="iss_double"    />
+        <result property="groupCodingNo"    column="group_coding_no"    />
+        <result property="groupCoding"    column="group_coding"    />
+        <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
+        <result property="thisCargoArea"    column="this_cargo_area"    />
+    </resultMap>
+
+    <sql id="selectViewStockSecureVo">
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure
+    </sql>
+
+    <select id="selectViewStockSecureList" parameterType="ViewStockSecure" resultMap="ViewStockSecureResult">
+        <include refid="selectViewStockSecureVo"/>
+        <where>  
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
+            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat("%", #{isCurrent}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
+            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
+            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
+            <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
+            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
+            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
+            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
+            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status like concat("%", #{cargoStatus}, "%")</if>
+            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
+            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
+            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
+            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
+            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
+            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectViewStockSecureByStockId" parameterType="String" resultMap="ViewStockSecureResult">
+        <include refid="selectViewStockSecureVo"/>
+        where stock_id = #{stockId}
+    </select>
+
+    <insert id="insertViewStockSecure" parameterType="ViewStockSecure">
+        insert into view_stock_secure
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="productStatus != null">product_status,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="backDate != null">back_date,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="inType != null">in_type,</if>
+            <if test="inClassId != null">in_class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="address != null">address,</if>
+            <if test="cDesc != null">c_desc,</if>
+            <if test="warehouseKind != null">warehouse_kind,</if>
+            <if test="warehouseType != null">warehouse_type,</if>
+            <if test="isCurrent != null">is_current,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="remark != null">remark,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoAreaId != null">cargo_area_id,</if>
+            <if test="theType != null">the_type,</if>
+            <if test="theTypeName != null">the_type_name,</if>
+            <if test="thePlatoon != null">the_platoon,</if>
+            <if test="theColumn != null">the_column,</if>
+            <if test="theFloor != null">the_floor,</if>
+            <if test="cargoStatus != null">cargo_status,</if>
+            <if test="locked != null">locked,</if>
+            <if test="cargoHight != null">cargo_hight,</if>
+            <if test="issDouble != null">iss_double,</if>
+            <if test="groupCodingNo != null">group_coding_no,</if>
+            <if test="groupCoding != null">group_coding,</if>
+            <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
+            <if test="thisCargoArea != null">this_cargo_area,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="productStatus != null">#{productStatus},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="backDate != null">#{backDate},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="inType != null">#{inType},</if>
+            <if test="inClassId != null">#{inClassId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="address != null">#{address},</if>
+            <if test="cDesc != null">#{cDesc},</if>
+            <if test="warehouseKind != null">#{warehouseKind},</if>
+            <if test="warehouseType != null">#{warehouseType},</if>
+            <if test="isCurrent != null">#{isCurrent},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoAreaId != null">#{cargoAreaId},</if>
+            <if test="theType != null">#{theType},</if>
+            <if test="theTypeName != null">#{theTypeName},</if>
+            <if test="thePlatoon != null">#{thePlatoon},</if>
+            <if test="theColumn != null">#{theColumn},</if>
+            <if test="theFloor != null">#{theFloor},</if>
+            <if test="cargoStatus != null">#{cargoStatus},</if>
+            <if test="locked != null">#{locked},</if>
+            <if test="cargoHight != null">#{cargoHight},</if>
+            <if test="issDouble != null">#{issDouble},</if>
+            <if test="groupCodingNo != null">#{groupCodingNo},</if>
+            <if test="groupCoding != null">#{groupCoding},</if>
+            <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
+            <if test="thisCargoArea != null">#{thisCargoArea},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewStockSecure" parameterType="ViewStockSecure">
+        update view_stock_secure
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="backDate != null">back_date = #{backDate},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <if test="inClassId != null">in_class_id = #{inClassId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="cDesc != null">c_desc = #{cDesc},</if>
+            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
+            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
+            <if test="isCurrent != null">is_current = #{isCurrent},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
+            <if test="theType != null">the_type = #{theType},</if>
+            <if test="theTypeName != null">the_type_name = #{theTypeName},</if>
+            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
+            <if test="theColumn != null">the_column = #{theColumn},</if>
+            <if test="theFloor != null">the_floor = #{theFloor},</if>
+            <if test="cargoStatus != null">cargo_status = #{cargoStatus},</if>
+            <if test="locked != null">locked = #{locked},</if>
+            <if test="cargoHight != null">cargo_hight = #{cargoHight},</if>
+            <if test="issDouble != null">iss_double = #{issDouble},</if>
+            <if test="groupCodingNo != null">group_coding_no = #{groupCodingNo},</if>
+            <if test="groupCoding != null">group_coding = #{groupCoding},</if>
+            <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
+            <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
+        </trim>
+        where stock_id = #{stockId}
+    </update>
+
+    <delete id="deleteViewStockSecureByStockId" parameterType="String">
+        delete from view_stock_secure where stock_id = #{stockId}
+    </delete>
+
+    <delete id="deleteViewStockSecureByStockIds" parameterType="String">
+        delete from view_stock_secure where stock_id in 
+        <foreach item="stockId" collection="array" open="(" separator="," close=")">
+            #{stockId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml
new file mode 100644
index 0000000..b6edfe6
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockWarningMapper.xml
@@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper">
+    
+    <resultMap type="ViewStockWarning" id="ViewStockWarningResult">
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="address"    column="address"    />
+        <result property="cDesc"    column="c_desc"    />
+        <result property="warehouseKind"    column="warehouse_kind"    />
+        <result property="warehouseType"    column="warehouse_type"    />
+        <result property="isCurrent"    column="is_current"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="price"    column="price"    />
+        <result property="cargoNo"    column="cargo_no"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="remark"    column="remark"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="productName"    column="product_name"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
+        <result property="spare10"    column="spare10"    />
+        <result property="spare11"    column="spare11"    />
+        <result property="spare12"    column="spare12"    />
+        <result property="spare13"    column="spare13"    />
+        <result property="spare14"    column="spare14"    />
+        <result property="spare15"    column="spare15"    />
+        <result property="spare16"    column="spare16"    />
+        <result property="spare17"    column="spare17"    />
+        <result property="spare18"    column="spare18"    />
+        <result property="spare19"    column="spare19"    />
+        <result property="spare20"    column="spare20"    />
+        <result property="spare21"    column="spare21"    />
+        <result property="spare22"    column="spare22"    />
+        <result property="spare23"    column="spare23"    />
+        <result property="spare24"    column="spare24"    />
+        <result property="spare25"    column="spare25"    />
+        <result property="spare26"    column="spare26"    />
+        <result property="spare27"    column="spare27"    />
+        <result property="spare28"    column="spare28"    />
+        <result property="spare29"    column="spare29"    />
+        <result property="spare30"    column="spare30"    />
+        <result property="spare31"    column="spare31"    />
+        <result property="spare32"    column="spare32"    />
+        <result property="spare33"    column="spare33"    />
+        <result property="spare34"    column="spare34"    />
+        <result property="spare35"    column="spare35"    />
+        <result property="spare36"    column="spare36"    />
+        <result property="spare37"    column="spare37"    />
+        <result property="spare38"    column="spare38"    />
+        <result property="spare39"    column="spare39"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="roadwayId"    column="roadway_id"    />
+        <result property="cargoAreaId"    column="cargo_area_id"    />
+        <result property="theType"    column="the_type"    />
+        <result property="theTypeName"    column="the_type_name"    />
+        <result property="thePlatoon"    column="the_platoon"    />
+        <result property="theColumn"    column="the_column"    />
+        <result property="theFloor"    column="the_floor"    />
+        <result property="cargoStatus"    column="cargo_status"    />
+        <result property="locked"    column="locked"    />
+        <result property="cargoHight"    column="cargo_hight"    />
+        <result property="issDouble"    column="iss_double"    />
+        <result property="groupCodingNo"    column="group_coding_no"    />
+        <result property="groupCoding"    column="group_coding"    />
+        <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
+        <result property="thisCargoArea"    column="this_cargo_area"    />
+    </resultMap>
+
+    <sql id="selectViewStockWarningVo">
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_guid, product_id, parent_id, price, cargo_no, unit, spec, remark, spare1, spare2, spare3, spare4, spare5, spare6, product_name, spare7, spare8, spare9, spare10, spare11, spare12, spare13, spare14, spare15, spare16, spare17, spare18, spare19, spare20, spare21, spare22, spare23, spare24, spare25, spare26, spare27, spare28, spare29, spare30, spare31, spare32, spare33, spare34, spare35, spare36, spare37, spare38, spare39, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning
+    </sql>
+
+    <select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
+        <include refid="selectViewStockWarningVo"/>
+        <where>  
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status like concat("%", #{productStatus}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
+            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
+            <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
+            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
+            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
+            <if test="cargoNo != null  and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
+            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat('%', #{spare9}, '%')</if>
+            <if test="spare10 != null  and spare10 != ''"> and spare10 like concat('%', #{spare10}, '%')</if>
+            <if test="spare11 != null  and spare11 != ''"> and spare11 like concat('%', #{spare11}, '%')</if>
+            <if test="spare12 != null  and spare12 != ''"> and spare12 like concat('%', #{spare12}, '%')</if>
+            <if test="spare13 != null  and spare13 != ''"> and spare13 like concat('%', #{spare13}, '%')</if>
+            <if test="spare14 != null  and spare14 != ''"> and spare14 like concat('%', #{spare14}, '%')</if>
+            <if test="spare15 != null  and spare15 != ''"> and spare15 like concat('%', #{spare15}, '%')</if>
+            <if test="spare16 != null  and spare16 != ''"> and spare16 like concat('%', #{spare16}, '%')</if>
+            <if test="spare17 != null  and spare17 != ''"> and spare17 like concat('%', #{spare17}, '%')</if>
+            <if test="spare18 != null  and spare18 != ''"> and spare18 like concat('%', #{spare18}, '%')</if>
+            <if test="spare19 != null  and spare19 != ''"> and spare19 like concat('%', #{spare19}, '%')</if>
+            <if test="spare20 != null  and spare20 != ''"> and spare20 like concat('%', #{spare20}, '%')</if>
+            <if test="spare21 != null  and spare21 != ''"> and spare21 like concat('%', #{spare21}, '%')</if>
+            <if test="spare22 != null  and spare22 != ''"> and spare22 like concat('%', #{spare22}, '%')</if>
+            <if test="spare23 != null  and spare23 != ''"> and spare23 like concat('%', #{spare23}, '%')</if>
+            <if test="spare24 != null  and spare24 != ''"> and spare24 like concat('%', #{spare24}, '%')</if>
+            <if test="spare25 != null  and spare25 != ''"> and spare25 like concat('%', #{spare25}, '%')</if>
+            <if test="spare26 != null  and spare26 != ''"> and spare26 like concat('%', #{spare26}, '%')</if>
+            <if test="spare27 != null  and spare27 != ''"> and spare27 like concat('%', #{spare27}, '%')</if>
+            <if test="spare28 != null  and spare28 != ''"> and spare28 like concat('%', #{spare28}, '%')</if>
+            <if test="spare29 != null  and spare29 != ''"> and spare29 like concat('%', #{spare29}, '%')</if>
+            <if test="spare30 != null  and spare30 != ''"> and spare30 like concat('%', #{spare30}, '%')</if>
+            <if test="spare31 != null  and spare31 != ''"> and spare31 like concat('%', #{spare31}, '%')</if>
+            <if test="spare32 != null  and spare32 != ''"> and spare32 like concat('%', #{spare32}, '%')</if>
+            <if test="spare33 != null  and spare33 != ''"> and spare33 like concat('%', #{spare33}, '%')</if>
+            <if test="spare34 != null  and spare34 != ''"> and spare34 like concat('%', #{spare34}, '%')</if>
+            <if test="spare35 != null  and spare35 != ''"> and spare35 like concat('%', #{spare35}, '%')</if>
+            <if test="spare36 != null  and spare36 != ''"> and spare36 like concat('%', #{spare36}, '%')</if>
+            <if test="spare37 != null  and spare37 != ''"> and spare37 like concat('%', #{spare37}, '%')</if>
+            <if test="spare38 != null  and spare38 != ''"> and spare38 like concat('%', #{spare38}, '%')</if>
+            <if test="spare39 != null  and spare39 != ''"> and spare39 like concat('%', #{spare39}, '%')</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
+            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
+            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
+            <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
+            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
+            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
+            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
+            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status like concat("%", #{cargoStatus}, "%")</if>
+            <if test="locked != null  and locked != ''"> and locked like concat("%", #{locked}, "%")</if>
+            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
+            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
+            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
+            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
+            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectViewStockWarningByStockId" parameterType="String" resultMap="ViewStockWarningResult">
+        <include refid="selectViewStockWarningVo"/>
+        where stock_id = #{stockId}
+    </select>
+
+    <insert id="insertViewStockWarning" parameterType="ViewStockWarning">
+        insert into view_stock_warning
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="productStatus != null">product_status,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="backDate != null">back_date,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="inType != null">in_type,</if>
+            <if test="inClassId != null">in_class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="address != null">address,</if>
+            <if test="cDesc != null">c_desc,</if>
+            <if test="warehouseKind != null">warehouse_kind,</if>
+            <if test="warehouseType != null">warehouse_type,</if>
+            <if test="isCurrent != null">is_current,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="price != null">price,</if>
+            <if test="cargoNo != null">cargo_no,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="remark != null">remark,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+            <if test="spare10 != null">spare10,</if>
+            <if test="spare11 != null">spare11,</if>
+            <if test="spare12 != null">spare12,</if>
+            <if test="spare13 != null">spare13,</if>
+            <if test="spare14 != null">spare14,</if>
+            <if test="spare15 != null">spare15,</if>
+            <if test="spare16 != null">spare16,</if>
+            <if test="spare17 != null">spare17,</if>
+            <if test="spare18 != null">spare18,</if>
+            <if test="spare19 != null">spare19,</if>
+            <if test="spare20 != null">spare20,</if>
+            <if test="spare21 != null">spare21,</if>
+            <if test="spare22 != null">spare22,</if>
+            <if test="spare23 != null">spare23,</if>
+            <if test="spare24 != null">spare24,</if>
+            <if test="spare25 != null">spare25,</if>
+            <if test="spare26 != null">spare26,</if>
+            <if test="spare27 != null">spare27,</if>
+            <if test="spare28 != null">spare28,</if>
+            <if test="spare29 != null">spare29,</if>
+            <if test="spare30 != null">spare30,</if>
+            <if test="spare31 != null">spare31,</if>
+            <if test="spare32 != null">spare32,</if>
+            <if test="spare33 != null">spare33,</if>
+            <if test="spare34 != null">spare34,</if>
+            <if test="spare35 != null">spare35,</if>
+            <if test="spare36 != null">spare36,</if>
+            <if test="spare37 != null">spare37,</if>
+            <if test="spare38 != null">spare38,</if>
+            <if test="spare39 != null">spare39,</if>
+            <if test="cargoSpaceName != null">cargo_space_name,</if>
+            <if test="roadwayId != null">roadway_id,</if>
+            <if test="cargoAreaId != null">cargo_area_id,</if>
+            <if test="theType != null">the_type,</if>
+            <if test="theTypeName != null">the_type_name,</if>
+            <if test="thePlatoon != null">the_platoon,</if>
+            <if test="theColumn != null">the_column,</if>
+            <if test="theFloor != null">the_floor,</if>
+            <if test="cargoStatus != null">cargo_status,</if>
+            <if test="locked != null">locked,</if>
+            <if test="cargoHight != null">cargo_hight,</if>
+            <if test="issDouble != null">iss_double,</if>
+            <if test="groupCodingNo != null">group_coding_no,</if>
+            <if test="groupCoding != null">group_coding,</if>
+            <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
+            <if test="thisCargoArea != null">this_cargo_area,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="productStatus != null">#{productStatus},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="backDate != null">#{backDate},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="inType != null">#{inType},</if>
+            <if test="inClassId != null">#{inClassId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="address != null">#{address},</if>
+            <if test="cDesc != null">#{cDesc},</if>
+            <if test="warehouseKind != null">#{warehouseKind},</if>
+            <if test="warehouseType != null">#{warehouseType},</if>
+            <if test="isCurrent != null">#{isCurrent},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="price != null">#{price},</if>
+            <if test="cargoNo != null">#{cargoNo},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+            <if test="spare9 != null">#{spare9},</if>
+            <if test="spare10 != null">#{spare10},</if>
+            <if test="spare11 != null">#{spare11},</if>
+            <if test="spare12 != null">#{spare12},</if>
+            <if test="spare13 != null">#{spare13},</if>
+            <if test="spare14 != null">#{spare14},</if>
+            <if test="spare15 != null">#{spare15},</if>
+            <if test="spare16 != null">#{spare16},</if>
+            <if test="spare17 != null">#{spare17},</if>
+            <if test="spare18 != null">#{spare18},</if>
+            <if test="spare19 != null">#{spare19},</if>
+            <if test="spare20 != null">#{spare20},</if>
+            <if test="spare21 != null">#{spare21},</if>
+            <if test="spare22 != null">#{spare22},</if>
+            <if test="spare23 != null">#{spare23},</if>
+            <if test="spare24 != null">#{spare24},</if>
+            <if test="spare25 != null">#{spare25},</if>
+            <if test="spare26 != null">#{spare26},</if>
+            <if test="spare27 != null">#{spare27},</if>
+            <if test="spare28 != null">#{spare28},</if>
+            <if test="spare29 != null">#{spare29},</if>
+            <if test="spare30 != null">#{spare30},</if>
+            <if test="spare31 != null">#{spare31},</if>
+            <if test="spare32 != null">#{spare32},</if>
+            <if test="spare33 != null">#{spare33},</if>
+            <if test="spare34 != null">#{spare34},</if>
+            <if test="spare35 != null">#{spare35},</if>
+            <if test="spare36 != null">#{spare36},</if>
+            <if test="spare37 != null">#{spare37},</if>
+            <if test="spare38 != null">#{spare38},</if>
+            <if test="spare39 != null">#{spare39},</if>
+            <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
+            <if test="roadwayId != null">#{roadwayId},</if>
+            <if test="cargoAreaId != null">#{cargoAreaId},</if>
+            <if test="theType != null">#{theType},</if>
+            <if test="theTypeName != null">#{theTypeName},</if>
+            <if test="thePlatoon != null">#{thePlatoon},</if>
+            <if test="theColumn != null">#{theColumn},</if>
+            <if test="theFloor != null">#{theFloor},</if>
+            <if test="cargoStatus != null">#{cargoStatus},</if>
+            <if test="locked != null">#{locked},</if>
+            <if test="cargoHight != null">#{cargoHight},</if>
+            <if test="issDouble != null">#{issDouble},</if>
+            <if test="groupCodingNo != null">#{groupCodingNo},</if>
+            <if test="groupCoding != null">#{groupCoding},</if>
+            <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
+            <if test="thisCargoArea != null">#{thisCargoArea},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewStockWarning" parameterType="ViewStockWarning">
+        update view_stock_warning
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="backDate != null">back_date = #{backDate},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <if test="inClassId != null">in_class_id = #{inClassId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="cDesc != null">c_desc = #{cDesc},</if>
+            <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
+            <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
+            <if test="isCurrent != null">is_current = #{isCurrent},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+            <if test="spare10 != null">spare10 = #{spare10},</if>
+            <if test="spare11 != null">spare11 = #{spare11},</if>
+            <if test="spare12 != null">spare12 = #{spare12},</if>
+            <if test="spare13 != null">spare13 = #{spare13},</if>
+            <if test="spare14 != null">spare14 = #{spare14},</if>
+            <if test="spare15 != null">spare15 = #{spare15},</if>
+            <if test="spare16 != null">spare16 = #{spare16},</if>
+            <if test="spare17 != null">spare17 = #{spare17},</if>
+            <if test="spare18 != null">spare18 = #{spare18},</if>
+            <if test="spare19 != null">spare19 = #{spare19},</if>
+            <if test="spare20 != null">spare20 = #{spare20},</if>
+            <if test="spare21 != null">spare21 = #{spare21},</if>
+            <if test="spare22 != null">spare22 = #{spare22},</if>
+            <if test="spare23 != null">spare23 = #{spare23},</if>
+            <if test="spare24 != null">spare24 = #{spare24},</if>
+            <if test="spare25 != null">spare25 = #{spare25},</if>
+            <if test="spare26 != null">spare26 = #{spare26},</if>
+            <if test="spare27 != null">spare27 = #{spare27},</if>
+            <if test="spare28 != null">spare28 = #{spare28},</if>
+            <if test="spare29 != null">spare29 = #{spare29},</if>
+            <if test="spare30 != null">spare30 = #{spare30},</if>
+            <if test="spare31 != null">spare31 = #{spare31},</if>
+            <if test="spare32 != null">spare32 = #{spare32},</if>
+            <if test="spare33 != null">spare33 = #{spare33},</if>
+            <if test="spare34 != null">spare34 = #{spare34},</if>
+            <if test="spare35 != null">spare35 = #{spare35},</if>
+            <if test="spare36 != null">spare36 = #{spare36},</if>
+            <if test="spare37 != null">spare37 = #{spare37},</if>
+            <if test="spare38 != null">spare38 = #{spare38},</if>
+            <if test="spare39 != null">spare39 = #{spare39},</if>
+            <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
+            <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
+            <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
+            <if test="theType != null">the_type = #{theType},</if>
+            <if test="theTypeName != null">the_type_name = #{theTypeName},</if>
+            <if test="thePlatoon != null">the_platoon = #{thePlatoon},</if>
+            <if test="theColumn != null">the_column = #{theColumn},</if>
+            <if test="theFloor != null">the_floor = #{theFloor},</if>
+            <if test="cargoStatus != null">cargo_status = #{cargoStatus},</if>
+            <if test="locked != null">locked = #{locked},</if>
+            <if test="cargoHight != null">cargo_hight = #{cargoHight},</if>
+            <if test="issDouble != null">iss_double = #{issDouble},</if>
+            <if test="groupCodingNo != null">group_coding_no = #{groupCodingNo},</if>
+            <if test="groupCoding != null">group_coding = #{groupCoding},</if>
+            <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
+            <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
+        </trim>
+        where stock_id = #{stockId}
+    </update>
+
+    <delete id="deleteViewStockWarningByStockId" parameterType="String">
+        delete from view_stock_warning where stock_id = #{stockId}
+    </delete>
+
+    <delete id="deleteViewStockWarningByStockIds" parameterType="String">
+        delete from view_stock_warning where stock_id in 
+        <foreach item="stockId" collection="array" open="(" separator="," close=")">
+            #{stockId}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml
new file mode 100644
index 0000000..dfcd35f
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockinHistoryMapper.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewStockinHistory.mapper.ViewStockinHistoryMapper">
+    
+    <resultMap type="ViewStockinHistory" id="ViewStockinHistoryResult">
+        <result property="stockinGuid"    column="stockin_guid"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="finishDate"    column="finish_date"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="erpBill"    column="erp_bill"    />
+        <result property="stockSource"    column="stock_source"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="classNo"    column="class_no"    />
+        <result property="supplierNo"    column="supplier_no"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="quantityJ"    column="quantity_j"    />
+        <result property="quantityX"    column="quantity_x"    />
+        <result property="remark"    column="remark"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="assignNumJ"    column="assign_num_j"    />
+        <result property="assignNumX"    column="assign_num_x"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="cjgx"    column="cjgx"    />
+        <result property="scwl"    column="scwl"    />
+        <result property="dcwl"    column="dcwl"    />
+        <result property="scanNum"    column="scan_num"    />
+        <result property="scanNumJ"    column="scan_num_j"    />
+        <result property="scanNumX"    column="scan_num_x"    />
+        <result property="productName"    column="product_name"    />
+    </resultMap>
+
+    <sql id="selectViewStockinHistoryVo">
+        select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, spare5, spare4, spare3, finish_date, spare2, spare1, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, lot_no, stockin_detail_id, product_guid, product_id, quantity, quantity_j, quantity_x, remark, assign_num, assign_num_j, assign_num_x, unit, spec, cjgx, scwl, dcwl, scan_num, scan_num_j, scan_num_x, product_name from view_stockin_history
+    </sql>
+
+    <select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
+        <include refid="selectViewStockinHistoryVo"/>
+        <where>  
+            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid like concat("%", #{stockinGuid}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and in_type like concat("%", #{inType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="finishDate != null  and finishDate != ''"> and finish_date like concat("%", #{finishDate}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="erpBill != null  and erpBill != ''"> and erp_bill like concat("%", #{erpBill}, "%")</if>
+            <if test="stockSource != null  and stockSource != ''"> and stock_source like concat("%", #{stockSource}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="classNo != null  and classNo != ''"> and class_no like concat("%", #{classNo}, "%")</if>
+            <if test="supplierNo != null  and supplierNo != ''"> and supplier_no like concat("%", #{supplierNo}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="quantityJ != null  and quantityJ != ''"> and quantity_j like concat("%", #{quantityJ}, "%")</if>
+            <if test="quantityX != null  and quantityX != ''"> and quantity_x like concat("%", #{quantityX}, "%")</if>
+            <if test="assignNum != null  and assignNum != ''"> and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="assignNumJ != null  and assignNumJ != ''"> and assign_num_j like concat("%", #{assignNumJ}, "%")</if>
+            <if test="assignNumX != null  and assignNumX != ''"> and assign_num_x like concat("%", #{assignNumX}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="cjgx != null  and cjgx != ''"> and cjgx like concat("%", #{cjgx}, "%")</if>
+            <if test="scwl != null  and scwl != ''"> and scwl like concat("%", #{scwl}, "%")</if>
+            <if test="dcwl != null  and dcwl != ''"> and dcwl like concat("%", #{dcwl}, "%")</if>
+            <if test="scanNum != null  and scanNum != ''"> and scan_num like concat("%", #{scanNum}, "%")</if>
+            <if test="scanNumJ != null  and scanNumJ != ''"> and scan_num_j like concat("%", #{scanNumJ}, "%")</if>
+            <if test="scanNumX != null  and scanNumX != ''"> and scan_num_x like concat("%", #{scanNumX}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectViewStockinHistoryByStockinGuid" parameterType="String" resultMap="ViewStockinHistoryResult">
+        <include refid="selectViewStockinHistoryVo"/>
+        where stockin_guid = #{stockinGuid}
+    </select>
+
+    <insert id="insertViewStockinHistory" parameterType="ViewStockinHistory">
+        insert into view_stockin_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">stockin_guid,</if>
+            <if test="stockinId != null and stockinId != ''">stockin_id,</if>
+            <if test="inType != null and inType != ''">in_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="finishDate != null">finish_date,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="erpBill != null">erp_bill,</if>
+            <if test="stockSource != null">stock_source,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="classNo != null">class_no,</if>
+            <if test="supplierNo != null">supplier_no,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="quantityJ != null">quantity_j,</if>
+            <if test="quantityX != null">quantity_x,</if>
+            <if test="remark != null">remark,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="assignNumJ != null">assign_num_j,</if>
+            <if test="assignNumX != null">assign_num_x,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="cjgx != null">cjgx,</if>
+            <if test="scwl != null">scwl,</if>
+            <if test="dcwl != null">dcwl,</if>
+            <if test="scanNum != null">scan_num,</if>
+            <if test="scanNumJ != null">scan_num_j,</if>
+            <if test="scanNumX != null">scan_num_x,</if>
+            <if test="productName != null">product_name,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
+            <if test="stockinId != null and stockinId != ''">#{stockinId},</if>
+            <if test="inType != null and inType != ''">#{inType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="finishDate != null">#{finishDate},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="erpBill != null">#{erpBill},</if>
+            <if test="stockSource != null">#{stockSource},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="classNo != null">#{classNo},</if>
+            <if test="supplierNo != null">#{supplierNo},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="quantityJ != null">#{quantityJ},</if>
+            <if test="quantityX != null">#{quantityX},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="assignNumJ != null">#{assignNumJ},</if>
+            <if test="assignNumX != null">#{assignNumX},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="cjgx != null">#{cjgx},</if>
+            <if test="scwl != null">#{scwl},</if>
+            <if test="dcwl != null">#{dcwl},</if>
+            <if test="scanNum != null">#{scanNum},</if>
+            <if test="scanNumJ != null">#{scanNumJ},</if>
+            <if test="scanNumX != null">#{scanNumX},</if>
+            <if test="productName != null">#{productName},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewStockinHistory" parameterType="ViewStockinHistory">
+        update view_stockin_history
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockinId != null and stockinId != ''">stockin_id = #{stockinId},</if>
+            <if test="inType != null and inType != ''">in_type = #{inType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="erpBill != null">erp_bill = #{erpBill},</if>
+            <if test="stockSource != null">stock_source = #{stockSource},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="classNo != null">class_no = #{classNo},</if>
+            <if test="supplierNo != null">supplier_no = #{supplierNo},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="quantityJ != null">quantity_j = #{quantityJ},</if>
+            <if test="quantityX != null">quantity_x = #{quantityX},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="assignNumJ != null">assign_num_j = #{assignNumJ},</if>
+            <if test="assignNumX != null">assign_num_x = #{assignNumX},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="cjgx != null">cjgx = #{cjgx},</if>
+            <if test="scwl != null">scwl = #{scwl},</if>
+            <if test="dcwl != null">dcwl = #{dcwl},</if>
+            <if test="scanNum != null">scan_num = #{scanNum},</if>
+            <if test="scanNumJ != null">scan_num_j = #{scanNumJ},</if>
+            <if test="scanNumX != null">scan_num_x = #{scanNumX},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+        </trim>
+        where stockin_guid = #{stockinGuid}
+    </update>
+
+    <delete id="deleteViewStockinHistoryByStockinGuid" parameterType="String">
+        delete from view_stockin_history where stockin_guid = #{stockinGuid}
+    </delete>
+
+    <delete id="deleteViewStockinHistoryByStockinGuids" parameterType="String">
+        delete from view_stockin_history where stockin_guid in 
+        <foreach item="stockinGuid" collection="array" open="(" separator="," close=")">
+            #{stockinGuid}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml
new file mode 100644
index 0000000..88e434d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/search/ViewStockoutHistoryMapper.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.search.ViewStockoutHistory.mapper.ViewStockoutHistoryMapper">
+    
+    <resultMap type="ViewStockoutHistory" id="ViewStockoutHistoryResult">
+        <result property="stockoutGuid"    column="stockout_guid"    />
+        <result property="stockoutId"    column="stockout_id"    />
+        <result property="outType"    column="out_type"    />
+        <result property="createDate"    column="create_date"    />
+        <result property="departmentNo"    column="department_no"    />
+        <result property="customerNo"    column="customer_no"    />
+        <result property="createManId"    column="create_man_id"    />
+        <result property="status"    column="status"    />
+        <result property="stockoutSource"    column="stockout_source"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="classNowId"    column="class_now_id"    />
+        <result property="exitId"    column="exit_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="stockoutDetailId"    column="stockout_detail_id"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="productId"    column="product_id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="assignNum"    column="assign_num"    />
+        <result property="allotQuantity"    column="allot_quantity"    />
+        <result property="remark"    column="remark"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="productName"    column="product_name"    />
+        <result property="cjgx"    column="cjgx"    />
+        <result property="scwl"    column="scwl"    />
+        <result property="dcwl"    column="dcwl"    />
+        <result property="spare9"    column="spare9"    />
+    </resultMap>
+
+    <sql id="selectViewStockoutHistoryVo">
+        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, spare1, spare2, spare3, spare4, spare5, stockout_detail_id, lot_no, product_id, quantity, assign_num, allot_quantity, remark, unit, spec, product_name, cjgx, scwl, dcwl, spare9 from view_stockout_history
+    </sql>
+
+    <select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
+        <include refid="selectViewStockoutHistoryVo"/>
+        <where>  
+            <if test="stockoutGuid != null  and stockoutGuid != ''"> and stockout_guid like concat("%", #{stockoutGuid}, "%")</if>
+            <if test="stockoutId != null  and stockoutId != ''"> and stockout_id like concat('%', #{stockoutId}, '%')</if>
+            <if test="outType != null  and outType != ''"> and out_type like concat("%", #{outType}, "%")</if>
+            <if test="createDate != null  and createDate != ''"> and create_date like concat("%", #{createDate}, "%")</if>
+            <if test="departmentNo != null  and departmentNo != ''"> and department_no like concat("%", #{departmentNo}, "%")</if>
+            <if test="customerNo != null  and customerNo != ''"> and customer_no like concat("%", #{customerNo}, "%")</if>
+            <if test="createManId != null  and createManId != ''"> and create_man_id like concat("%", #{createManId}, "%")</if>
+            <if test="status != null  and status != ''"> and status like concat("%", #{status}, "%")</if>
+            <if test="stockoutSource != null  and stockoutSource != ''"> and stockout_source like concat("%", #{stockoutSource}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="classNowId != null  and classNowId != ''"> and class_now_id like concat("%", #{classNowId}, "%")</if>
+            <if test="exitId != null  and exitId != ''"> and exit_id like concat("%", #{exitId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="stockoutDetailId != null  and stockoutDetailId != ''"> and stockout_detail_id like concat("%", #{stockoutDetailId}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="quantity != null "> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="assignNum != null "> and assign_num like concat("%", #{assignNum}, "%")</if>
+            <if test="allotQuantity != null "> and allot_quantity like concat("%", #{allotQuantity}, "%")</if>
+            <if test="unit != null  and unit != ''"> and unit like concat("%", #{unit}, "%")</if>
+            <if test="spec != null  and spec != ''"> and spec like concat("%", #{spec}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="cjgx != null  and cjgx != ''"> and cjgx like concat("%", #{cjgx}, "%")</if>
+            <if test="scwl != null  and scwl != ''"> and scwl like concat("%", #{scwl}, "%")</if>
+            <if test="dcwl != null  and dcwl != ''"> and dcwl like concat("%", #{dcwl}, "%")</if>
+            <if test="spare9 != null  and spare9 != ''"> and spare9 like concat("%", #{spare9}, "%")</if>
+        </where>
+    </select>
+    
+    <select id="selectViewStockoutHistoryByStockoutGuid" parameterType="String" resultMap="ViewStockoutHistoryResult">
+        <include refid="selectViewStockoutHistoryVo"/>
+        where stockout_guid = #{stockoutGuid}
+    </select>
+
+    <insert id="insertViewStockoutHistory" parameterType="ViewStockoutHistory">
+        insert into view_stockout_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">stockout_guid,</if>
+            <if test="stockoutId != null and stockoutId != ''">stockout_id,</if>
+            <if test="outType != null and outType != ''">out_type,</if>
+            <if test="createDate != null and createDate != ''">create_date,</if>
+            <if test="departmentNo != null">department_no,</if>
+            <if test="customerNo != null">customer_no,</if>
+            <if test="createManId != null">create_man_id,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="stockoutSource != null">stockout_source,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="classNowId != null">class_now_id,</if>
+            <if test="exitId != null">exit_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="assignNum != null">assign_num,</if>
+            <if test="allotQuantity != null">allot_quantity,</if>
+            <if test="remark != null">remark,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="cjgx != null">cjgx,</if>
+            <if test="scwl != null">scwl,</if>
+            <if test="dcwl != null">dcwl,</if>
+            <if test="spare9 != null">spare9,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
+            <if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
+            <if test="outType != null and outType != ''">#{outType},</if>
+            <if test="createDate != null and createDate != ''">#{createDate},</if>
+            <if test="departmentNo != null">#{departmentNo},</if>
+            <if test="customerNo != null">#{customerNo},</if>
+            <if test="createManId != null">#{createManId},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="stockoutSource != null">#{stockoutSource},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="classNowId != null">#{classNowId},</if>
+            <if test="exitId != null">#{exitId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="assignNum != null">#{assignNum},</if>
+            <if test="allotQuantity != null">#{allotQuantity},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="cjgx != null">#{cjgx},</if>
+            <if test="scwl != null">#{scwl},</if>
+            <if test="dcwl != null">#{dcwl},</if>
+            <if test="spare9 != null">#{spare9},</if>
+         </trim>
+    </insert>
+
+    <update id="updateViewStockoutHistory" parameterType="ViewStockoutHistory">
+        update view_stockout_history
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockoutId != null and stockoutId != ''">stockout_id = #{stockoutId},</if>
+            <if test="outType != null and outType != ''">out_type = #{outType},</if>
+            <if test="createDate != null and createDate != ''">create_date = #{createDate},</if>
+            <if test="departmentNo != null">department_no = #{departmentNo},</if>
+            <if test="customerNo != null">customer_no = #{customerNo},</if>
+            <if test="createManId != null">create_man_id = #{createManId},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="stockoutSource != null">stockout_source = #{stockoutSource},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="classNowId != null">class_now_id = #{classNowId},</if>
+            <if test="exitId != null">exit_id = #{exitId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="stockoutDetailId != null and stockoutDetailId != ''">stockout_detail_id = #{stockoutDetailId},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="assignNum != null">assign_num = #{assignNum},</if>
+            <if test="allotQuantity != null">allot_quantity = #{allotQuantity},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="cjgx != null">cjgx = #{cjgx},</if>
+            <if test="scwl != null">scwl = #{scwl},</if>
+            <if test="dcwl != null">dcwl = #{dcwl},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+        </trim>
+        where stockout_guid = #{stockoutGuid}
+    </update>
+
+    <delete id="deleteViewStockoutHistoryByStockoutGuid" parameterType="String">
+        delete from view_stockout_history where stockout_guid = #{stockoutGuid}
+    </delete>
+
+    <delete id="deleteViewStockoutHistoryByStockoutGuids" parameterType="String">
+        delete from view_stockout_history where stockout_guid in 
+        <foreach item="stockoutGuid" collection="array" open="(" separator="," close=")">
+            #{stockoutGuid}
+        </foreach>
+    </delete>
+</mapper>
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml
new file mode 100644
index 0000000..58d3edd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockFreezeRecordMapper.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.stock.freeze.mapper.BasStockFreezeRecordMapper">
+
+    <resultMap type="BasStockFreezeRecord" id="BasStockFreezeRecordResult">
+        <result property="whGuid"    column="wh_guid"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="oldStatus"    column="old_status"    />
+        <result property="currStatus"    column="curr_status"    />
+        <result property="method"    column="method"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="stockDetailId"    column="stock_detail_id"    />
+        <result property="operatingTarget"    column="operating_target"    />
+        <result property="barCodeOldQuantity"    column="bar_code_old_quantity"    />
+        <result property="barCodeQuantity"    column="bar_code_quantity"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+    </resultMap>
+
+    <sql id="selectBasStockFreezeRecordVo">
+        select wh_guid, stock_id, bsfr.cargo_space_id,bw.warehouse_name,  bcs.cargo_space_name, bsfr.tray_code, product_id, product_name, print_date, lot_no, old_status, curr_status, method, bsfr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
+        from bas_stock_freeze_record bsfr
+        left join bas_cargo_space bcs on bsfr.cargo_space_id=bcs.cargo_space_id
+        left join bas_warehouse bw on bsfr.warehouse_id=bw.warehouse_id
+    </sql>
+
+    <select id="selectBasStockFreezeRecordList" parameterType="BasStockFreezeRecord" resultMap="BasStockFreezeRecordResult">
+        <include refid="selectBasStockFreezeRecordVo"/>
+        <where>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bsfr.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and bsfr.tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="oldStatus != null  and oldStatus != ''"> and old_status like concat("%", #{oldStatus}, "%")</if>
+            <if test="currStatus != null  and currStatus != ''"> and curr_status like concat("%", #{currStatus}, "%")</if>
+            <if test="method != null  and method != ''"> and method like concat("%", #{method}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and bsfr.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stockDetailId != null  and stockDetailId != ''"> and stock_detail_id like concat("%", #{stockDetailId}, "%")</if>
+            <if test="operatingTarget != null  and operatingTarget != ''"> and operating_target like concat("%", #{operatingTarget}, "%")</if>
+            <if test="barCodeOldQuantity != null  and barCodeOldQuantity != ''"> and bar_code_old_quantity like concat("%", #{barCodeOldQuantity}, "%")</if>
+            <if test="barCodeQuantity != null  and barCodeQuantity != ''"> and bar_code_quantity like concat("%", #{barCodeQuantity}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+             order by create_time desc
+    </select>
+
+    <select id="selectBasStockFreezeRecordByWhGuid" parameterType="String" resultMap="BasStockFreezeRecordResult">
+        <include refid="selectBasStockFreezeRecordVo"/>
+        where wh_guid = #{whGuid}
+    </select>
+
+    <insert id="insertBasStockFreezeRecord" parameterType="BasStockFreezeRecord">
+        insert into bas_stock_freeze_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="whGuid != null">wh_guid,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="oldStatus != null">old_status,</if>
+            <if test="currStatus != null">curr_status,</if>
+            <if test="method != null">method,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="stockDetailId != null">stock_detail_id,</if>
+            <if test="operatingTarget != null">operating_target,</if>
+            <if test="barCodeOldQuantity != null">bar_code_old_quantity,</if>
+            <if test="barCodeQuantity != null">bar_code_quantity,</if>
+            <if test="productGuid != null">product_guid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="whGuid != null">#{whGuid},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="oldStatus != null">#{oldStatus},</if>
+            <if test="currStatus != null">#{currStatus},</if>
+            <if test="method != null">#{method},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="stockDetailId != null">#{stockDetailId},</if>
+            <if test="operatingTarget != null">#{operatingTarget},</if>
+            <if test="barCodeOldQuantity != null">#{barCodeOldQuantity},</if>
+            <if test="barCodeQuantity != null">#{barCodeQuantity},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasStockFreezeRecord" parameterType="BasStockFreezeRecord">
+        update bas_stock_freeze_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="oldStatus != null">old_status = #{oldStatus},</if>
+            <if test="currStatus != null">curr_status = #{currStatus},</if>
+            <if test="method != null">method = #{method},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="stockDetailId != null">stock_detail_id = #{stockDetailId},</if>
+            <if test="operatingTarget != null">operating_target = #{operatingTarget},</if>
+            <if test="barCodeOldQuantity != null">bar_code_old_quantity = #{barCodeOldQuantity},</if>
+            <if test="barCodeQuantity != null">bar_code_quantity = #{barCodeQuantity},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+        </trim>
+        where wh_guid = #{whGuid}
+    </update>
+
+    <delete id="deleteBasStockFreezeRecordByWhGuid" parameterType="String">
+        delete from bas_stock_freeze_record where wh_guid = #{whGuid}
+    </delete>
+
+    <delete id="deleteBasStockFreezeRecordByWhGuids" parameterType="String">
+        delete from bas_stock_freeze_record where wh_guid in
+        <foreach item="whGuid" collection="array" open="(" separator="," close=")">
+            #{whGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml
new file mode 100644
index 0000000..45e5f74
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMaintainRecordMapper.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.stock.maintain.mapper.BasStockMaintainRecordMapper">
+
+    <resultMap type="BasStockMaintainRecord" id="BasStockMaintainRecordResult">
+        <result property="whGuid"    column="wh_guid"    />
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="printDate"    column="print_date"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="oldQuantity"    column="old_quantity"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="method"    column="method"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="stockDetailId"    column="stock_detail_id"    />
+        <result property="operatingTarget"    column="operating_target"    />
+        <result property="barCodeOldQuantity"    column="bar_code_old_quantity"    />
+        <result property="barCodeQuantity"    column="bar_code_quantity"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+    </resultMap>
+
+    <sql id="selectBasStockMaintainRecordVo">
+        select wh_guid, stock_id, bsmr.cargo_space_id,bw.warehouse_name,  bcs.cargo_space_name, bsmr.tray_code, product_id, product_name, print_date, lot_no, old_quantity, quantity, method, bsmr.warehouse_id, create_time, stock_detail_id, operating_target, bar_code_old_quantity, bar_code_quantity, product_guid
+        from bas_stock_maintain_record bsmr
+         left join bas_cargo_space bcs on bsmr.cargo_space_id=bcs.cargo_space_id
+         left join bas_warehouse bw on bsmr.warehouse_id=bw.warehouse_id
+    </sql>
+
+    <select id="selectBasStockMaintainRecordList" parameterType="BasStockMaintainRecord" resultMap="BasStockMaintainRecordResult">
+        <include refid="selectBasStockMaintainRecordVo"/>
+        <where>
+            <if test="stockId != null  and stockId != ''"> and stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bsmr.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and bsmr.tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat("%", #{productId}, "%")</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="printDate != null  and printDate != ''"> and print_date like concat("%", #{printDate}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="oldQuantity != null  and oldQuantity != ''"> and old_quantity like concat("%", #{oldQuantity}, "%")</if>
+            <if test="quantity != null  and quantity != ''"> and quantity like concat("%", #{quantity}, "%")</if>
+            <if test="method != null  and method != ''"> and method like concat("%", #{method}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and bsmr.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stockDetailId != null  and stockDetailId != ''"> and stock_detail_id like concat("%", #{stockDetailId}, "%")</if>
+            <if test="operatingTarget != null  and operatingTarget != ''"> and operating_target like concat("%", #{operatingTarget}, "%")</if>
+            <if test="barCodeOldQuantity != null  and barCodeOldQuantity != ''"> and bar_code_old_quantity like concat("%", #{barCodeOldQuantity}, "%")</if>
+            <if test="barCodeQuantity != null  and barCodeQuantity != ''"> and bar_code_quantity like concat("%", #{barCodeQuantity}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectBasStockMaintainRecordByWhGuid" parameterType="String" resultMap="BasStockMaintainRecordResult">
+        <include refid="selectBasStockMaintainRecordVo"/>
+        where wh_guid = #{whGuid}
+    </select>
+
+    <insert id="insertBasStockMaintainRecord" parameterType="BasStockMaintainRecord">
+        insert into bas_stock_maintain_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="whGuid != null">wh_guid,</if>
+            <if test="stockId != null">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="printDate != null">print_date,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="oldQuantity != null">old_quantity,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="method != null">method,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="stockDetailId != null">stock_detail_id,</if>
+            <if test="operatingTarget != null">operating_target,</if>
+            <if test="barCodeOldQuantity != null">bar_code_old_quantity,</if>
+            <if test="barCodeQuantity != null">bar_code_quantity,</if>
+            <if test="productGuid != null">product_guid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="whGuid != null">#{whGuid},</if>
+            <if test="stockId != null">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="printDate != null">#{printDate},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="oldQuantity != null">#{oldQuantity},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="method != null">#{method},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="stockDetailId != null">#{stockDetailId},</if>
+            <if test="operatingTarget != null">#{operatingTarget},</if>
+            <if test="barCodeOldQuantity != null">#{barCodeOldQuantity},</if>
+            <if test="barCodeQuantity != null">#{barCodeQuantity},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasStockMaintainRecord" parameterType="BasStockMaintainRecord">
+        update bas_stock_maintain_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stockId != null">stock_id = #{stockId},</if>
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="printDate != null">print_date = #{printDate},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="method != null">method = #{method},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="stockDetailId != null">stock_detail_id = #{stockDetailId},</if>
+            <if test="operatingTarget != null">operating_target = #{operatingTarget},</if>
+            <if test="barCodeOldQuantity != null">bar_code_old_quantity = #{barCodeOldQuantity},</if>
+            <if test="barCodeQuantity != null">bar_code_quantity = #{barCodeQuantity},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+        </trim>
+        where wh_guid = #{whGuid}
+    </update>
+
+    <delete id="deleteBasStockMaintainRecordByWhGuid" parameterType="String">
+        delete from bas_stock_maintain_record where wh_guid = #{whGuid}
+    </delete>
+
+    <delete id="deleteBasStockMaintainRecordByWhGuids" parameterType="String">
+        delete from bas_stock_maintain_record where wh_guid in
+        <foreach item="whGuid" collection="array" open="(" separator="," close=")">
+            #{whGuid}
+        </foreach>
+    </delete>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml
new file mode 100644
index 0000000..638437d
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/stock/BasStockMapper.xml
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.stock.stock.mapper.BasStockMapper">
+
+    <resultMap type="BasStock" id="BasStockResult">
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="distribution"    column="distribution"    />
+        <result property="model"    column="model"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="cargoSpaceStatus"    column="locked"    />
+        <result property="cargoSpaceStockStatus"    column="cargoSpaceStockStatus"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="cargoSpaceName"    column="cargo_space_name"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <association property="extraField" javaType="ExtraField">
+            <result property="productId"    column="product_id"    />
+            <result property="materialDesc"    column="product_name"    />
+            <result property="englishDesc"    column="englishDesc"    />
+            <result property="length"    column="length"    />
+            <result property="width"    column="width"    />
+            <result property="height"    column="height"    />
+            <result property="volume"    column="volume"    />
+            <result property="netWeight"    column="netWeight"    />
+        </association>
+    </resultMap>
+
+    <sql id="selectBasStockVo">
+        select bs.stock_id, bs.cargo_space_id, bs.stock_status, bs.product_status, bs.lot_no, bs.in_date,
+               bs.back_date, bs.product_guid, bs.quantity, bs.job_id, bs.tray_code, bs.out_quantity,
+               bs.stockin_detail_id, bs.stockin_id, bs.in_type, bs.in_class_id, bs.warehouse_id, bs.stacking_id,
+               bs.spare1, bs.spare2, bs.spare3, bs.spare4, bs.spare5, bs.spare6 ,
+               bs.voltage,bs.power,bs.phase,bs.net_weight,bs.gross_weight,bs.distribution,bs.model,bs.order_id,
+               bs.product_name,bp.spare1 as englishDesc,
+               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume,bw.warehouse_name,bs.product_id,
+               bcs.locked,bcs.cargo_space_name,bcs.status as cargoSpaceStockStatus
+        from bas_stock bs
+        left join bas_product bp on bs.product_id = bp.product_id
+        left join bas_warehouse bw on bs.warehouse_id = bw.warehouse_id
+        left join bas_cargo_space bcs on bs.cargo_space_id = bcs.cargo_space_id
+    </sql>
+
+    <select id="selectBasStockList" parameterType="BasStock" resultMap="BasStockResult">
+        <include refid="selectBasStockVo"/>
+        <where>
+            <if test="stockId != null  and stockId != ''"> and bs.stock_id like concat("%", #{stockId}, "%")</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and bs.cargo_space_id like concat("%", #{cargoSpaceId}, "%")</if>
+            <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and bcs.cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and bs.stock_status like concat("%", #{stockStatus}, "%")</if>
+            <if test="productStatus != null  and productStatus != ''"> and bs.product_status like concat("%", #{productStatus}, "%")</if>
+            <if test="lotNo != null  and lotNo != ''"> and bs.lot_no like concat("%", #{lotNo}, "%")</if>
+            <if test="inDate != null  and inDate != ''"> and bs.in_date like concat('%', #{inDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''"> and bs.back_date like concat("%", #{backDate}, "%")</if>
+            <if test="productGuid != null  and productGuid != ''"> and bs.product_guid like concat("%", #{productGuid}, "%")</if>
+            <if test="productName != null  and productName != ''"> and bs.product_name like concat('%', #{productName}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and bs.quantity like concat("%", #{quantity}, "%")</if>
+            <if test="jobId != null  and jobId != ''"> and bs.job_id like concat("%", #{jobId}, "%")</if>
+            <if test="trayCode != null  and trayCode != ''"> and bs.tray_code like concat("%", #{trayCode}, "%")</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and bs.out_quantity like concat("%", #{outQuantity}, "%")</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and bs.stockin_detail_id like concat("%", #{stockinDetailId}, "%")</if>
+            <if test="stockinId != null  and stockinId != ''"> and bs.stockin_id like concat("%", #{stockinId}, "%")</if>
+            <if test="inType != null  and inType != ''"> and bs.in_type like concat("%", #{inType}, "%")</if>
+            <if test="inClassId != null  and inClassId != ''"> and bs.in_class_id like concat("%", #{inClassId}, "%")</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and bs.warehouse_id like concat("%", #{warehouseId}, "%")</if>
+            <if test="stackingId != null  and stackingId != ''"> and bs.stacking_id like concat("%", #{stackingId}, "%")</if>
+            <if test="spare1 != null  and spare1 != ''"> and bs.spare1 like concat("%", #{spare1}, "%")</if>
+            <if test="spare2 != null  and spare2 != ''"> and bs.spare2 like concat("%", #{spare2}, "%")</if>
+            <if test="spare3 != null  and spare3 != ''"> and bs.spare3 like concat("%", #{spare3}, "%")</if>
+            <if test="spare4 != null  and spare4 != ''"> and bs.spare4 like concat("%", #{spare4}, "%")</if>
+            <if test="spare5 != null  and spare5 != ''"> and bs.spare5 like concat("%", #{spare5}, "%")</if>
+            <if test="spare6 != null  and spare6 != ''"> and bs.spare6 like concat("%", #{spare6}, "%")</if>
+            <if test="voltage != null  and voltage != ''"> and bs.voltage like concat("%", #{voltage}, "%")</if>
+            <if test="power != null  and power != ''"> and bs.power like concat("%", #{power}, "%")</if>
+            <if test="phase != null  and phase != ''"> and bs.phase like concat("%", #{phase}, "%")</if>
+            <if test="netWeight != null  and netWeight != ''"> and bs.net_weight like concat("%", #{netWeight}, "%")</if>
+            <if test="grossWeight != null  and grossWeight != ''"> and bs.gross_weight like concat("%", #{grossWeight}, "%")</if>
+            <if test="distribution != null  and distribution != ''"> and bs.distribution like concat("%", #{distribution}, "%")</if>
+            <if test="model != null  and model != ''"> and bs.model like concat("%", #{model}, "%")</if>
+            <if test="orderId != null  and orderId != ''"> and bs.order_id like concat("%", #{orderId}, "%")</if>
+            <if test="productId != null  and productId != ''"> and bs.product_id like concat("%", #{productId}, "%")</if>
+            <if test="cargoSpaceStockStatus != null  and cargoSpaceStockStatus != ''"> and bcs.status like concat("%", #{cargoSpaceStockStatus}, "%")</if>
+
+        </where>
+    </select>
+
+    <select id="selectBasStockByStockId" parameterType="String" resultMap="BasStockResult">
+        <include refid="selectBasStockVo"/>
+        where stock_id = #{stockId}
+    </select>
+
+    <insert id="insertBasStock" parameterType="BasStock">
+        insert into bas_stock
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="productStatus != null">product_status,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="backDate != null">back_date,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="inType != null">in_type,</if>
+            <if test="inClassId != null">in_class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="productId != null">product_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockId != null and stockId != ''">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="productStatus != null">#{productStatus},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="backDate != null">#{backDate},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="inType != null">#{inType},</if>
+            <if test="inClassId != null">#{inClassId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="productId != null">#{productId},</if>
+         </trim>
+    </insert>
+    <insert id="insertBasStockList">
+        INSERT INTO bas_stock
+            (stock_id,cargo_space_id,stock_status,product_status,lot_no,in_date,back_date,product_guid,quantity,job_id,tray_code,out_quantity,stockin_detail_id,stockin_id,in_type,in_class_id,warehouse_id,stacking_id,spare1,spare2,spare3,spare4,spare5,spare6,product_id,product_name,voltage,power,phase,net_weight,gross_weight,distribution,model,order_id,spare7)
+        VALUES
+            <foreach collection="list" item="item" separator=",">
+                (#{item.stockId},#{item.cargoSpaceId},#{item.stockStatus},#{item.productStatus},#{item.lotNo},#{item.inDate},#{item.backDate},#{item.productGuid},#{item.quantity},#{item.jobId},#{item.trayCode},#{item.outQuantity},#{item.stockinDetailId},#{item.stockinId},#{item.inType},#{item.inClassId},#{item.warehouseId},#{item.stackingId},#{item.spare1},#{item.spare2},#{item.spare3},#{item.spare4},#{item.spare5},#{item.spare6},#{item.productId}
+                ,#{item.productName},#{item.voltage},#{item.power},#{item.phase},#{item.netWeight},#{item.grossWeight},#{item.distribution},#{item.model},#{item.orderId},#{item.spare7})
+            </foreach>
+    </insert>
+
+    <update id="updateBasStock" parameterType="BasStock">
+        update bas_stock
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="backDate != null">back_date = #{backDate},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <if test="inClassId != null">in_class_id = #{inClassId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+        </trim>
+        where stock_id = #{stockId}
+    </update>
+    <update id="updateStockStatusByTrayCode">
+        update bas_stock set stock_status = #{stockStatus} where tray_code = #{trayCode}
+    </update>
+    <update id="resetPdRecord">
+        update bas_stock set spare7 = '0'
+    </update>
+
+    <delete id="deleteBasStockByStockId" parameterType="String">
+        delete from bas_stock where stock_id = #{stockId}
+    </delete>
+
+    <delete id="deleteBasStockByStockIds" parameterType="String">
+        delete from bas_stock where stock_id in
+        <foreach item="stockId" collection="array" open="(" separator="," close=")">
+            #{stockId}
+        </foreach>
+    </delete>
+
+    <select id="selectKtpStock" parameterType="BasStock" resultMap="BasStockResult">
+        select b.cargo_space_name, b.cargo_space_id  from bas_stock s,bas_cargo_space b
+        <where>
+        s.warehouse_id=#{warehouseId}
+         and s.cargo_space_id=b.cargo_space_id and b.warehouse_id= s.warehouse_id and b.status='2' and s.product_id='KTP0001'
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
+        </where>
+        order by b.the_platoon,b.the_floor,b.the_column asc
+    </select>
+
+    <select id="getStockBySerial" parameterType="String" resultMap="BasStockResult">
+        select * from bas_stock where tray_code = #{trayCode}
+    </select>
+
+    <select id="selectHasHalfTray" parameterType="InStockinDetail" resultMap="BasStockResult">
+        select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where  bs.spare4=#{spare4} and bs.product_id like concat("%", #{productId}, "%")
+                                                                                                                                               and bs.spare2 like concat("%", #{spare2}, "%")
+                                                                                                                                                 and bs.model=0 and bcs.status=2
+        union
+        select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where bs.spare4=#{spare4}
+                                                                                                                                               and bs.spare2 like concat("%", #{spare2}, "%")
+                                                                                                                                                 and  bs.model=0 and bcs.status=2
+        UNION
+        select distinct bs.tray_code,bs.cargo_space_id from bas_stock bs left join bas_cargo_space bcs on bs.cargo_space_id=bcs.cargo_space_id where bs.spare4=#{spare4}  and bs.model=0 and bcs.status=2
+    </select>
+</mapper>
+
diff --git a/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml b/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml
new file mode 100644
index 0000000..79869d6
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/mapper/work/ViewNoDoneOutWorkMapper.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.work.mapper.ViewNoDoneOutWorkMapper">
+    
+    <resultMap type="ViewNoDoneOutWork" id="ViewNoDoneOutWorkResult">
+        <result property="workName"    column="work_name"    />
+        <result property="workValue"    column="work_value"    />
+        <result property="workNum"    column="work_num"    />
+        <result property="by1"    column="by1"    />
+        <result property="by2"    column="by2"    />
+        <result property="by3"    column="by3"    />
+        <result property="by4"    column="by4"    />
+        <result property="by5"    column="by5"    />
+    </resultMap>
+
+    <select id="selectViewNoDoneOutWorkList1" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
+        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_is_done_in_work
+    </select>
+    <select id="selectViewNoDoneOutWorkList2" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
+        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_is_done_out_work
+    </select>
+    <select id="selectViewNoDoneOutWorkList3" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
+        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_no_done_in_work
+    </select>
+    <select id="selectViewNoDoneOutWorkList4" parameterType="ViewNoDoneOutWork" resultMap="ViewNoDoneOutWorkResult">
+        select work_name, work_value, work_num, by1, by2, by3, by4, by5 from view_no_done_out_work
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml b/ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml
new file mode 100644
index 0000000..40efd25
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/mapper/stock/BasStockHcMapper.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.stock.hcstock.mapper.BasStockHcMapper">
+    
+    <resultMap type="BasStockHc" id="BasStockHcResult">
+        <result property="stockId"    column="stock_id"    />
+        <result property="cargoSpaceId"    column="cargo_space_id"    />
+        <result property="stockStatus"    column="stock_status"    />
+        <result property="productStatus"    column="product_status"    />
+        <result property="lotNo"    column="lot_no"    />
+        <result property="inDate"    column="in_date"    />
+        <result property="backDate"    column="back_date"    />
+        <result property="productGuid"    column="product_guid"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="jobId"    column="job_id"    />
+        <result property="trayCode"    column="tray_code"    />
+        <result property="outQuantity"    column="out_quantity"    />
+        <result property="stockinDetailId"    column="stockin_detail_id"    />
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="inType"    column="in_type"    />
+        <result property="inClassId"    column="in_class_id"    />
+        <result property="warehouseId"    column="warehouse_id"    />
+        <result property="stackingId"    column="stacking_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="productId"    column="product_id"    />
+        <result property="productName"    column="product_name"    />
+        <result property="voltage"    column="voltage"    />
+        <result property="power"    column="power"    />
+        <result property="phase"    column="phase"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="distribution"    column="distribution"    />
+        <result property="model"    column="model"    />
+        <result property="orderId"    column="order_id"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+    </resultMap>
+
+    <sql id="selectBasStockHcVo">
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, product_name, voltage, power, phase, net_weight, gross_weight, distribution, model, order_id, spare7, spare8 from bas_stock_hc
+    </sql>
+
+    <select id="selectBasStockHcList" parameterType="BasStockHc" resultMap="BasStockHcResult">
+        <include refid="selectBasStockHcVo"/>
+        <where>  
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
+            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
+            <if test="backDate != null  and backDate != ''"> and back_date = #{backDate}</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
+            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
+            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id = #{inClassId}</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id = #{stackingId}</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+            <if test="productId != null  and productId != ''"> and product_id = #{productId}</if>
+            <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="voltage != null  and voltage != ''"> and voltage = #{voltage}</if>
+            <if test="power != null  and power != ''"> and power = #{power}</if>
+            <if test="phase != null  and phase != ''"> and phase = #{phase}</if>
+            <if test="netWeight != null  and netWeight != ''"> and net_weight = #{netWeight}</if>
+            <if test="grossWeight != null  and grossWeight != ''"> and gross_weight = #{grossWeight}</if>
+            <if test="distribution != null  and distribution != ''"> and distribution = #{distribution}</if>
+            <if test="model != null  and model != ''"> and model = #{model}</if>
+            <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="spare7 != null  and spare7 != ''"> and spare7 = #{spare7}</if>
+            <if test="spare8 != null  and spare8 != ''"> and spare8 = #{spare8}</if>
+        </where>
+    </select>
+    
+    <select id="selectBasStockHcByStockId" parameterType="String" resultMap="BasStockHcResult">
+        <include refid="selectBasStockHcVo"/>
+        where stock_id = #{stockId}
+    </select>
+
+    <insert id="insertBasStockHc" parameterType="BasStockHc">
+        insert into bas_stock_hc
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockId != null">stock_id,</if>
+            <if test="cargoSpaceId != null">cargo_space_id,</if>
+            <if test="stockStatus != null">stock_status,</if>
+            <if test="productStatus != null">product_status,</if>
+            <if test="lotNo != null">lot_no,</if>
+            <if test="inDate != null">in_date,</if>
+            <if test="backDate != null">back_date,</if>
+            <if test="productGuid != null">product_guid,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="jobId != null">job_id,</if>
+            <if test="trayCode != null">tray_code,</if>
+            <if test="outQuantity != null">out_quantity,</if>
+            <if test="stockinDetailId != null">stockin_detail_id,</if>
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="inType != null">in_type,</if>
+            <if test="inClassId != null">in_class_id,</if>
+            <if test="warehouseId != null">warehouse_id,</if>
+            <if test="stackingId != null">stacking_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="productId != null">product_id,</if>
+            <if test="productName != null">product_name,</if>
+            <if test="voltage != null">voltage,</if>
+            <if test="power != null">power,</if>
+            <if test="phase != null">phase,</if>
+            <if test="netWeight != null">net_weight,</if>
+            <if test="grossWeight != null">gross_weight,</if>
+            <if test="distribution != null">distribution,</if>
+            <if test="model != null">model,</if>
+            <if test="orderId != null">order_id,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockId != null">#{stockId},</if>
+            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
+            <if test="stockStatus != null">#{stockStatus},</if>
+            <if test="productStatus != null">#{productStatus},</if>
+            <if test="lotNo != null">#{lotNo},</if>
+            <if test="inDate != null">#{inDate},</if>
+            <if test="backDate != null">#{backDate},</if>
+            <if test="productGuid != null">#{productGuid},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="jobId != null">#{jobId},</if>
+            <if test="trayCode != null">#{trayCode},</if>
+            <if test="outQuantity != null">#{outQuantity},</if>
+            <if test="stockinDetailId != null">#{stockinDetailId},</if>
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="inType != null">#{inType},</if>
+            <if test="inClassId != null">#{inClassId},</if>
+            <if test="warehouseId != null">#{warehouseId},</if>
+            <if test="stackingId != null">#{stackingId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare5 != null">#{spare5},</if>
+            <if test="spare6 != null">#{spare6},</if>
+            <if test="productId != null">#{productId},</if>
+            <if test="productName != null">#{productName},</if>
+            <if test="voltage != null">#{voltage},</if>
+            <if test="power != null">#{power},</if>
+            <if test="phase != null">#{phase},</if>
+            <if test="netWeight != null">#{netWeight},</if>
+            <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="distribution != null">#{distribution},</if>
+            <if test="model != null">#{model},</if>
+            <if test="orderId != null">#{orderId},</if>
+            <if test="spare7 != null">#{spare7},</if>
+            <if test="spare8 != null">#{spare8},</if>
+         </trim>
+    </insert>
+
+    <update id="updateBasStockHc" parameterType="BasStockHc">
+        update bas_stock_hc
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
+            <if test="stockStatus != null">stock_status = #{stockStatus},</if>
+            <if test="productStatus != null">product_status = #{productStatus},</if>
+            <if test="lotNo != null">lot_no = #{lotNo},</if>
+            <if test="inDate != null">in_date = #{inDate},</if>
+            <if test="backDate != null">back_date = #{backDate},</if>
+            <if test="productGuid != null">product_guid = #{productGuid},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="jobId != null">job_id = #{jobId},</if>
+            <if test="trayCode != null">tray_code = #{trayCode},</if>
+            <if test="outQuantity != null">out_quantity = #{outQuantity},</if>
+            <if test="stockinDetailId != null">stockin_detail_id = #{stockinDetailId},</if>
+            <if test="stockinId != null">stockin_id = #{stockinId},</if>
+            <if test="inType != null">in_type = #{inType},</if>
+            <if test="inClassId != null">in_class_id = #{inClassId},</if>
+            <if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
+            <if test="stackingId != null">stacking_id = #{stackingId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="productId != null">product_id = #{productId},</if>
+            <if test="productName != null">product_name = #{productName},</if>
+            <if test="voltage != null">voltage = #{voltage},</if>
+            <if test="power != null">power = #{power},</if>
+            <if test="phase != null">phase = #{phase},</if>
+            <if test="netWeight != null">net_weight = #{netWeight},</if>
+            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="distribution != null">distribution = #{distribution},</if>
+            <if test="model != null">model = #{model},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+        </trim>
+        where stock_id = #{stockId}
+    </update>
+
+    <delete id="deleteBasStockHcByStockId" parameterType="String">
+        delete from bas_stock_hc where stock_id = #{stockId}
+    </delete>
+
+    <delete id="deleteBasStockHcByStockIds" parameterType="String">
+        delete from bas_stock_hc where stock_id in 
+        <foreach item="stockId" collection="array" open="(" separator="," close=")">
+            #{stockId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/out/outStockout.js b/ruoyi-ui/src/api/out/outStockout.js
index ec9bb84..8fbea28 100644
--- a/ruoyi-ui/src/api/out/outStockout.js
+++ b/ruoyi-ui/src/api/out/outStockout.js
@@ -62,7 +62,7 @@ export function getOutStockoutDetail(query) {
   export function autoAllot(data) {
     return request({
       url: '/out/outStockout/autoAllot',
-      method: 'get',
+      method: 'post',
       params: data
     })
   }
diff --git a/ruoyi-ui/src/views/check/create/index.vue b/ruoyi-ui/src/views/check/create/index.vue
index 8df60cb..9344b79 100644
--- a/ruoyi-ui/src/views/check/create/index.vue
+++ b/ruoyi-ui/src/views/check/create/index.vue
@@ -670,9 +670,15 @@ export default {
           console.log(data)
           // 这里需要调用保存接口
           saveCheckStock(data).then(response => {
+           if (response.code==200){
+             this.$modal.msgSuccess('保存成功：' + response.msg);
+             this.$tab.refreshPage(this.$route);
+           }
+           else {
+             this.$modal.msgError('建单失败：' + response.msg);
+           }
+
 
-            this.$modal.msgSuccess('保存成功：' + response.msg);
-            this.$tab.refreshPage(this.$route);
             // this.reset();
           });
         }
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index a150dde..eeb7c94 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -135,7 +135,7 @@
     <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
       max-height="400">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="作业编码" align="left" prop="jobId" fixed width="140" />
+      <el-table-column label="作业编码" align="left" prop="jobId" fixed width="160" />
       <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
@@ -249,7 +249,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,
diff --git a/ruoyi-ui/src/views/out/addOutStockout.vue b/ruoyi-ui/src/views/out/addOutStockout.vue
index 5c940d5..fbb950b 100644
--- a/ruoyi-ui/src/views/out/addOutStockout.vue
+++ b/ruoyi-ui/src/views/out/addOutStockout.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 主表信息录入 -->
     <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
-      <el-form-item :label="'仓库'" prop="warehouseId" required><!--仓库-->
+<!--      <el-form-item :label="'仓库'" prop="warehouseId" required>&lt;!&ndash;仓库&ndash;&gt;
         <el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>
           <el-option
             v-for="dict in warehouseOptions"
@@ -11,7 +11,7 @@
             :value="dict.warehouseId"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="项目号" prop="departmentNo">
         <el-input v-model="formData.departmentNo" placeholder="请输入项目号"/>
       </el-form-item>
@@ -265,9 +265,9 @@ export default {
       customerTotal: 0,
       // 表单验证规则
       rules: {
-        warehouseId: [
-          { required: true, message: '请选择仓库', trigger: "change" }
-        ],
+        // warehouseId: [
+        //   { required: true, message: '请选择仓库', trigger: "change" }
+        // ],
         customerNo: [
           { required: true, message: '请输入客商编号', trigger: "blur" }
         ],
@@ -403,10 +403,10 @@ export default {
     },
     /** 打开选择存货弹窗 */
     handleSelectMaterials() {
-      if (!this.formData.warehouseId) {
+      /*if (!this.formData.warehouseId) {
         this.$modal.msgError('请选择仓库');
         return;
-      }
+      }*/
       if (!this.formData.departmentNo) {
         this.$modal.msgError('请输入项目号');
         return;
diff --git a/ruoyi-ui/src/views/stock/pointOut.vue b/ruoyi-ui/src/views/stock/pointOut.vue
index eba5ad0..39525e7 100644
--- a/ruoyi-ui/src/views/stock/pointOut.vue
+++ b/ruoyi-ui/src/views/stock/pointOut.vue
@@ -17,6 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode"><!-- 品名 -->
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="项目号" prop="spare4"><!-- 品名 -->
         <el-input
           v-model="queryParams.spare4"
@@ -79,20 +87,20 @@
 
     <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="库存编码" align="center" prop="stockId" width="120"/>
+      <el-table-column label="库存编码" align="center" prop="stockId" width="160"/>
       <el-table-column label="货位名称" align="center" prop="cargoSpaceName" width="120"/>
       <el-table-column label="入库日期" align="center" prop="inDate" width="160" />
       <el-table-column label="批次号" align="center" prop="lotNo"/>
       <el-table-column label="托盘条码" align="center" prop="trayCode"  width="130" />
       <el-table-column label="存货编码" align="center" prop="productId" />
-      <el-table-column label="存货名称" align="center" prop="productName"/>
+      <el-table-column label="存货名称" align="center" prop="productName" width="120"/>
       <el-table-column label="层级关系" align="center" prop="spare1"/>
       <el-table-column label="上层物料" align="center" prop="spare2"/>
       <el-table-column label="顶层物料" align="center" prop="spare3"/>
       <el-table-column label="项目号" align="center" prop="spare4"/>
       <el-table-column label="合同号" align="center" prop="spare5"/>
       <el-table-column label="销售订单" align="center" prop="spare6"/>
-      <el-table-column label="供应商编码" align="center" prop="voltage"/>
+      <el-table-column label="供应商编码" align="center" prop="voltage" width="120"/>
       <el-table-column label="规格型号" align="center" prop="power"/>
       <el-table-column label="计量单位" align="center" prop="phase"/>
       <el-table-column label="数量" align="center" prop="quantity"/>
@@ -244,8 +252,8 @@ export default {
       },
       // 出口选项
       exitOptions: [
-        {exitId: '1', exitName: '一楼'},
-        {exitId: '2', exitName: '二楼'},
+        {exitId: '1', exitName: '缓存'},
+        {exitId: '2', exitName: '线边'},
 
       ],