Merge remote-tracking branch 'origin/main' into zxt/stock

2025-12-08 09:59:35 +08:00
parent e6e35a364c 0ad1b6b601
commit c134017e44
49 changed files with 2621 additions and 356 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -1,10 +1,9 @@
 package com.ruoyi;

+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;

 /**
@@ -14,6 +13,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 */
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
@EnableScheduling
+@MapperScan("com.ruoyi.**.mapper")
 public class RuoYiApplication
 {
    public static void main(String[] args)
@@ -24,5 +24,6 @@ public class RuoYiApplication
                 Hello, 世界! 🌍
                            This is a text block with Unicode characters.
                """);
+
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinConFirmParam.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinConFirmParam.java
@@ -0,0 +1,54 @@
+package com.ruoyi.api.domain.erp;
+
+import com.ruoyi.in.ErpInStockinDetail.domain.ErpInStockinDetail;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 入库确认请求参数
+ */
+@Data
+public class StockinConFirmParam {
+
+    /**
+     * 单据ID（整数，如 0 表示新单）
+     */
+    private Integer ord;
+
+    /**
+     * 确认时间（格式：yyyy-MM-dd HH:mm:ss）<br>
+     * 示例：2025-01-01 09:30:00
+     */
+    private String dates;
+
+    /**
+     * 入库状态（0=待确认, 1=已确认, 2=已完成...）
+     */
+    private Integer complete1;
+
+    /**
+     * 库管意见（文本内容，可为空）
+     */
+    private String intro2;
+
+    /**
+     * 入库明细列表（通常为数组，此处用字符串占位，实际应为 List<StockinDetail>）
+     */
+    private List<ErpInStockinDetail> kuinList;
+
+    /**
+     * 客户名称（如 "XX公司"）
+     */
+    private String iB_SysCusmf_0_61001_413_0;
+
+    /**
+     * 确单编号（如 "RK20251205001"）
+     */
+    private String iB_SysCusmf_0_61001_414_0;
+
+    /**
+     * 入库车号（如 "A12345"）
+     */
+    private String iB_SysCusmf_0_61001_415_0;
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinParam.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/erp/StockinParam.java
@@ -0,0 +1,92 @@
+package com.ruoyi.api.domain.erp;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * 获取入库单据列表
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StockinParam {
+
+    /**
+     * 过滤条件：申请开始时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    private String date3Start;
+
+    /**
+     * 过滤条件：申请结束时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    private String date3End;
+
+    /**
+     * 过滤条件：确认开始时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    private String date5Start;
+
+    /**
+     * 过滤条件：确认结束时间（格式：yyyy-MM-dd HH:mm:ss）
+     */
+    private String date5End;
+
+    /**
+     * 过滤条件：入库类别（字典值，如 1=采购入库, 2=生产入库...）
+     */
+    private Integer sort1;
+
+    /**
+     * 过滤条件：入库状态（0=全部, 1=待入库, 2=已入库, 3=已取消...）
+     */
+    private Integer complete1;
+
+    /**
+     * 过滤条件：入库主题（模糊匹配）
+     */
+    private String title;
+
+    /**
+     * 过滤条件：入库编号（精确匹配，如 RK_2025120501）
+     */
+    private String rkbh;
+
+    /**
+     * 过滤条件：产品名称（模糊匹配）
+     */
+    private String cpTitle;
+
+    /**
+     * 过滤条件：产品编号（精确匹配）
+     */
+    private String order1;
+
+    /**
+     * 过滤条件：申请人员（用户ID或姓名）
+     */
+    private String cateid;
+
+    /**
+     * 过滤条件：库管人员（用户ID或姓名）
+     */
+    private String kg;
+
+    /**
+     * 过滤条件：是否返回明细信息（0=否，1=是）
+     */
+    private Integer needList;
+
+    /**
+     * 每页返回数据行数（默认 20）
+     */
+    private Integer pageSize;
+
+    /**
+     * 从第几页开始返回（默认 1，即第一页）
+     */
+    private Integer pageIndex;
+
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -1,7 +1,6 @@
 package com.ruoyi.api.service.impl;

 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
@@ -11,25 +10,19 @@ import com.ruoyi.api.domain.RequestEnterResponse;
 import com.ruoyi.api.domain.WmsJobRequest;
 import com.ruoyi.api.service.IToErpService;
 import com.ruoyi.api.service.IToWmsService;
-import com.ruoyi.bas.BasProduct.domain.BasProduct;
 import com.ruoyi.bas.BasProduct.service.IBasProductService;
-import com.ruoyi.bas.BasProductCode.util.ProcodeUtils;
 import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
 import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
 import com.ruoyi.bas.container.service.IBasContainerService;
-import com.ruoyi.bas.roadway.domain.BasRoadway;
 import com.ruoyi.bas.roadway.service.IBasRoadwayService;
 import com.ruoyi.bas.tag.service.IBasTagService;
 import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.device.agv.service.IAgvContainerTaskService;
-import com.ruoyi.in.erp.domain.TransferBillCallback;
 import com.ruoyi.in.erp.service.ITransferBillCallbackService;
-import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockin.service.IInStockinService;
-import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
 import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
@@ -44,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

 /**
 * 作业统计 Service 实现
--- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java
@@ -23,6 +23,7 @@ public class BasProduct extends BaseEntity
 {
    private static final long serialVersionUID = 1L;

+
    /** 主键 */
    private String productGuid;

--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.in.ErpInStockin.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.in.ErpInStockin.domain.ErpInStockin;
+import com.ruoyi.in.ErpInStockin.service.IErpInStockinService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 入库主表单Controller
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+@RestController
+@RequestMapping("/in/ErpInStockin")
+public class ErpInStockinController extends BaseController
+{
+    @Autowired
+    private IErpInStockinService erpInStockinService;
+
+    /**
+     * 查询入库主表单列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockin:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ErpInStockin erpInStockin)
+    {
+        startPage();
+        List<ErpInStockin> list = erpInStockinService.selectErpInStockinList(erpInStockin);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入库主表单列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockin:export')")
+    @Log(title = "入库主表单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ErpInStockin erpInStockin)
+    {
+        List<ErpInStockin> list = erpInStockinService.selectErpInStockinList(erpInStockin);
+        ExcelUtil<ErpInStockin> util = new ExcelUtil<ErpInStockin>(ErpInStockin.class);
+        util.exportExcel(response, list, "入库主表单数据");
+    }
+
+    /**
+     * 获取入库主表单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockin:query')")
+    @GetMapping(value = "/{title}")
+    public AjaxResult getInfo(@PathVariable("title") String title)
+    {
+        return success(erpInStockinService.selectErpInStockinByTitle(title));
+    }
+
+    /**
+     * 新增入库主表单
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockin:add')")
+    @Log(title = "入库主表单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ErpInStockin erpInStockin)
+    {
+        return toAjax(erpInStockinService.insertErpInStockin(erpInStockin));
+    }
+
+    /**
+     * 修改入库主表单
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockin:edit')")
+    @Log(title = "入库主表单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ErpInStockin erpInStockin)
+    {
+        return toAjax(erpInStockinService.updateErpInStockin(erpInStockin));
+    }
+
+    /**
+     * 删除入库主表单
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockin:remove')")
+    @Log(title = "入库主表单", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{titles}")
+    public AjaxResult remove(@PathVariable String[] titles)
+    {
+        return toAjax(erpInStockinService.deleteErpInStockinByTitles(titles));
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java
@@ -0,0 +1,323 @@
+package com.ruoyi.in.ErpInStockin.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;
+
+/**
+ * 入库主表单对象 erp_in_stockin
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public class ErpInStockin extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 入库主题 */
+    @Excel(name = "入库主题")
+    private String title;
+
+    /** 入库id */
+    @Excel(name = "入库id")
+    private String kuin;
+
+    /** 入库状态 */
+    @Excel(name = "入库状态")
+    private String complete1;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private String cateid;
+
+    /** 申请日期 */
+    @Excel(name = "申请日期")
+    private String date3;
+
+    /** 确认日期 */
+    @Excel(name = "确认日期")
+    private String date5;
+
+    /** 审批人 */
+    @Excel(name = "审批人")
+    private String catein;
+
+    /** 审批意见 */
+    @Excel(name = "审批意见")
+    private String intro2;
+
+    /** 入库备注 */
+    @Excel(name = "入库备注")
+    private String intro;
+
+    /** 关联其他单据id */
+    @Excel(name = "关联其他单据id")
+    private String caigou;
+
+    /** 添加时间 */
+    @Excel(name = "添加时间")
+    private String date7;
+
+    /** 库管id */
+    @Excel(name = "库管id")
+    private String kg;
+
+    /** 入库类别 */
+    @Excel(name = "入库类别")
+    private String sort1;
+
+    /** 入库编号 */
+    @Excel(name = "入库编号")
+    private String rkbh;
+
+    /** 审批状态 */
+    @Excel(name = "审批状态")
+    private String status;
+
+    /** 产品明细 */
+    @Excel(name = "产品明细")
+    private String kuinList;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String sysIcusIInheritIdIidI413;
+
+    /** 磅单编号 */
+    @Excel(name = "磅单编号")
+    private String sysIcusIInheritIdIidI414;
+
+    /** 入库车号 */
+    @Excel(name = "入库车号")
+    private String sysIcusIInheritIdIidI415;
+
+    /** 入库单guid */
+    @Excel(name = "入库单guid")
+    private String stockinGuid;
+
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+
+    public void setKuin(String kuin) 
+    {
+        this.kuin = kuin;
+    }
+
+    public String getKuin() 
+    {
+        return kuin;
+    }
+
+    public void setComplete1(String complete1) 
+    {
+        this.complete1 = complete1;
+    }
+
+    public String getComplete1() 
+    {
+        return complete1;
+    }
+
+    public void setCateid(String cateid) 
+    {
+        this.cateid = cateid;
+    }
+
+    public String getCateid() 
+    {
+        return cateid;
+    }
+
+    public void setDate3(String date3) 
+    {
+        this.date3 = date3;
+    }
+
+    public String getDate3() 
+    {
+        return date3;
+    }
+
+    public void setDate5(String date5) 
+    {
+        this.date5 = date5;
+    }
+
+    public String getDate5() 
+    {
+        return date5;
+    }
+
+    public void setCatein(String catein) 
+    {
+        this.catein = catein;
+    }
+
+    public String getCatein() 
+    {
+        return catein;
+    }
+
+    public void setIntro2(String intro2) 
+    {
+        this.intro2 = intro2;
+    }
+
+    public String getIntro2() 
+    {
+        return intro2;
+    }
+
+    public void setIntro(String intro) 
+    {
+        this.intro = intro;
+    }
+
+    public String getIntro() 
+    {
+        return intro;
+    }
+
+    public void setCaigou(String caigou) 
+    {
+        this.caigou = caigou;
+    }
+
+    public String getCaigou() 
+    {
+        return caigou;
+    }
+
+    public void setDate7(String date7) 
+    {
+        this.date7 = date7;
+    }
+
+    public String getDate7() 
+    {
+        return date7;
+    }
+
+    public void setKg(String kg) 
+    {
+        this.kg = kg;
+    }
+
+    public String getKg() 
+    {
+        return kg;
+    }
+
+    public void setSort1(String sort1) 
+    {
+        this.sort1 = sort1;
+    }
+
+    public String getSort1() 
+    {
+        return sort1;
+    }
+
+    public void setRkbh(String rkbh) 
+    {
+        this.rkbh = rkbh;
+    }
+
+    public String getRkbh() 
+    {
+        return rkbh;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setKuinList(String kuinList) 
+    {
+        this.kuinList = kuinList;
+    }
+
+    public String getKuinList() 
+    {
+        return kuinList;
+    }
+
+    public void setSysIcusIInheritIdIidI413(String sysIcusIInheritIdIidI413) 
+    {
+        this.sysIcusIInheritIdIidI413 = sysIcusIInheritIdIidI413;
+    }
+
+    public String getSysIcusIInheritIdIidI413() 
+    {
+        return sysIcusIInheritIdIidI413;
+    }
+
+    public void setSysIcusIInheritIdIidI414(String sysIcusIInheritIdIidI414) 
+    {
+        this.sysIcusIInheritIdIidI414 = sysIcusIInheritIdIidI414;
+    }
+
+    public String getSysIcusIInheritIdIidI414() 
+    {
+        return sysIcusIInheritIdIidI414;
+    }
+
+    public void setSysIcusIInheritIdIidI415(String sysIcusIInheritIdIidI415) 
+    {
+        this.sysIcusIInheritIdIidI415 = sysIcusIInheritIdIidI415;
+    }
+
+    public String getSysIcusIInheritIdIidI415() 
+    {
+        return sysIcusIInheritIdIidI415;
+    }
+
+    public void setStockinGuid(String stockinGuid) 
+    {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinGuid() 
+    {
+        return stockinGuid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("title", getTitle())
+            .append("kuin", getKuin())
+            .append("complete1", getComplete1())
+            .append("cateid", getCateid())
+            .append("date3", getDate3())
+            .append("date5", getDate5())
+            .append("catein", getCatein())
+            .append("intro2", getIntro2())
+            .append("intro", getIntro())
+            .append("caigou", getCaigou())
+            .append("date7", getDate7())
+            .append("kg", getKg())
+            .append("sort1", getSort1())
+            .append("rkbh", getRkbh())
+            .append("status", getStatus())
+            .append("kuinList", getKuinList())
+            .append("sysIcusIInheritIdIidI413", getSysIcusIInheritIdIidI413())
+            .append("sysIcusIInheritIdIidI414", getSysIcusIInheritIdIidI414())
+            .append("sysIcusIInheritIdIidI415", getSysIcusIInheritIdIidI415())
+            .append("stockinGuid", getStockinGuid())
+            .toString();
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.in.ErpInStockin.mapper;
+
+import java.util.List;
+import com.ruoyi.in.ErpInStockin.domain.ErpInStockin;
+
+/**
+ * 入库主表单Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public interface ErpInStockinMapper 
+{
+    /**
+     * 查询入库主表单
+     * 
+     * @param title 入库主表单主键
+     * @return 入库主表单
+     */
+    public ErpInStockin selectErpInStockinByTitle(String title);
+
+    /**
+     * 查询入库主表单列表
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 入库主表单集合
+     */
+    public List<ErpInStockin> selectErpInStockinList(ErpInStockin erpInStockin);
+
+    /**
+     * 新增入库主表单
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 结果
+     */
+    public int insertErpInStockin(ErpInStockin erpInStockin);
+
+    /**
+     * 修改入库主表单
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 结果
+     */
+    public int updateErpInStockin(ErpInStockin erpInStockin);
+
+    /**
+     * 删除入库主表单
+     * 
+     * @param title 入库主表单主键
+     * @return 结果
+     */
+    public int deleteErpInStockinByTitle(String title);
+
+    /**
+     * 批量删除入库主表单
+     * 
+     * @param titles 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteErpInStockinByTitles(String[] titles);
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.in.ErpInStockin.service;
+
+import java.util.List;
+import com.ruoyi.in.ErpInStockin.domain.ErpInStockin;
+
+/**
+ * 入库主表单Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public interface IErpInStockinService 
+{
+    /**
+     * 查询入库主表单
+     * 
+     * @param title 入库主表单主键
+     * @return 入库主表单
+     */
+    public ErpInStockin selectErpInStockinByTitle(String title);
+
+    /**
+     * 查询入库主表单列表
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 入库主表单集合
+     */
+    public List<ErpInStockin> selectErpInStockinList(ErpInStockin erpInStockin);
+
+    /**
+     * 新增入库主表单
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 结果
+     */
+    public int insertErpInStockin(ErpInStockin erpInStockin);
+
+    /**
+     * 修改入库主表单
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 结果
+     */
+    public int updateErpInStockin(ErpInStockin erpInStockin);
+
+    /**
+     * 批量删除入库主表单
+     * 
+     * @param titles 需要删除的入库主表单主键集合
+     * @return 结果
+     */
+    public int deleteErpInStockinByTitles(String[] titles);
+
+    /**
+     * 删除入库主表单信息
+     * 
+     * @param title 入库主表单主键
+     * @return 结果
+     */
+    public int deleteErpInStockinByTitle(String title);
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.in.ErpInStockin.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.in.ErpInStockin.mapper.ErpInStockinMapper;
+import com.ruoyi.in.ErpInStockin.domain.ErpInStockin;
+import com.ruoyi.in.ErpInStockin.service.IErpInStockinService;
+
+/**
+ * 入库主表单Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+@Service
+public class ErpInStockinServiceImpl implements IErpInStockinService 
+{
+    @Autowired
+    private ErpInStockinMapper erpInStockinMapper;
+
+    /**
+     * 查询入库主表单
+     * 
+     * @param title 入库主表单主键
+     * @return 入库主表单
+     */
+    @Override
+    public ErpInStockin selectErpInStockinByTitle(String title)
+    {
+        return erpInStockinMapper.selectErpInStockinByTitle(title);
+    }
+
+    /**
+     * 查询入库主表单列表
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 入库主表单
+     */
+    @Override
+    public List<ErpInStockin> selectErpInStockinList(ErpInStockin erpInStockin)
+    {
+        return erpInStockinMapper.selectErpInStockinList(erpInStockin);
+    }
+
+    /**
+     * 新增入库主表单
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 结果
+     */
+    @Override
+    public int insertErpInStockin(ErpInStockin erpInStockin)
+    {
+        return erpInStockinMapper.insertErpInStockin(erpInStockin);
+    }
+
+    /**
+     * 修改入库主表单
+     * 
+     * @param erpInStockin 入库主表单
+     * @return 结果
+     */
+    @Override
+    public int updateErpInStockin(ErpInStockin erpInStockin)
+    {
+        return erpInStockinMapper.updateErpInStockin(erpInStockin);
+    }
+
+    /**
+     * 批量删除入库主表单
+     * 
+     * @param titles 需要删除的入库主表单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpInStockinByTitles(String[] titles)
+    {
+        return erpInStockinMapper.deleteErpInStockinByTitles(titles);
+    }
+
+    /**
+     * 删除入库主表单信息
+     * 
+     * @param title 入库主表单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpInStockinByTitle(String title)
+    {
+        return erpInStockinMapper.deleteErpInStockinByTitle(title);
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/controller/ErpInStockinDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/controller/ErpInStockinDetailController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.in.ErpInStockinDetail.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.in.ErpInStockinDetail.domain.ErpInStockinDetail;
+import com.ruoyi.in.ErpInStockinDetail.service.IErpInStockinDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 入库明细子表Controller
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+@RestController
+@RequestMapping("/in/ErpInStockinDetail")
+public class ErpInStockinDetailController extends BaseController
+{
+    @Autowired
+    private IErpInStockinDetailService erpInStockinDetailService;
+
+    /**
+     * 查询入库明细子表列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinDetail:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ErpInStockinDetail erpInStockinDetail)
+    {
+        startPage();
+        List<ErpInStockinDetail> list = erpInStockinDetailService.selectErpInStockinDetailList(erpInStockinDetail);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入库明细子表列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinDetail:export')")
+    @Log(title = "入库明细子表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ErpInStockinDetail erpInStockinDetail)
+    {
+        List<ErpInStockinDetail> list = erpInStockinDetailService.selectErpInStockinDetailList(erpInStockinDetail);
+        ExcelUtil<ErpInStockinDetail> util = new ExcelUtil<ErpInStockinDetail>(ErpInStockinDetail.class);
+        util.exportExcel(response, list, "入库明细子表数据");
+    }
+
+    /**
+     * 获取入库明细子表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinDetail:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(erpInStockinDetailService.selectErpInStockinDetailById(id));
+    }
+
+    /**
+     * 新增入库明细子表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinDetail:add')")
+    @Log(title = "入库明细子表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ErpInStockinDetail erpInStockinDetail)
+    {
+        return toAjax(erpInStockinDetailService.insertErpInStockinDetail(erpInStockinDetail));
+    }
+
+    /**
+     * 修改入库明细子表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinDetail:edit')")
+    @Log(title = "入库明细子表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ErpInStockinDetail erpInStockinDetail)
+    {
+        return toAjax(erpInStockinDetailService.updateErpInStockinDetail(erpInStockinDetail));
+    }
+
+    /**
+     * 删除入库明细子表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinDetail:remove')")
+    @Log(title = "入库明细子表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(erpInStockinDetailService.deleteErpInStockinDetailByIds(ids));
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java
@@ -0,0 +1,232 @@
+package com.ruoyi.in.ErpInStockinDetail.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;
+
+/**
+ * 入库明细子表对象 erp_in_stockin_detail
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public class ErpInStockinDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 入库明细id */
+    private Long id;
+
+    /** 数量 - (原字段Num1) */
+    @Excel(name = "数量 - (原字段Num1)")
+    private Long quantity;
+
+    /** 辅助单位 */
+    @Excel(name = "辅助单位")
+    private Long assistUnit;
+
+    /** 辅助数量 - （原字段AssistNum） */
+    @Excel(name = "辅助数量 - ", readConverterExp = "原=字段AssistNum")
+    private Long assistQuantity;
+
+    /** 仓库 */
+    @Excel(name = "仓库")
+    private Long ku;
+
+    /** 库位id */
+    @Excel(name = "库位id")
+    private Long warehousePositionID;
+
+    /** 批号 */
+    @Excel(name = "批号")
+    private String ph;
+
+    /** 序列号 */
+    @Excel(name = "序列号")
+    private String xlh;
+
+    /** 生产日期 （接口要求日期格式为：yyyy-MM-dd HH:mm:ss） */
+    @Excel(name = "生产日期 ", readConverterExp = "接=口要求日期格式为：yyyy-MM-dd,H=H:mm:ss")
+    private String datesc;
+
+    /** 有效日期 （接口要求日期格式为：yyyy-MM-dd HH:mm:ss） */
+    @Excel(name = "有效日期 ", readConverterExp = "接=口要求日期格式为：yyyy-MM-dd,H=H:mm:ss")
+    private String dateyx;
+
+    /** 到货日期 （接口要求日期格式为：yyyy-MM-dd HH:mm:ss） */
+    @Excel(name = "到货日期 ", readConverterExp = "接=口要求日期格式为：yyyy-MM-dd,H=H:mm:ss")
+    private String date2;
+
+    /** 装卸工 */
+    @Excel(name = "装卸工")
+    private String sysIcusIInheritIdIidI1;
+
+    /** 入库单id（关联主单） */
+    @Excel(name = "入库单id", readConverterExp = "关=联主单")
+    private String kuin;
+
+    /** 入库编号（关联主单） */
+    @Excel(name = "入库编号", readConverterExp = "关=联主单")
+    private String rkbh;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public void setQuantity(Long quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public Long getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setAssistUnit(Long assistUnit) 
+    {
+        this.assistUnit = assistUnit;
+    }
+
+    public Long getAssistUnit() 
+    {
+        return assistUnit;
+    }
+
+    public void setAssistQuantity(Long assistQuantity) 
+    {
+        this.assistQuantity = assistQuantity;
+    }
+
+    public Long getAssistQuantity() 
+    {
+        return assistQuantity;
+    }
+
+    public void setKu(Long ku) 
+    {
+        this.ku = ku;
+    }
+
+    public Long getKu() 
+    {
+        return ku;
+    }
+
+    public void setWarehousePositionID(Long warehousePositionID) 
+    {
+        this.warehousePositionID = warehousePositionID;
+    }
+
+    public Long getWarehousePositionID() 
+    {
+        return warehousePositionID;
+    }
+
+    public void setPh(String ph) 
+    {
+        this.ph = ph;
+    }
+
+    public String getPh() 
+    {
+        return ph;
+    }
+
+    public void setXlh(String xlh) 
+    {
+        this.xlh = xlh;
+    }
+
+    public String getXlh() 
+    {
+        return xlh;
+    }
+
+    public void setDatesc(String datesc) 
+    {
+        this.datesc = datesc;
+    }
+
+    public String getDatesc() 
+    {
+        return datesc;
+    }
+
+    public void setDateyx(String dateyx) 
+    {
+        this.dateyx = dateyx;
+    }
+
+    public String getDateyx() 
+    {
+        return dateyx;
+    }
+
+    public void setDate2(String date2) 
+    {
+        this.date2 = date2;
+    }
+
+    public String getDate2() 
+    {
+        return date2;
+    }
+
+    public void setSysIcusIInheritIdIidI1(String sysIcusIInheritIdIidI1) 
+    {
+        this.sysIcusIInheritIdIidI1 = sysIcusIInheritIdIidI1;
+    }
+
+    public String getSysIcusIInheritIdIidI1() 
+    {
+        return sysIcusIInheritIdIidI1;
+    }
+
+    public void setKuin(String kuin) 
+    {
+        this.kuin = kuin;
+    }
+
+    public String getKuin() 
+    {
+        return kuin;
+    }
+
+    public void setRkbh(String rkbh) 
+    {
+        this.rkbh = rkbh;
+    }
+
+    public String getRkbh() 
+    {
+        return rkbh;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("quantity", getQuantity())
+            .append("assistUnit", getAssistUnit())
+            .append("assistQuantity", getAssistQuantity())
+            .append("ku", getKu())
+            .append("warehousePositionID", getWarehousePositionID())
+            .append("ph", getPh())
+            .append("xlh", getXlh())
+            .append("datesc", getDatesc())
+            .append("dateyx", getDateyx())
+            .append("date2", getDate2())
+            .append("sysIcusIInheritIdIidI1", getSysIcusIInheritIdIidI1())
+            .append("kuin", getKuin())
+            .append("rkbh", getRkbh())
+            .toString();
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/mapper/ErpInStockinDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/mapper/ErpInStockinDetailMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.in.ErpInStockinDetail.mapper;
+
+import java.util.List;
+import com.ruoyi.in.ErpInStockinDetail.domain.ErpInStockinDetail;
+
+/**
+ * 入库明细子表Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public interface ErpInStockinDetailMapper 
+{
+    /**
+     * 查询入库明细子表
+     * 
+     * @param id 入库明细子表主键
+     * @return 入库明细子表
+     */
+    public ErpInStockinDetail selectErpInStockinDetailById(Long id);
+
+    /**
+     * 查询入库明细子表列表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 入库明细子表集合
+     */
+    public List<ErpInStockinDetail> selectErpInStockinDetailList(ErpInStockinDetail erpInStockinDetail);
+
+    /**
+     * 新增入库明细子表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 结果
+     */
+    public int insertErpInStockinDetail(ErpInStockinDetail erpInStockinDetail);
+
+    /**
+     * 修改入库明细子表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 结果
+     */
+    public int updateErpInStockinDetail(ErpInStockinDetail erpInStockinDetail);
+
+    /**
+     * 删除入库明细子表
+     * 
+     * @param id 入库明细子表主键
+     * @return 结果
+     */
+    public int deleteErpInStockinDetailById(Long id);
+
+    /**
+     * 批量删除入库明细子表
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteErpInStockinDetailByIds(Long[] ids);
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/service/IErpInStockinDetailService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/service/IErpInStockinDetailService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.in.ErpInStockinDetail.service;
+
+import java.util.List;
+import com.ruoyi.in.ErpInStockinDetail.domain.ErpInStockinDetail;
+
+/**
+ * 入库明细子表Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public interface IErpInStockinDetailService 
+{
+    /**
+     * 查询入库明细子表
+     * 
+     * @param id 入库明细子表主键
+     * @return 入库明细子表
+     */
+    public ErpInStockinDetail selectErpInStockinDetailById(Long id);
+
+    /**
+     * 查询入库明细子表列表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 入库明细子表集合
+     */
+    public List<ErpInStockinDetail> selectErpInStockinDetailList(ErpInStockinDetail erpInStockinDetail);
+
+    /**
+     * 新增入库明细子表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 结果
+     */
+    public int insertErpInStockinDetail(ErpInStockinDetail erpInStockinDetail);
+
+    /**
+     * 修改入库明细子表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 结果
+     */
+    public int updateErpInStockinDetail(ErpInStockinDetail erpInStockinDetail);
+
+    /**
+     * 批量删除入库明细子表
+     * 
+     * @param ids 需要删除的入库明细子表主键集合
+     * @return 结果
+     */
+    public int deleteErpInStockinDetailByIds(Long[] ids);
+
+    /**
+     * 删除入库明细子表信息
+     * 
+     * @param id 入库明细子表主键
+     * @return 结果
+     */
+    public int deleteErpInStockinDetailById(Long id);
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/service/impl/ErpInStockinDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/service/impl/ErpInStockinDetailServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.in.ErpInStockinDetail.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.in.ErpInStockinDetail.mapper.ErpInStockinDetailMapper;
+import com.ruoyi.in.ErpInStockinDetail.domain.ErpInStockinDetail;
+import com.ruoyi.in.ErpInStockinDetail.service.IErpInStockinDetailService;
+
+/**
+ * 入库明细子表Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+@Service
+public class ErpInStockinDetailServiceImpl implements IErpInStockinDetailService 
+{
+    @Autowired
+    private ErpInStockinDetailMapper erpInStockinDetailMapper;
+
+    /**
+     * 查询入库明细子表
+     * 
+     * @param id 入库明细子表主键
+     * @return 入库明细子表
+     */
+    @Override
+    public ErpInStockinDetail selectErpInStockinDetailById(Long id)
+    {
+        return erpInStockinDetailMapper.selectErpInStockinDetailById(id);
+    }
+
+    /**
+     * 查询入库明细子表列表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 入库明细子表
+     */
+    @Override
+    public List<ErpInStockinDetail> selectErpInStockinDetailList(ErpInStockinDetail erpInStockinDetail)
+    {
+        return erpInStockinDetailMapper.selectErpInStockinDetailList(erpInStockinDetail);
+    }
+
+    /**
+     * 新增入库明细子表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 结果
+     */
+    @Override
+    public int insertErpInStockinDetail(ErpInStockinDetail erpInStockinDetail)
+    {
+        return erpInStockinDetailMapper.insertErpInStockinDetail(erpInStockinDetail);
+    }
+
+    /**
+     * 修改入库明细子表
+     * 
+     * @param erpInStockinDetail 入库明细子表
+     * @return 结果
+     */
+    @Override
+    public int updateErpInStockinDetail(ErpInStockinDetail erpInStockinDetail)
+    {
+        return erpInStockinDetailMapper.updateErpInStockinDetail(erpInStockinDetail);
+    }
+
+    /**
+     * 批量删除入库明细子表
+     * 
+     * @param ids 需要删除的入库明细子表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpInStockinDetailByIds(Long[] ids)
+    {
+        return erpInStockinDetailMapper.deleteErpInStockinDetailByIds(ids);
+    }
+
+    /**
+     * 删除入库明细子表信息
+     * 
+     * @param id 入库明细子表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpInStockinDetailById(Long id)
+    {
+        return erpInStockinDetailMapper.deleteErpInStockinDetailById(id);
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/controller/ErpInStockinMiddleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/controller/ErpInStockinMiddleController.java
@@ -0,0 +1,104 @@
+package com.ruoyi.in.ErpInStockinMiddle.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.in.ErpInStockinMiddle.domain.ErpInStockinMiddle;
+import com.ruoyi.in.ErpInStockinMiddle.service.IErpInStockinMiddleService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 入库主单中间表Controller
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+@RestController
+@RequestMapping("/in/ErpInStockinMiddle")
+public class ErpInStockinMiddleController extends BaseController
+{
+    @Autowired
+    private IErpInStockinMiddleService erpInStockinMiddleService;
+
+    /**
+     * 查询入库主单中间表列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinMiddle:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ErpInStockinMiddle erpInStockinMiddle)
+    {
+        startPage();
+        List<ErpInStockinMiddle> list = erpInStockinMiddleService.selectErpInStockinMiddleList(erpInStockinMiddle);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入库主单中间表列表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinMiddle:export')")
+    @Log(title = "入库主单中间表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ErpInStockinMiddle erpInStockinMiddle)
+    {
+        List<ErpInStockinMiddle> list = erpInStockinMiddleService.selectErpInStockinMiddleList(erpInStockinMiddle);
+        ExcelUtil<ErpInStockinMiddle> util = new ExcelUtil<ErpInStockinMiddle>(ErpInStockinMiddle.class);
+        util.exportExcel(response, list, "入库主单中间表数据");
+    }
+
+    /**
+     * 获取入库主单中间表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinMiddle:query')")
+    @GetMapping(value = "/{stockinId}")
+    public AjaxResult getInfo(@PathVariable("stockinId") Long stockinId)
+    {
+        return success(erpInStockinMiddleService.selectErpInStockinMiddleByStockinId(stockinId));
+    }
+
+    /**
+     * 新增入库主单中间表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinMiddle:add')")
+    @Log(title = "入库主单中间表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ErpInStockinMiddle erpInStockinMiddle)
+    {
+        return toAjax(erpInStockinMiddleService.insertErpInStockinMiddle(erpInStockinMiddle));
+    }
+
+    /**
+     * 修改入库主单中间表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinMiddle:edit')")
+    @Log(title = "入库主单中间表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ErpInStockinMiddle erpInStockinMiddle)
+    {
+        return toAjax(erpInStockinMiddleService.updateErpInStockinMiddle(erpInStockinMiddle));
+    }
+
+    /**
+     * 删除入库主单中间表
+     */
+    @PreAuthorize("@ss.hasPermi('in:ErpInStockinMiddle:remove')")
+    @Log(title = "入库主单中间表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stockinIds}")
+    public AjaxResult remove(@PathVariable Long[] stockinIds)
+    {
+        return toAjax(erpInStockinMiddleService.deleteErpInStockinMiddleByStockinIds(stockinIds));
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/domain/ErpInStockinMiddle.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/domain/ErpInStockinMiddle.java
@@ -0,0 +1,67 @@
+package com.ruoyi.in.ErpInStockinMiddle.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;
+
+/**
+ * 入库主单中间表对象 erp_in_stockin_middle
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public class ErpInStockinMiddle extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long stockinId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String status;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String createDate;
+
+    public void setStockinId(Long stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public Long getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+
+    public void setCreateDate(String createDate) 
+    {
+        this.createDate = createDate;
+    }
+
+    public String getCreateDate() 
+    {
+        return createDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinId", getStockinId())
+            .append("status", getStatus())
+            .append("createDate", getCreateDate())
+            .toString();
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/mapper/ErpInStockinMiddleMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/mapper/ErpInStockinMiddleMapper.java
@@ -0,0 +1,61 @@
+package com.ruoyi.in.ErpInStockinMiddle.mapper;
+
+import java.util.List;
+import com.ruoyi.in.ErpInStockinMiddle.domain.ErpInStockinMiddle;
+
+/**
+ * 入库主单中间表Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public interface ErpInStockinMiddleMapper 
+{
+    /**
+     * 查询入库主单中间表
+     * 
+     * @param stockinId 入库主单中间表主键
+     * @return 入库主单中间表
+     */
+    public ErpInStockinMiddle selectErpInStockinMiddleByStockinId(Long stockinId);
+
+    /**
+     * 查询入库主单中间表列表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 入库主单中间表集合
+     */
+    public List<ErpInStockinMiddle> selectErpInStockinMiddleList(ErpInStockinMiddle erpInStockinMiddle);
+
+    /**
+     * 新增入库主单中间表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 结果
+     */
+    public int insertErpInStockinMiddle(ErpInStockinMiddle erpInStockinMiddle);
+
+    /**
+     * 修改入库主单中间表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 结果
+     */
+    public int updateErpInStockinMiddle(ErpInStockinMiddle erpInStockinMiddle);
+
+    /**
+     * 删除入库主单中间表
+     * 
+     * @param stockinId 入库主单中间表主键
+     * @return 结果
+     */
+    public int deleteErpInStockinMiddleByStockinId(Long stockinId);
+
+    /**
+     * 批量删除入库主单中间表
+     * 
+     * @param stockinIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteErpInStockinMiddleByStockinIds(Long[] stockinIds);
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/service/IErpInStockinMiddleService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/service/IErpInStockinMiddleService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.in.ErpInStockinMiddle.service;
+
+import java.util.List;
+import com.ruoyi.in.ErpInStockinMiddle.domain.ErpInStockinMiddle;
+
+/**
+ * 入库主单中间表Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+public interface IErpInStockinMiddleService 
+{
+    /**
+     * 查询入库主单中间表
+     * 
+     * @param stockinId 入库主单中间表主键
+     * @return 入库主单中间表
+     */
+    public ErpInStockinMiddle selectErpInStockinMiddleByStockinId(Long stockinId);
+
+    /**
+     * 查询入库主单中间表列表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 入库主单中间表集合
+     */
+    public List<ErpInStockinMiddle> selectErpInStockinMiddleList(ErpInStockinMiddle erpInStockinMiddle);
+
+    /**
+     * 新增入库主单中间表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 结果
+     */
+    public int insertErpInStockinMiddle(ErpInStockinMiddle erpInStockinMiddle);
+
+    /**
+     * 修改入库主单中间表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 结果
+     */
+    public int updateErpInStockinMiddle(ErpInStockinMiddle erpInStockinMiddle);
+
+    /**
+     * 批量删除入库主单中间表
+     * 
+     * @param stockinIds 需要删除的入库主单中间表主键集合
+     * @return 结果
+     */
+    public int deleteErpInStockinMiddleByStockinIds(Long[] stockinIds);
+
+    /**
+     * 删除入库主单中间表信息
+     * 
+     * @param stockinId 入库主单中间表主键
+     * @return 结果
+     */
+    public int deleteErpInStockinMiddleByStockinId(Long stockinId);
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/service/impl/ErpInStockinMiddleServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinMiddle/service/impl/ErpInStockinMiddleServiceImpl.java
@@ -0,0 +1,93 @@
+package com.ruoyi.in.ErpInStockinMiddle.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.in.ErpInStockinMiddle.mapper.ErpInStockinMiddleMapper;
+import com.ruoyi.in.ErpInStockinMiddle.domain.ErpInStockinMiddle;
+import com.ruoyi.in.ErpInStockinMiddle.service.IErpInStockinMiddleService;
+
+/**
+ * 入库主单中间表Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-12-08
+ */
+@Service
+public class ErpInStockinMiddleServiceImpl implements IErpInStockinMiddleService 
+{
+    @Autowired
+    private ErpInStockinMiddleMapper erpInStockinMiddleMapper;
+
+    /**
+     * 查询入库主单中间表
+     * 
+     * @param stockinId 入库主单中间表主键
+     * @return 入库主单中间表
+     */
+    @Override
+    public ErpInStockinMiddle selectErpInStockinMiddleByStockinId(Long stockinId)
+    {
+        return erpInStockinMiddleMapper.selectErpInStockinMiddleByStockinId(stockinId);
+    }
+
+    /**
+     * 查询入库主单中间表列表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 入库主单中间表
+     */
+    @Override
+    public List<ErpInStockinMiddle> selectErpInStockinMiddleList(ErpInStockinMiddle erpInStockinMiddle)
+    {
+        return erpInStockinMiddleMapper.selectErpInStockinMiddleList(erpInStockinMiddle);
+    }
+
+    /**
+     * 新增入库主单中间表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 结果
+     */
+    @Override
+    public int insertErpInStockinMiddle(ErpInStockinMiddle erpInStockinMiddle)
+    {
+        return erpInStockinMiddleMapper.insertErpInStockinMiddle(erpInStockinMiddle);
+    }
+
+    /**
+     * 修改入库主单中间表
+     * 
+     * @param erpInStockinMiddle 入库主单中间表
+     * @return 结果
+     */
+    @Override
+    public int updateErpInStockinMiddle(ErpInStockinMiddle erpInStockinMiddle)
+    {
+        return erpInStockinMiddleMapper.updateErpInStockinMiddle(erpInStockinMiddle);
+    }
+
+    /**
+     * 批量删除入库主单中间表
+     * 
+     * @param stockinIds 需要删除的入库主单中间表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpInStockinMiddleByStockinIds(Long[] stockinIds)
+    {
+        return erpInStockinMiddleMapper.deleteErpInStockinMiddleByStockinIds(stockinIds);
+    }
+
+    /**
+     * 删除入库主单中间表信息
+     * 
+     * @param stockinId 入库主单中间表主键
+     * @return 结果
+     */
+    @Override
+    public int deleteErpInStockinMiddleByStockinId(Long stockinId)
+    {
+        return erpInStockinMiddleMapper.deleteErpInStockinMiddleByStockinId(stockinId);
+    }
+}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java
@@ -1,24 +1,31 @@
 package com.ruoyi.in.stockin.controller;

-import cn.hutool.core.convert.Convert;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.in.stockin.domain.InStockin;
-import com.ruoyi.in.stockin.domain.vo.InstockInVo;
-import com.ruoyi.in.stockin.service.IInStockinService;
-import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
 import java.util.ArrayList;
 import java.util.List;

+
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
+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.in.stockin.domain.InStockin;
+import com.ruoyi.in.stockin.service.IInStockinService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
 /**
 * 入库单据Controller
 *
@@ -43,7 +50,7 @@ public class InStockinController extends BaseController
    {
        startPage();
        List<InStockin> list = new ArrayList<>();
-        if (inStockin.getStatus()==null || Convert.toInt(inStockin.getStatus())<4){
+        if (Convert.toInt(inStockin.getStatus())<4){
            list = inStockinService.selectInStockinList(inStockin);
        }else {
            list = inStockinFinishService.selectInStockinFinishListByInStockin(inStockin);
@@ -80,9 +87,9 @@ public class InStockinController extends BaseController
    @PreAuthorize("@ss.hasPermi('in:stockIn:add')")
    @Log(title = "入库单据", businessType = BusinessType.INSERT)
    @PostMapping
-    public AjaxResult add(@RequestBody InstockInVo instockInVo)
+    public AjaxResult add(@RequestBody InStockin inStockin)
    {
-        return inStockinService.insertInStockin(instockInVo);
+        return toAjax(inStockinService.insertInStockin(inStockin));
    }

    /**
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java
@@ -1,9 +1,9 @@
 package com.ruoyi.in.stockin.domain;

-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 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;

 import java.util.List;

@@ -105,6 +105,26 @@ public class InStockin extends BaseEntity

    private List<String> typeData;

+    private String beginTime;
+
+    private String endTime;
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
    public List<String> getTypeData() {
        return typeData;
    }
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/vo/InstockInVo.java
@@ -1,38 +0,0 @@
-package com.ruoyi.in.stockin.domain.vo;
-
-import com.ruoyi.bas.BasProduct.domain.BasProduct;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@Data
-@ToString
-@NoArgsConstructor
-@AllArgsConstructor
-public class InstockInVo {
-
-    @NotNull
-    private String warehouseId;
-
-    @NotNull
-    private String supplierId;
-
-    @NotNull
-    private String inType;
-
-    @NotNull
-    private String erpBill;
-
-    @NotNull
-    private String productType;
-
-    private String remark;
-
-
-    private List<BasProduct> productVoList;
-
-}
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
@@ -1,8 +1,7 @@
 package com.ruoyi.in.stockin.mapper;

-import com.ruoyi.in.stockin.domain.InStockin;
-
 import java.util.List;
+import com.ruoyi.in.stockin.domain.InStockin;

 /**
 * 入库单据Mapper接口
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
@@ -1,10 +1,9 @@
 package com.ruoyi.in.stockin.service;

+import java.util.List;
+
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.in.stockin.domain.InStockin;
-import com.ruoyi.in.stockin.domain.vo.InstockInVo;
-
-import java.util.List;

 /**
 * 入库单据Service接口
@@ -29,7 +28,6 @@ public interface IInStockinService
     * @return 入库单据集合
     */
    public List<InStockin> selectInStockinList(InStockin inStockin);
-    public List<InStockin> selectInStockinListApi(InStockin inStockin);

    /**
     * 新增入库单据
@@ -39,14 +37,6 @@ public interface IInStockinService
     */
    public int insertInStockin(InStockin inStockin);

-    /**
-     * 新增入库单据
-     *
-     * @param inStockin 入库单据
-     * @return 结果
-     */
-    public AjaxResult insertInStockin(InstockInVo inStockin);
-
    /**
     * 修改入库单据
     *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
@@ -1,27 +1,24 @@
 package com.ruoyi.in.stockin.service.impl;

-import cn.hutool.core.bean.BeanUtil;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import com.ruoyi.bas.BasProduct.domain.BasProduct;
-import com.ruoyi.bas.basJobId.service.IBasJobIdService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.in.stockin.domain.InStockin;
-import com.ruoyi.in.stockin.domain.vo.InstockInVo;
-import com.ruoyi.in.stockin.mapper.InStockinMapper;
-import com.ruoyi.in.stockin.service.IInStockinService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.in.stockin.mapper.InStockinMapper;
+import com.ruoyi.in.stockin.domain.InStockin;
+import com.ruoyi.in.stockin.service.IInStockinService;
 import org.springframework.transaction.annotation.Transactional;

-import java.util.List;
-
 /**
 * 入库单据Service业务层处理
 *
@@ -35,8 +32,6 @@ public class InStockinServiceImpl implements IInStockinService
    private InStockinMapper inStockinMapper;
    @Autowired
    private IInStockinDetailService iInStockinDetailService;
-    @Autowired
-    private IBasJobIdService iBasJobIdService;

    /**
     * 查询入库单据
@@ -63,18 +58,6 @@ public class InStockinServiceImpl implements IInStockinService
        return inStockinMapper.selectInStockinList(inStockin);
    }

-    /**
-     * 查询入库单据列表
-     *
-     * @param inStockin 入库单据
-     * @return 入库单据
-     */
-    @Override
-    public List<InStockin> selectInStockinListApi(InStockin inStockin)
-    {
-        return inStockinMapper.selectInStockinList(inStockin);
-    }
-
    /**
     * 新增入库单据
     *
@@ -87,44 +70,6 @@ public class InStockinServiceImpl implements IInStockinService
        return inStockinMapper.insertInStockin(inStockin);
    }

-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public AjaxResult insertInStockin(InstockInVo inStockinVo) {
-        List<BasProduct> productVoList = inStockinVo.getProductVoList();
-        if (CollUtil.isEmpty(productVoList)){
-            return AjaxResult.error("物料不能为空");
-        }
-
-        InStockin inStockin = new InStockin();
-        String rkdId = iBasJobIdService.getJobId("RKD");
-        inStockin.setStockinGuid(rkdId);
-        inStockin.setStockinId(rkdId);
-        inStockin.setCreateDate(DateUtil.formatDateTime(DateUtil.date()));
-        inStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
-        inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
-        //inStockin.setSupplierNo(inStockinVo.getSupplierId());
-        inStockin.setErpBill(inStockinVo.getErpBill());
-        inStockin.setInType(inStockinVo.getInType());
-        inStockin.setWarehouseId(inStockinVo.getWarehouseId());
-        inStockin.setStatus("1");
-        inStockin.setStockSource("1");
-        inStockin.setSpare1(inStockinVo.getProductType());
-        inStockin.setSpare5(inStockinVo.getRemark());
-        inStockinMapper.insertInStockin(inStockin);
-        for (int i = 1; i <= productVoList.size(); i++) {
-            BasProduct basProduct = productVoList.get(i-1);
-            InStockinDetail inStockinDetail = new InStockinDetail();
-            inStockinDetail.setSupplierId(basProduct.getSupplierId());
-            BeanUtil.copyProperties(basProduct,inStockinDetail);
-            inStockinDetail.setStockinGuid(inStockin.getStockinGuid());
-            inStockinDetail.setStockinDetailId(inStockin.getStockinId()+"-"+i);
-            inStockinDetail.setStockinId(inStockin.getStockinId());
-            iInStockinDetailService.insertInStockinDetail(inStockinDetail);
-        }
-
-        return AjaxResult.success();
-    }
-
    /**
     * 修改入库单据
     *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java
@@ -1,23 +1,23 @@
 package com.ruoyi.in.stockindetail.controller;

-import cn.hutool.core.convert.Convert;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.in.stockindetail.domain.InStockinDetail;
-import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
-import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import jakarta.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;

 /**
 * 入库单据子表Controller
@@ -43,7 +43,7 @@ public class InStockinDetailController extends BaseController
    {
        startPage();
        List<InStockinDetail> list = new ArrayList<>();
-        if (inStockinDetail.getStatus()==null ||Convert.toInt(inStockinDetail.getStatus())<4){
+        if (Convert.toInt(inStockinDetail.getStatus())<4){
            list = inStockinDetailService.selectInStockinDetailList(inStockinDetail);
        }else {
            list = inStockinDetailFinishService.selectInStockinDetailList(inStockinDetail);
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java
@@ -1,12 +1,14 @@
 package com.ruoyi.in.stockindetail.domain;

-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.domain.ExtraField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+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;

 /**
 * 入库单据子表对象 in_stockin_detail
@@ -44,8 +46,6 @@ public class InStockinDetail extends BaseEntity
    /** 物料编码 */
    @Excel(name = "物料编码")
    private String productId;
-    @Excel(name = "物料名称")
-    private String productName;

    /** 计划数量 */
    @Excel(name = "计划数量")
@@ -97,8 +97,6 @@ public class InStockinDetail extends BaseEntity
    /** 供应商编码 */
    @Excel(name = "供应商编码")
    private String supplierId;
-    @Excel(name = "供应商名称")
-    private String supplierName;

    /** 客户编码 */
    @Excel(name = "客户编码")
@@ -113,34 +111,28 @@ public class InStockinDetail extends BaseEntity
    private String spec;

    /** 备用字段1 */
-    @Excel(name = "型号")
+    @Excel(name = "备用字段1")
    private String spare1;

    /** 备用字段2 */
-    @Excel(name = "净重")
+    @Excel(name = "备用字段2")
    private String spare2;

    /** 备用字段3 */
-    @Excel(name = "颜色")
+    @Excel(name = "备用字段3")
    private String spare3;

    /** 备用字段4 */
-    @Excel(name = "序列号")
+    @Excel(name = "备用字段4")
    private String spare4;

    /** 备用字段5 */
-    @Excel(name = "电压")
+    @Excel(name = "备用字段5")
    private String spare5;

    /** 备用字段6 */
-    @Excel(name = "功率")
+    @Excel(name = "备用字段6")
    private String spare6;
-    @Excel(name = "相位")
-    private String spare7;
-    @Excel(name = "毛重")
-    private String spare8;
-
-    private String spare9;

    private String status;

--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
@@ -1,11 +1,11 @@
 package com.ruoyi.in.stockindetail.mapper;

+import java.util.List;
+
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import org.apache.ibatis.annotations.Param;

-import java.util.List;
-
 /**
 * 入库单据子表Mapper接口
 *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
@@ -1,12 +1,12 @@
 package com.ruoyi.in.stockindetail.service;

+import java.util.List;
+import java.util.Map;
+
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;

-import java.util.List;
-import java.util.Map;
-
 /**
 * 入库单据子表Service接口
 *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
@@ -1,17 +1,21 @@
 package com.ruoyi.in.stockindetail.service.impl;

-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.in.stockin.domain.InStockin;
-import com.ruoyi.in.stockindetail.domain.InStockinDetail;
-import com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper;
-import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;

+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.domain.ExtraField;
+import com.ruoyi.in.stockin.domain.InStockin;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.in.stockindetail.mapper.InStockinDetailMapper;
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
+import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+
 /**
 * 入库单据子表Service业务层处理
 *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/controller/InStockinDetailFinishController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/controller/InStockinDetailFinishController.java
@@ -1,19 +1,25 @@
 package com.ruoyi.in.stockindetailfinish.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.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
 import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;

 /**
 * 历史入库单据子信息Controller
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java
@@ -1,13 +1,9 @@
 package com.ruoyi.in.stockindetailfinish.domain;

-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.domain.ExtraField;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 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;

 /**
 * 历史入库单据子信息对象 in_stockin_detail_finish
@@ -15,9 +11,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 * @author ruoyi
 * @date 2025-05-28
 */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class InStockinDetailFinish extends BaseEntity
 {
    private static final long serialVersionUID = 1L;
@@ -65,13 +58,6 @@ public class InStockinDetailFinish extends BaseEntity
    @Excel(name = "品牌")
    private String cargoNo;

-    @Excel(name = "扫码数量")
-    private String scanNum;
-    @Excel(name = "扫码数量(箱)")
-    private String scanNumX;
-    @Excel(name = "扫码数量(件)")
-    private String scanNumJ;
-
    /** 实际数量 */
    @Excel(name = "实际数量")
    private String assignNum;
@@ -109,40 +95,364 @@ public class InStockinDetailFinish extends BaseEntity
    private String spec;

    /** 备用字段1 */
-    @Excel(name = "型号")
+    @Excel(name = "备用字段1")
    private String spare1;

    /** 备用字段2 */
-    @Excel(name = "净重")
+    @Excel(name = "备用字段2")
    private String spare2;

    /** 备用字段3 */
-    @Excel(name = "颜色")
+    @Excel(name = "备用字段3")
    private String spare3;

    /** 备用字段4 */
-    @Excel(name = "序列号")
+    @Excel(name = "备用字段4")
    private String spare4;

    /** 备用字段5 */
-    @Excel(name = "电压")
+    @Excel(name = "备用字段5")
    private String spare5;

    /** 备用字段6 */
-    @Excel(name = "功率")
+    @Excel(name = "备用字段6")
    private String spare6;
-    @Excel(name = "相位")
-    private String spare7;
-    @Excel(name = "毛重")
-    private String spare8;

-    private String spare9;
+    /** 扫码数量 */
+    @Excel(name = "扫码数量")
+    private String scanNum;

-    private String status;
+    /** 扫码数量(箱) */
+    @Excel(name = "扫码数量(箱)")
+    private String scanNumX;

-    private ExtraField extraField;
+    /** 扫码数量(件) */
+    @Excel(name = "扫码数量(件)")
+    private String scanNumJ;

-    private String warehouseName;
-
-    private String warehouseId;
+    public void setStockinDetailId(String stockinDetailId) 
+    {
+        this.stockinDetailId = stockinDetailId;
+    }
+
+    public String getStockinDetailId() 
+    {
+        return stockinDetailId;
+    }
+
+    public void setStockinGuid(String stockinGuid) 
+    {
+        this.stockinGuid = stockinGuid;
+    }
+
+    public String getStockinGuid() 
+    {
+        return stockinGuid;
+    }
+
+    public void setStockinId(String stockinId) 
+    {
+        this.stockinId = stockinId;
+    }
+
+    public String getStockinId() 
+    {
+        return stockinId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setQuantity(String quantity) 
+    {
+        this.quantity = quantity;
+    }
+
+    public String getQuantity() 
+    {
+        return quantity;
+    }
+
+    public void setQuantityX(String quantityX) 
+    {
+        this.quantityX = quantityX;
+    }
+
+    public String getQuantityX() 
+    {
+        return quantityX;
+    }
+
+    public void setQuantityJ(String quantityJ) 
+    {
+        this.quantityJ = quantityJ;
+    }
+
+    public String getQuantityJ() 
+    {
+        return quantityJ;
+    }
+
+    public void setPrice(String price) 
+    {
+        this.price = price;
+    }
+
+    public String getPrice() 
+    {
+        return price;
+    }
+
+    public void setCargoNo(String cargoNo) 
+    {
+        this.cargoNo = cargoNo;
+    }
+
+    public String getCargoNo() 
+    {
+        return cargoNo;
+    }
+
+    public void setAssignNum(String assignNum) 
+    {
+        this.assignNum = assignNum;
+    }
+
+    public String getAssignNum() 
+    {
+        return assignNum;
+    }
+
+    public void setAssignNumX(String assignNumX) 
+    {
+        this.assignNumX = assignNumX;
+    }
+
+    public String getAssignNumX() 
+    {
+        return assignNumX;
+    }
+
+    public void setAssignNumJ(String assignNumJ) 
+    {
+        this.assignNumJ = assignNumJ;
+    }
+
+    public String getAssignNumJ() 
+    {
+        return assignNumJ;
+    }
+
+    public void setPrintDate(String printDate) 
+    {
+        this.printDate = printDate;
+    }
+
+    public String getPrintDate() 
+    {
+        return printDate;
+    }
+
+    public void setStockStatus(String stockStatus) 
+    {
+        this.stockStatus = stockStatus;
+    }
+
+    public String getStockStatus() 
+    {
+        return stockStatus;
+    }
+
+    public void setSupplierId(String supplierId) 
+    {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierId() 
+    {
+        return supplierId;
+    }
+
+    public void setCustomerId(String customerId) 
+    {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerId() 
+    {
+        return customerId;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
+    }
+
+    public void setSpec(String spec) 
+    {
+        this.spec = spec;
+    }
+
+    public String getSpec() 
+    {
+        return spec;
+    }
+
+    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 setScanNum(String scanNum) 
+    {
+        this.scanNum = scanNum;
+    }
+
+    public String getScanNum() 
+    {
+        return scanNum;
+    }
+
+    public void setScanNumX(String scanNumX) 
+    {
+        this.scanNumX = scanNumX;
+    }
+
+    public String getScanNumX() 
+    {
+        return scanNumX;
+    }
+
+    public void setScanNumJ(String scanNumJ) 
+    {
+        this.scanNumJ = scanNumJ;
+    }
+
+    public String getScanNumJ() 
+    {
+        return scanNumJ;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockinDetailId", getStockinDetailId())
+            .append("stockinGuid", getStockinGuid())
+            .append("stockinId", getStockinId())
+            .append("lotNo", getLotNo())
+            .append("productGuid", getProductGuid())
+            .append("productId", getProductId())
+            .append("quantity", getQuantity())
+            .append("quantityX", getQuantityX())
+            .append("quantityJ", getQuantityJ())
+            .append("price", getPrice())
+            .append("cargoNo", getCargoNo())
+            .append("remark", getRemark())
+            .append("assignNum", getAssignNum())
+            .append("assignNumX", getAssignNumX())
+            .append("assignNumJ", getAssignNumJ())
+            .append("printDate", getPrintDate())
+            .append("stockStatus", getStockStatus())
+            .append("supplierId", getSupplierId())
+            .append("customerId", getCustomerId())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("scanNum", getScanNum())
+            .append("scanNumX", getScanNumX())
+            .append("scanNumJ", getScanNumJ())
+            .toString();
+    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java
@@ -1,10 +1,10 @@
 package com.ruoyi.in.stockindetailfinish.mapper;

+import java.util.List;
+
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;

-import java.util.List;
-
 /**
 * 历史入库单据子信息Mapper接口
 *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java
@@ -1,10 +1,10 @@
 package com.ruoyi.in.stockindetailfinish.service;

+import java.util.List;
+
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;

-import java.util.List;
-
 /**
 * 历史入库单据子信息Service接口
 *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java
@@ -1,13 +1,15 @@
 package com.ruoyi.in.stockindetailfinish.service.impl;

+import java.util.List;
+
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.domain.ExtraField;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
-import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
-import com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper;
-import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper;
+import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
+import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;

 /**
 * 历史入库单据子信息Service业务层处理
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/controller/InStockinFinishController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/controller/InStockinFinishController.java
@@ -1,19 +1,25 @@
 package com.ruoyi.in.stockinfinish.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.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
 import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;

 /**
 * 历史入库单据主信息Controller
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/domain/InStockinFinish.java
@@ -1,9 +1,9 @@
 package com.ruoyi.in.stockinfinish.domain;

-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 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;

 /**
 * 历史入库单据主信息对象 in_stockin_finish
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java
@@ -1,10 +1,10 @@
 package com.ruoyi.in.stockinfinish.mapper;

+import java.util.List;
+
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;

-import java.util.List;
-
 /**
 * 历史入库单据主信息Mapper接口
 *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java
@@ -1,10 +1,10 @@
 package com.ruoyi.in.stockinfinish.service;

+import java.util.List;
+
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;

-import java.util.List;
-
 /**
 * 历史入库单据主信息Service接口
 *
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
@@ -1,14 +1,14 @@
 package com.ruoyi.in.stockinfinish.service.impl;

+import java.util.List;
+
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.in.stockin.domain.InStockin;
-import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
-import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper;
-import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.List;
+import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper;
+import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
+import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;

 /**
 * 历史入库单据主信息Service业务层处理
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
@@ -1,46 +1,20 @@
 package com.ruoyi.pda.controller;

-import cn.hutool.core.util.StrUtil;
 import com.ruoyi.api.domain.RequestEnter;
-import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
-import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
-import com.ruoyi.bas.container.domain.BasContainer;
-import com.ruoyi.bas.warehouse.domain.BasWarehouse;
-import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.MessageUtils;
-import com.ruoyi.in.stockin.domain.InStockin;
-import com.ruoyi.in.stockin.service.IInStockinService;
-import com.ruoyi.in.stockindetail.domain.InStockinDetail;
-import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
-import com.ruoyi.job.mydojob.domain.MydoJob;
-import com.ruoyi.job.mydojob.service.IMydoJobService;
-import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
-import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
-import com.ruoyi.out.outStockout.domain.OutStockout;
-import com.ruoyi.out.outStockout.service.IOutStockoutService;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.service.PdaService;
 import com.ruoyi.pda.trayMsg.domain.TrayMsg;
-import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
-import com.ruoyi.stock.stock.domain.BasStock;
-import com.ruoyi.stock.stock.service.IBasStockService;
-import com.ruoyi.system.service.ISysDictTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;

-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
@Controller
@RequestMapping("/pda")
@Slf4j
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
@@ -9,7 +9,6 @@ import com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper;
 import com.ruoyi.check.commit.domain.CheckCommitRecord;
 import com.ruoyi.check.commit.service.ICheckCommitRecordService;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.MessageUtils;

 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
@@ -17,7 +16,6 @@ import com.ruoyi.job.mydojob.domain.MydoJob;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
-import com.ruoyi.job.mydojobdetail.service.impl.MydoJobDetailServiceImpl;
 import com.ruoyi.pda.domain.TrayCodeMakeSure;
 import com.ruoyi.pda.domain.TrayCodeMsg;
 import com.ruoyi.pda.mapper.PdaMapper;
@@ -29,7 +27,6 @@ import com.ruoyi.system.service.ISysRoleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;

 import java.util.*;

--- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java
@@ -258,19 +258,19 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
            return null;
        }
        List<InStockinDetail> inStockinDetailList = new ArrayList<>();
-        int i = 1;
-        for (ReceiveStockinDetail receiveStockinDetail : list) {
-            InStockinDetail inStockinDetail = new InStockinDetail();
-            BeanUtil.copyProperties(receiveStockinDetail,inStockinDetail);
-            inStockinDetail.setStockinGuid(inStockin.getStockinGuid());
-            inStockinDetail.setStockinDetailId(inStockin.getStockinId()+"-"+i++);
-            inStockinDetail.setStockinId(inStockin.getStockinId());
-            inStockinDetail.setStockStatus("0");
-            inStockinDetail.setAssignNum("0");
-            inStockinDetail.setScanNum("0");
-            inStockinDetail.setSpare2(receiveStockinDetail.getStockinDetailId());
-            inStockinDetailList.add(inStockinDetail);
-        }
+//        int i = 1;
+//        for (ReceiveStockinDetail receiveStockinDetail : list) {
+//            InStockinDetail inStockinDetail = new InStockinDetail();
+//            BeanUtil.copyProperties(receiveStockinDetail,inStockinDetail);
+//            inStockinDetail.setStockinGuid(inStockin.getStockinGuid());
+//            inStockinDetail.setStockinDetailId(inStockin.getStockinId()+"-"+i++);
+//            inStockinDetail.setStockinId(inStockin.getStockinId());
+//            inStockinDetail.setStockStatus("0");
+//            inStockinDetail.setAssignNum("0");
+//            inStockinDetail.setScanNum("0");
+//            inStockinDetail.setSpare2(receiveStockinDetail.getStockinDetailId());
+//            inStockinDetailList.add(inStockinDetail);
+//        }
        return inStockinDetailList;
    }

@@ -284,13 +284,13 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
            return null;
        }
        InStockin inStockin = new InStockin();
-        BeanUtil.copyProperties(receiveStockin,inStockin );
-        inStockin.setStockinGuid(IdUtil.fastSimpleUUID());
-        inStockin.setStockinId(iBasJobIdService.getJobId("RKD"));
-        // 设置状态等默认值
-        inStockin.setStatus("1");
-        inStockin.setSpare1(receiveStockin.getStockinId());
-        inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
+//        BeanUtil.copyProperties(receiveStockin,inStockin );
+//        inStockin.setStockinGuid(IdUtil.fastSimpleUUID());
+//        inStockin.setStockinId(iBasJobIdService.getJobId("RKD"));
+//        // 设置状态等默认值
+//        inStockin.setStatus("1");
+//        inStockin.setSpare1(receiveStockin.getStockinId());
+//        inStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
        return inStockin;
    }

--- a/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinDetailMapper.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.in.ErpInStockinDetail.mapper.ErpInStockinDetailMapper">
+    
+    <resultMap type="ErpInStockinDetail" id="ErpInStockinDetailResult">
+        <result property="id"    column="id"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="assistUnit"    column="assistUnit"    />
+        <result property="assistQuantity"    column="assistQuantity"    />
+        <result property="ku"    column="ku"    />
+        <result property="warehousePositionID"    column="warehousePositionID"    />
+        <result property="ph"    column="ph"    />
+        <result property="xlh"    column="xlh"    />
+        <result property="datesc"    column="datesc"    />
+        <result property="dateyx"    column="dateyx"    />
+        <result property="date2"    column="date2"    />
+        <result property="sysIcusIInheritIdIidI1"    column="sysIcusIInheritIdIidI1"    />
+        <result property="kuin"    column="kuin"    />
+        <result property="rkbh"    column="rkbh"    />
+    </resultMap>
+
+    <sql id="selectErpInStockinDetailVo">
+        select id, quantity, assistUnit, assistQuantity, ku, warehousePositionID, ph, xlh, datesc, dateyx, date2, sysIcusIInheritIdIidI1, kuin, rkbh from erp_in_stockin_detail
+    </sql>
+
+    <select id="selectErpInStockinDetailList" parameterType="ErpInStockinDetail" resultMap="ErpInStockinDetailResult">
+        <include refid="selectErpInStockinDetailVo"/>
+        <where>  
+            <if test="quantity != null "> and quantity = #{quantity}</if>
+            <if test="assistUnit != null "> and assistUnit = #{assistUnit}</if>
+            <if test="assistQuantity != null "> and assistQuantity = #{assistQuantity}</if>
+            <if test="ku != null "> and ku = #{ku}</if>
+            <if test="warehousePositionID != null "> and warehousePositionID = #{warehousePositionID}</if>
+            <if test="ph != null  and ph != ''"> and ph = #{ph}</if>
+            <if test="xlh != null  and xlh != ''"> and xlh = #{xlh}</if>
+            <if test="datesc != null  and datesc != ''"> and datesc = #{datesc}</if>
+            <if test="dateyx != null  and dateyx != ''"> and dateyx = #{dateyx}</if>
+            <if test="date2 != null  and date2 != ''"> and date2 = #{date2}</if>
+            <if test="sysIcusIInheritIdIidI1 != null  and sysIcusIInheritIdIidI1 != ''"> and sysIcusIInheritIdIidI1 = #{sysIcusIInheritIdIidI1}</if>
+            <if test="kuin != null  and kuin != ''"> and kuin = #{kuin}</if>
+            <if test="rkbh != null  and rkbh != ''"> and rkbh = #{rkbh}</if>
+        </where>
+    </select>
+    
+    <select id="selectErpInStockinDetailById" parameterType="Long" resultMap="ErpInStockinDetailResult">
+        <include refid="selectErpInStockinDetailVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertErpInStockinDetail" parameterType="ErpInStockinDetail">
+        insert into erp_in_stockin_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="assistUnit != null">assistUnit,</if>
+            <if test="assistQuantity != null">assistQuantity,</if>
+            <if test="ku != null">ku,</if>
+            <if test="warehousePositionID != null">warehousePositionID,</if>
+            <if test="ph != null">ph,</if>
+            <if test="xlh != null">xlh,</if>
+            <if test="datesc != null">datesc,</if>
+            <if test="dateyx != null">dateyx,</if>
+            <if test="date2 != null and date2 != ''">date2,</if>
+            <if test="sysIcusIInheritIdIidI1 != null and sysIcusIInheritIdIidI1 != ''">sysIcusIInheritIdIidI1,</if>
+            <if test="kuin != null and kuin != ''">kuin,</if>
+            <if test="rkbh != null and rkbh != ''">rkbh,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="assistUnit != null">#{assistUnit},</if>
+            <if test="assistQuantity != null">#{assistQuantity},</if>
+            <if test="ku != null">#{ku},</if>
+            <if test="warehousePositionID != null">#{warehousePositionID},</if>
+            <if test="ph != null">#{ph},</if>
+            <if test="xlh != null">#{xlh},</if>
+            <if test="datesc != null">#{datesc},</if>
+            <if test="dateyx != null">#{dateyx},</if>
+            <if test="date2 != null and date2 != ''">#{date2},</if>
+            <if test="sysIcusIInheritIdIidI1 != null and sysIcusIInheritIdIidI1 != ''">#{sysIcusIInheritIdIidI1},</if>
+            <if test="kuin != null and kuin != ''">#{kuin},</if>
+            <if test="rkbh != null and rkbh != ''">#{rkbh},</if>
+         </trim>
+    </insert>
+
+    <update id="updateErpInStockinDetail" parameterType="ErpInStockinDetail">
+        update erp_in_stockin_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="assistUnit != null">assistUnit = #{assistUnit},</if>
+            <if test="assistQuantity != null">assistQuantity = #{assistQuantity},</if>
+            <if test="ku != null">ku = #{ku},</if>
+            <if test="warehousePositionID != null">warehousePositionID = #{warehousePositionID},</if>
+            <if test="ph != null">ph = #{ph},</if>
+            <if test="xlh != null">xlh = #{xlh},</if>
+            <if test="datesc != null">datesc = #{datesc},</if>
+            <if test="dateyx != null">dateyx = #{dateyx},</if>
+            <if test="date2 != null and date2 != ''">date2 = #{date2},</if>
+            <if test="sysIcusIInheritIdIidI1 != null and sysIcusIInheritIdIidI1 != ''">sysIcusIInheritIdIidI1 = #{sysIcusIInheritIdIidI1},</if>
+            <if test="kuin != null and kuin != ''">kuin = #{kuin},</if>
+            <if test="rkbh != null and rkbh != ''">rkbh = #{rkbh},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteErpInStockinDetailById" parameterType="Long">
+        delete from erp_in_stockin_detail where id = #{id}
+    </delete>
+
+    <delete id="deleteErpInStockinDetailByIds" parameterType="String">
+        delete from erp_in_stockin_detail where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
--- a/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMapper.xml
@@ -0,0 +1,149 @@
+<?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.ErpInStockin.mapper.ErpInStockinMapper">
+    
+    <resultMap type="ErpInStockin" id="ErpInStockinResult">
+        <result property="title"    column="title"    />
+        <result property="kuin"    column="kuin"    />
+        <result property="complete1"    column="complete1"    />
+        <result property="cateid"    column="cateid"    />
+        <result property="date3"    column="date3"    />
+        <result property="date5"    column="date5"    />
+        <result property="catein"    column="catein"    />
+        <result property="intro2"    column="intro2"    />
+        <result property="intro"    column="intro"    />
+        <result property="caigou"    column="caigou"    />
+        <result property="date7"    column="date7"    />
+        <result property="kg"    column="kg"    />
+        <result property="sort1"    column="sort1"    />
+        <result property="rkbh"    column="rkbh"    />
+        <result property="status"    column="status"    />
+        <result property="kuinList"    column="kuinList"    />
+        <result property="sysIcusIInheritIdIidI413"    column="sysIcusIInheritIdIidI413"    />
+        <result property="sysIcusIInheritIdIidI414"    column="sysIcusIInheritIdIidI414"    />
+        <result property="sysIcusIInheritIdIidI415"    column="sysIcusIInheritIdIidI415"    />
+        <result property="stockinGuid"    column="stockin_guid"    />
+    </resultMap>
+
+    <sql id="selectErpInStockinVo">
+        select title, kuin, complete1, cateid, date3, date5, catein, intro2, intro, caigou, date7, kg, sort1, rkbh, status, kuinList, sysIcusIInheritIdIidI413, sysIcusIInheritIdIidI414, sysIcusIInheritIdIidI415, stockin_guid from erp_in_stockin
+    </sql>
+
+    <select id="selectErpInStockinList" parameterType="ErpInStockin" resultMap="ErpInStockinResult">
+        <include refid="selectErpInStockinVo"/>
+        <where>  
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="kuin != null  and kuin != ''"> and kuin = #{kuin}</if>
+            <if test="complete1 != null  and complete1 != ''"> and complete1 = #{complete1}</if>
+            <if test="cateid != null  and cateid != ''"> and cateid = #{cateid}</if>
+            <if test="date3 != null  and date3 != ''"> and date3 = #{date3}</if>
+            <if test="date5 != null  and date5 != ''"> and date5 = #{date5}</if>
+            <if test="catein != null  and catein != ''"> and catein = #{catein}</if>
+            <if test="intro2 != null  and intro2 != ''"> and intro2 = #{intro2}</if>
+            <if test="intro != null  and intro != ''"> and intro = #{intro}</if>
+            <if test="caigou != null  and caigou != ''"> and caigou = #{caigou}</if>
+            <if test="date7 != null  and date7 != ''"> and date7 = #{date7}</if>
+            <if test="kg != null  and kg != ''"> and kg = #{kg}</if>
+            <if test="sort1 != null  and sort1 != ''"> and sort1 = #{sort1}</if>
+            <if test="rkbh != null  and rkbh != ''"> and rkbh = #{rkbh}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="kuinList != null  and kuinList != ''"> and kuinList = #{kuinList}</if>
+            <if test="sysIcusIInheritIdIidI413 != null  and sysIcusIInheritIdIidI413 != ''"> and sysIcusIInheritIdIidI413 = #{sysIcusIInheritIdIidI413}</if>
+            <if test="sysIcusIInheritIdIidI414 != null  and sysIcusIInheritIdIidI414 != ''"> and sysIcusIInheritIdIidI414 = #{sysIcusIInheritIdIidI414}</if>
+            <if test="sysIcusIInheritIdIidI415 != null  and sysIcusIInheritIdIidI415 != ''"> and sysIcusIInheritIdIidI415 = #{sysIcusIInheritIdIidI415}</if>
+            <if test="stockinGuid != null  and stockinGuid != ''"> and stockin_guid = #{stockinGuid}</if>
+        </where>
+    </select>
+    
+    <select id="selectErpInStockinByTitle" parameterType="String" resultMap="ErpInStockinResult">
+        <include refid="selectErpInStockinVo"/>
+        where title = #{title}
+    </select>
+
+    <insert id="insertErpInStockin" parameterType="ErpInStockin">
+        insert into erp_in_stockin
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null">title,</if>
+            <if test="kuin != null">kuin,</if>
+            <if test="complete1 != null">complete1,</if>
+            <if test="cateid != null">cateid,</if>
+            <if test="date3 != null">date3,</if>
+            <if test="date5 != null">date5,</if>
+            <if test="catein != null">catein,</if>
+            <if test="intro2 != null">intro2,</if>
+            <if test="intro != null">intro,</if>
+            <if test="caigou != null">caigou,</if>
+            <if test="date7 != null">date7,</if>
+            <if test="kg != null">kg,</if>
+            <if test="sort1 != null">sort1,</if>
+            <if test="rkbh != null and rkbh != ''">rkbh,</if>
+            <if test="status != null">status,</if>
+            <if test="kuinList != null">kuinList,</if>
+            <if test="sysIcusIInheritIdIidI413 != null">sysIcusIInheritIdIidI413,</if>
+            <if test="sysIcusIInheritIdIidI414 != null">sysIcusIInheritIdIidI414,</if>
+            <if test="sysIcusIInheritIdIidI415 != null">sysIcusIInheritIdIidI415,</if>
+            <if test="stockinGuid != null">stockin_guid,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null">#{title},</if>
+            <if test="kuin != null">#{kuin},</if>
+            <if test="complete1 != null">#{complete1},</if>
+            <if test="cateid != null">#{cateid},</if>
+            <if test="date3 != null">#{date3},</if>
+            <if test="date5 != null">#{date5},</if>
+            <if test="catein != null">#{catein},</if>
+            <if test="intro2 != null">#{intro2},</if>
+            <if test="intro != null">#{intro},</if>
+            <if test="caigou != null">#{caigou},</if>
+            <if test="date7 != null">#{date7},</if>
+            <if test="kg != null">#{kg},</if>
+            <if test="sort1 != null">#{sort1},</if>
+            <if test="rkbh != null and rkbh != ''">#{rkbh},</if>
+            <if test="status != null">#{status},</if>
+            <if test="kuinList != null">#{kuinList},</if>
+            <if test="sysIcusIInheritIdIidI413 != null">#{sysIcusIInheritIdIidI413},</if>
+            <if test="sysIcusIInheritIdIidI414 != null">#{sysIcusIInheritIdIidI414},</if>
+            <if test="sysIcusIInheritIdIidI415 != null">#{sysIcusIInheritIdIidI415},</if>
+            <if test="stockinGuid != null">#{stockinGuid},</if>
+         </trim>
+    </insert>
+
+    <update id="updateErpInStockin" parameterType="ErpInStockin">
+        update erp_in_stockin
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="kuin != null">kuin = #{kuin},</if>
+            <if test="complete1 != null">complete1 = #{complete1},</if>
+            <if test="cateid != null">cateid = #{cateid},</if>
+            <if test="date3 != null">date3 = #{date3},</if>
+            <if test="date5 != null">date5 = #{date5},</if>
+            <if test="catein != null">catein = #{catein},</if>
+            <if test="intro2 != null">intro2 = #{intro2},</if>
+            <if test="intro != null">intro = #{intro},</if>
+            <if test="caigou != null">caigou = #{caigou},</if>
+            <if test="date7 != null">date7 = #{date7},</if>
+            <if test="kg != null">kg = #{kg},</if>
+            <if test="sort1 != null">sort1 = #{sort1},</if>
+            <if test="rkbh != null and rkbh != ''">rkbh = #{rkbh},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="kuinList != null">kuinList = #{kuinList},</if>
+            <if test="sysIcusIInheritIdIidI413 != null">sysIcusIInheritIdIidI413 = #{sysIcusIInheritIdIidI413},</if>
+            <if test="sysIcusIInheritIdIidI414 != null">sysIcusIInheritIdIidI414 = #{sysIcusIInheritIdIidI414},</if>
+            <if test="sysIcusIInheritIdIidI415 != null">sysIcusIInheritIdIidI415 = #{sysIcusIInheritIdIidI415},</if>
+            <if test="stockinGuid != null">stockin_guid = #{stockinGuid},</if>
+        </trim>
+        where title = #{title}
+    </update>
+
+    <delete id="deleteErpInStockinByTitle" parameterType="String">
+        delete from erp_in_stockin where title = #{title}
+    </delete>
+
+    <delete id="deleteErpInStockinByTitles" parameterType="String">
+        delete from erp_in_stockin where title in 
+        <foreach item="title" collection="array" open="(" separator="," close=")">
+            #{title}
+        </foreach>
+    </delete>
+</mapper>
--- a/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMiddleMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/ErpInStockinMiddleMapper.xml
@@ -0,0 +1,63 @@
+<?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.ErpInStockinMiddle.mapper.ErpInStockinMiddleMapper">
+    
+    <resultMap type="ErpInStockinMiddle" id="ErpInStockinMiddleResult">
+        <result property="stockinId"    column="stockin_id"    />
+        <result property="status"    column="status"    />
+        <result property="createDate"    column="create_date"    />
+    </resultMap>
+
+    <sql id="selectErpInStockinMiddleVo">
+        select stockin_id, status, create_date from erp_in_stockin_middle
+    </sql>
+
+    <select id="selectErpInStockinMiddleList" parameterType="ErpInStockinMiddle" resultMap="ErpInStockinMiddleResult">
+        <include refid="selectErpInStockinMiddleVo"/>
+        <where>  
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="createDate != null  and createDate != ''"> and create_date = #{createDate}</if>
+        </where>
+    </select>
+    
+    <select id="selectErpInStockinMiddleByStockinId" parameterType="Long" resultMap="ErpInStockinMiddleResult">
+        <include refid="selectErpInStockinMiddleVo"/>
+        where stockin_id = #{stockinId}
+    </select>
+
+    <insert id="insertErpInStockinMiddle" parameterType="ErpInStockinMiddle">
+        insert into erp_in_stockin_middle
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stockinId != null">stockin_id,</if>
+            <if test="status != null">status,</if>
+            <if test="createDate != null">create_date,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stockinId != null">#{stockinId},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createDate != null">#{createDate},</if>
+         </trim>
+    </insert>
+
+    <update id="updateErpInStockinMiddle" parameterType="ErpInStockinMiddle">
+        update erp_in_stockin_middle
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="status != null">status = #{status},</if>
+            <if test="createDate != null">create_date = #{createDate},</if>
+        </trim>
+        where stockin_id = #{stockinId}
+    </update>
+
+    <delete id="deleteErpInStockinMiddleByStockinId" parameterType="Long">
+        delete from erp_in_stockin_middle where stockin_id = #{stockinId}
+    </delete>
+
+    <delete id="deleteErpInStockinMiddleByStockinIds" parameterType="String">
+        delete from erp_in_stockin_middle where stockin_id in 
+        <foreach item="stockinId" collection="array" open="(" separator="," close=")">
+            #{stockinId}
+        </foreach>
+    </delete>
+</mapper>
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
@@ -66,7 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <where>
            <if test="stockinId != null  and stockinId != ''"> and is2.stockin_id = #{stockinId}</if>
            <if test="inType != null  and inType != ''"> and is2.in_type = #{inType}</if>
-            <if test="createDate != null  and createDate != ''"> and is2.create_date = #{createDate}</if>
+            <if test="beginTime != null  and beginTime != ''"> and is2.create_date &gt;= #{beginTime}</if>
+            <if test="endTime != null  and endTime != ''"> and is2.create_date &lt;= #{endTime}</if>
            <if test="createManId != null  and createManId != ''"> and is2.create_man_id = #{createManId}</if>
            <if test="status != null  and status != ''"> and is2.status = #{status}</if>
            <if test="warehouseId != null  and warehouseId != ''"> and is2.warehouse_id = #{warehouseId}</if>
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="customerNo != null  and customerNo != ''"> and is2.customer_no = #{customerNo}</if>
            <if test="classNo != null  and classNo != ''"> and is2.class_no = #{classNo}</if>
            <if test="supplierNo != null  and supplierNo != ''"> and is2.supplier_no = #{supplierNo}</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName},'%')</if>
            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 = #{spare1}</if>
            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 = #{spare2}</if>
            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 = #{spare4}</if>
--- a/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml
@@ -28,8 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"

    <select id="selectRequestLogList" parameterType="RequestLog" resultMap="RequestLogResult">
        <include refid="selectRequestLogVo"/>
-        <where>  
-            <if test="requestTime != null  and requestTime != ''"> and request_time = #{requestTime}</if>
+        <where>  <if test="requestTime != null  and requestTime != ''"> and request_time = #{requestTime}</if>
            <if test="sourceSystem != null  and sourceSystem != ''"> and source_system = #{sourceSystem}</if>
            <if test="targetSystem != null  and targetSystem != ''"> and target_system = #{targetSystem}</if>
            <if test="endpoint != null  and endpoint != ''"> and endpoint = #{endpoint}</if>
@@ -43,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            <if test="errorDetails != null  and errorDetails != ''"> and error_details = #{errorDetails}</if>
            <if test="duration != null  and duration != ''"> and duration = #{duration}</if>
            <if test="isSuccessful != null  and isSuccessful != ''"> and Is_successful = #{isSuccessful}</if>
+
        </where>
    </select>