盘点差异，入库联查字段修改，历史单据作业查询

ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.check.difference.controller;
+
+import java.util.List;
+import javax.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.check.difference.domain.CheckDifferenceRecord;
+import com.ruoyi.check.difference.service.ICheckDifferenceRecordService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 盘点差异Controller
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@RestController
+@RequestMapping("/check/difference")
+public class CheckDifferenceRecordController extends BaseController
+{
+    @Autowired
+    private ICheckDifferenceRecordService checkDifferenceRecordService;
+
+    /**
+     * 查询盘点差异列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:difference:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CheckDifferenceRecord checkDifferenceRecord)
+    {
+        startPage();
+        List<CheckDifferenceRecord> list = checkDifferenceRecordService.selectCheckDifferenceRecordList(checkDifferenceRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出盘点差异列表
+     */
+    @PreAuthorize("@ss.hasPermi('check:difference:export')")
+    @Log(title = "盘点差异", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CheckDifferenceRecord checkDifferenceRecord)
+    {
+        List<CheckDifferenceRecord> list = checkDifferenceRecordService.selectCheckDifferenceRecordList(checkDifferenceRecord);
+        ExcelUtil<CheckDifferenceRecord> util = new ExcelUtil<CheckDifferenceRecord>(CheckDifferenceRecord.class);
+        util.exportExcel(response, list, "盘点差异数据");
+    }
+
+    /**
+     * 获取盘点差异详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('check:difference:query')")
+    @GetMapping(value = "/{checkGuid}")
+    public AjaxResult getInfo(@PathVariable("checkGuid") String checkGuid)
+    {
+        return success(checkDifferenceRecordService.selectCheckDifferenceRecordByCheckGuid(checkGuid));
+    }
+
+    /**
+     * 新增盘点差异
+     */
+    @PreAuthorize("@ss.hasPermi('check:difference:add')")
+    @Log(title = "盘点差异", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CheckDifferenceRecord checkDifferenceRecord)
+    {
+        return toAjax(checkDifferenceRecordService.insertCheckDifferenceRecord(checkDifferenceRecord));
+    }
+
+    /**
+     * 修改盘点差异
+     */
+    @PreAuthorize("@ss.hasPermi('check:difference:edit')")
+    @Log(title = "盘点差异", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CheckDifferenceRecord checkDifferenceRecord)
+    {
+        return toAjax(checkDifferenceRecordService.updateCheckDifferenceRecord(checkDifferenceRecord));
+    }
+
+    /**
+     * 删除盘点差异
+     */
+    @PreAuthorize("@ss.hasPermi('check:difference:remove')")
+    @Log(title = "盘点差异", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{checkGuids}")
+    public AjaxResult remove(@PathVariable String[] checkGuids)
+    {
+        return toAjax(checkDifferenceRecordService.deleteCheckDifferenceRecordByCheckGuids(checkGuids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/check/difference/domain/CheckDifferenceRecord.java

@@ -0,0 +1,218 @@
+package com.ruoyi.check.difference.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;
+
+/**
+ * 盘点差异对象 check_difference_record
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public class CheckDifferenceRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 盘点id */
+    private String checkGuid;
+
+    /** 盘点单据id */
+    @Excel(name = "盘点单据id")
+    private String checkStockDetailId;
+
+    /** 库存id */
+    @Excel(name = "库存id")
+    private String stockId;
+
+    /** 托盘 */
+    @Excel(name = "托盘")
+    private String trayCode;
+
+    /** 货位id */
+    @Excel(name = "货位id")
+    private String cargoSpaceId;
+
+    /** 物料id */
+    @Excel(name = "物料id")
+    private String productId;
+
+    /** 批次号 */
+    @Excel(name = "批次号")
+    private String lotNo;
+
+    /** 供应商 */
+    @Excel(name = "供应商")
+    private String supplier;
+
+    /** 客户 */
+    @Excel(name = "客户")
+    private String customer;
+
+    /** 原值 */
+    @Excel(name = "原值")
+    private String oldQuantity;
+
+    /** 新值 */
+    @Excel(name = "新值")
+    private String newQuantity;
+
+    /** 操作方式 */
+    @Excel(name = "操作方式")
+    private Long recordType;
+
+    /** 物料guid */
+    @Excel(name = "物料guid")
+    private String productGuid;
+
+    public void setCheckGuid(String checkGuid) 
+    {
+        this.checkGuid = checkGuid;
+    }
+
+    public String getCheckGuid() 
+    {
+        return checkGuid;
+    }
+
+    public void setCheckStockDetailId(String checkStockDetailId) 
+    {
+        this.checkStockDetailId = checkStockDetailId;
+    }
+
+    public String getCheckStockDetailId() 
+    {
+        return checkStockDetailId;
+    }
+
+    public void setStockId(String stockId) 
+    {
+        this.stockId = stockId;
+    }
+
+    public String getStockId() 
+    {
+        return stockId;
+    }
+
+    public void setTrayCode(String trayCode) 
+    {
+        this.trayCode = trayCode;
+    }
+
+    public String getTrayCode() 
+    {
+        return trayCode;
+    }
+
+    public void setCargoSpaceId(String cargoSpaceId) 
+    {
+        this.cargoSpaceId = cargoSpaceId;
+    }
+
+    public String getCargoSpaceId() 
+    {
+        return cargoSpaceId;
+    }
+
+    public void setProductId(String productId) 
+    {
+        this.productId = productId;
+    }
+
+    public String getProductId() 
+    {
+        return productId;
+    }
+
+    public void setLotNo(String lotNo) 
+    {
+        this.lotNo = lotNo;
+    }
+
+    public String getLotNo() 
+    {
+        return lotNo;
+    }
+
+    public void setSupplier(String supplier) 
+    {
+        this.supplier = supplier;
+    }
+
+    public String getSupplier() 
+    {
+        return supplier;
+    }
+
+    public void setCustomer(String customer) 
+    {
+        this.customer = customer;
+    }
+
+    public String getCustomer() 
+    {
+        return customer;
+    }
+
+    public void setOldQuantity(String oldQuantity) 
+    {
+        this.oldQuantity = oldQuantity;
+    }
+
+    public String getOldQuantity() 
+    {
+        return oldQuantity;
+    }
+
+    public void setNewQuantity(String newQuantity) 
+    {
+        this.newQuantity = newQuantity;
+    }
+
+    public String getNewQuantity() 
+    {
+        return newQuantity;
+    }
+
+    public void setRecordType(Long recordType) 
+    {
+        this.recordType = recordType;
+    }
+
+    public Long getRecordType() 
+    {
+        return recordType;
+    }
+
+    public void setProductGuid(String productGuid) 
+    {
+        this.productGuid = productGuid;
+    }
+
+    public String getProductGuid() 
+    {
+        return productGuid;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("checkGuid", getCheckGuid())
+            .append("checkStockDetailId", getCheckStockDetailId())
+            .append("stockId", getStockId())
+            .append("trayCode", getTrayCode())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("productId", getProductId())
+            .append("lotNo", getLotNo())
+            .append("supplier", getSupplier())
+            .append("customer", getCustomer())
+            .append("oldQuantity", getOldQuantity())
+            .append("newQuantity", getNewQuantity())
+            .append("recordType", getRecordType())
+            .append("createTime", getCreateTime())
+            .append("productGuid", getProductGuid())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/check/difference/mapper/CheckDifferenceRecordMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.check.difference.mapper;
+
+import java.util.List;
+import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
+
+/**
+ * 盘点差异Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface CheckDifferenceRecordMapper 
+{
+    /**
+     * 查询盘点差异
+     * 
+     * @param checkGuid 盘点差异主键
+     * @return 盘点差异
+     */
+    public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid);
+
+    /**
+     * 查询盘点差异列表
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 盘点差异集合
+     */
+    public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord);
+
+    /**
+     * 新增盘点差异
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 结果
+     */
+    public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
+
+    /**
+     * 修改盘点差异
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 结果
+     */
+    public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
+
+    /**
+     * 删除盘点差异
+     * 
+     * @param checkGuid 盘点差异主键
+     * @return 结果
+     */
+    public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid);
+
+    /**
+     * 批量删除盘点差异
+     * 
+     * @param checkGuids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids);
+}

ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/ICheckDifferenceRecordService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.check.difference.service;
+
+import java.util.List;
+import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
+
+/**
+ * 盘点差异Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+public interface ICheckDifferenceRecordService 
+{
+    /**
+     * 查询盘点差异
+     * 
+     * @param checkGuid 盘点差异主键
+     * @return 盘点差异
+     */
+    public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid);
+
+    /**
+     * 查询盘点差异列表
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 盘点差异集合
+     */
+    public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord);
+
+    /**
+     * 新增盘点差异
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 结果
+     */
+    public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
+
+    /**
+     * 修改盘点差异
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 结果
+     */
+    public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord);
+
+    /**
+     * 批量删除盘点差异
+     * 
+     * @param checkGuids 需要删除的盘点差异主键集合
+     * @return 结果
+     */
+    public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids);
+
+    /**
+     * 删除盘点差异信息
+     * 
+     * @param checkGuid 盘点差异主键
+     * @return 结果
+     */
+    public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid);
+}

ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java

@@ -0,0 +1,95 @@
+package com.ruoyi.check.difference.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.check.difference.mapper.CheckDifferenceRecordMapper;
+import com.ruoyi.check.difference.domain.CheckDifferenceRecord;
+import com.ruoyi.check.difference.service.ICheckDifferenceRecordService;
+
+/**
+ * 盘点差异Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-05-28
+ */
+@Service
+public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordService 
+{
+    @Autowired
+    private CheckDifferenceRecordMapper checkDifferenceRecordMapper;
+
+    /**
+     * 查询盘点差异
+     * 
+     * @param checkGuid 盘点差异主键
+     * @return 盘点差异
+     */
+    @Override
+    public CheckDifferenceRecord selectCheckDifferenceRecordByCheckGuid(String checkGuid)
+    {
+        return checkDifferenceRecordMapper.selectCheckDifferenceRecordByCheckGuid(checkGuid);
+    }
+
+    /**
+     * 查询盘点差异列表
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 盘点差异
+     */
+    @Override
+    public List<CheckDifferenceRecord> selectCheckDifferenceRecordList(CheckDifferenceRecord checkDifferenceRecord)
+    {
+        return checkDifferenceRecordMapper.selectCheckDifferenceRecordList(checkDifferenceRecord);
+    }
+
+    /**
+     * 新增盘点差异
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 结果
+     */
+    @Override
+    public int insertCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord)
+    {
+        checkDifferenceRecord.setCreateTime(DateUtils.getNowDate());
+        return checkDifferenceRecordMapper.insertCheckDifferenceRecord(checkDifferenceRecord);
+    }
+
+    /**
+     * 修改盘点差异
+     * 
+     * @param checkDifferenceRecord 盘点差异
+     * @return 结果
+     */
+    @Override
+    public int updateCheckDifferenceRecord(CheckDifferenceRecord checkDifferenceRecord)
+    {
+        return checkDifferenceRecordMapper.updateCheckDifferenceRecord(checkDifferenceRecord);
+    }
+
+    /**
+     * 批量删除盘点差异
+     * 
+     * @param checkGuids 需要删除的盘点差异主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCheckDifferenceRecordByCheckGuids(String[] checkGuids)
+    {
+        return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuids(checkGuids);
+    }
+
+    /**
+     * 删除盘点差异信息
+     * 
+     * @param checkGuid 盘点差异主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCheckDifferenceRecordByCheckGuid(String checkGuid)
+    {
+        return checkDifferenceRecordMapper.deleteCheckDifferenceRecordByCheckGuid(checkGuid);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/controller/InStockinController.java

@@ -1,7 +1,13 @@
 package com.ruoyi.in.stockin.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
+import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +39,8 @@ public class InStockinController extends BaseController
 {
     @Autowired
     private IInStockinService inStockinService;
+    @Autowired
+    private IInStockinFinishService inStockinFinishService;
 
     /**
      * 查询入库单据列表
@@ -42,7 +50,12 @@ public class InStockinController extends BaseController
     public TableDataInfo list(InStockin inStockin)
     {
         startPage();
-        List<InStockin> list = inStockinService.selectInStockinList(inStockin);
+        List<InStockin> list = new ArrayList<>();
+        if (Convert.toInt(inStockin.getStatus())<4){
+            list = inStockinService.selectInStockinList(inStockin);
+        }else {
+            list = inStockinFinishService.selectInStockinFinishListByInStockin(inStockin);
+        }
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 入库单据对象 in_stockin
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
@@ -31,8 +31,10 @@ public class InStockin extends BaseEntity
     private String createDate;
 
     /** 创建人 */
-    @Excel(name = "创建人")
+
     private String createManId;
+    @Excel(name = "创建人")
+    private String createManName;
 
     /** 单据状态 */
     @Excel(name = "单据状态")
@@ -41,6 +43,8 @@ public class InStockin extends BaseEntity
     /** 仓库ID */
     @Excel(name = "仓库ID")
     private String warehouseId;
+    @Excel(name = "仓库")
+    private String warehouseName;
 
     /**  完成日期 */
     @Excel(name = " 完成日期")
@@ -57,6 +61,8 @@ public class InStockin extends BaseEntity
     /** 部门编码 */
     @Excel(name = "部门编码")
     private String departmentNo;
+    @Excel(name = "部门")
+    private String departmentName;
 
     /** 客户编码 */
     @Excel(name = "客户编码")
@@ -69,6 +75,8 @@ public class InStockin extends BaseEntity
     /** 供应商编码 */
     @Excel(name = "供应商编码")
     private String supplierNo;
+    @Excel(name = "供应商")
+    private String supplierName;
 
     /** 备用字段1 */
     @Excel(name = "备用字段1")
@@ -90,192 +98,224 @@ public class InStockin extends BaseEntity
     @Excel(name = "备用字段5")
     private String spare5;
 
-    public void setStockinGuid(String stockinGuid) 
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public void setStockinGuid(String stockinGuid)
     {
         this.stockinGuid = stockinGuid;
     }
 
-    public String getStockinGuid() 
+    public String getStockinGuid()
     {
         return stockinGuid;
     }
 
-    public void setStockinId(String stockinId) 
+    public void setStockinId(String stockinId)
     {
         this.stockinId = stockinId;
     }
 
-    public String getStockinId() 
+    public String getStockinId()
     {
         return stockinId;
     }
 
-    public void setInType(String inType) 
+    public void setInType(String inType)
     {
         this.inType = inType;
     }
 
-    public String getInType() 
+    public String getInType()
     {
         return inType;
     }
 
-    public void setCreateDate(String createDate) 
+    public void setCreateDate(String createDate)
     {
         this.createDate = createDate;
     }
 
-    public String getCreateDate() 
+    public String getCreateDate()
     {
         return createDate;
     }
 
-    public void setCreateManId(String createManId) 
+    public void setCreateManId(String createManId)
     {
         this.createManId = createManId;
     }
 
-    public String getCreateManId() 
+    public String getCreateManId()
     {
         return createManId;
     }
 
-    public void setStatus(String status) 
+    public void setStatus(String status)
     {
         this.status = status;
     }
 
-    public String getStatus() 
+    public String getStatus()
     {
         return status;
     }
 
-    public void setWarehouseId(String warehouseId) 
+    public void setWarehouseId(String warehouseId)
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId() 
+    public String getWarehouseId()
     {
         return warehouseId;
     }
 
-    public void setFinishDate(String finishDate) 
+    public void setFinishDate(String finishDate)
     {
         this.finishDate = finishDate;
     }
 
-    public String getFinishDate() 
+    public String getFinishDate()
     {
         return finishDate;
     }
 
-    public void setErpBill(String erpBill) 
+    public void setErpBill(String erpBill)
     {
         this.erpBill = erpBill;
     }
 
-    public String getErpBill() 
+    public String getErpBill()
     {
         return erpBill;
     }
 
-    public void setStockSource(String stockSource) 
+    public void setStockSource(String stockSource)
     {
         this.stockSource = stockSource;
     }
 
-    public String getStockSource() 
+    public String getStockSource()
     {
         return stockSource;
     }
 
-    public void setDepartmentNo(String departmentNo) 
+    public void setDepartmentNo(String departmentNo)
     {
         this.departmentNo = departmentNo;
     }
 
-    public String getDepartmentNo() 
+    public String getDepartmentNo()
     {
         return departmentNo;
     }
 
-    public void setCustomerNo(String customerNo) 
+    public void setCustomerNo(String customerNo)
     {
         this.customerNo = customerNo;
     }
 
-    public String getCustomerNo() 
+    public String getCustomerNo()
     {
         return customerNo;
     }
 
-    public void setClassNo(String classNo) 
+    public void setClassNo(String classNo)
     {
         this.classNo = classNo;
     }
 
-    public String getClassNo() 
+    public String getClassNo()
     {
         return classNo;
     }
 
-    public void setSupplierNo(String supplierNo) 
+    public void setSupplierNo(String supplierNo)
     {
         this.supplierNo = supplierNo;
     }
 
-    public String getSupplierNo() 
+    public String getSupplierNo()
     {
         return supplierNo;
     }
 
-    public void setSpare1(String spare1) 
+    public void setSpare1(String spare1)
     {
         this.spare1 = spare1;
     }
 
-    public String getSpare1() 
+    public String getSpare1()
     {
         return spare1;
     }
 
-    public void setSpare2(String spare2) 
+    public void setSpare2(String spare2)
     {
         this.spare2 = spare2;
     }
 
-    public String getSpare2() 
+    public String getSpare2()
     {
         return spare2;
     }
 
-    public void setSpare4(String spare4) 
+    public void setSpare4(String spare4)
     {
         this.spare4 = spare4;
     }
 
-    public String getSpare4() 
+    public String getSpare4()
     {
         return spare4;
     }
 
-    public void setSpare3(String spare3) 
+    public void setSpare3(String spare3)
     {
         this.spare3 = spare3;
     }
 
-    public String getSpare3() 
+    public String getSpare3()
     {
         return spare3;
     }
 
-    public void setSpare5(String spare5) 
+    public void setSpare5(String spare5)
     {
         this.spare5 = spare5;
     }
 
-    public String getSpare5() 
+    public String getSpare5()
     {
         return spare5;
     }

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.in.stockin.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 
 import cn.hutool.core.collection.CollUtil;

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/controller/InStockinDetailController.java

@@ -1,17 +1,15 @@
 package com.ruoyi.in.stockindetail.controller;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import javax.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.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 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;
@@ -23,7 +21,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 入库单据子表Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-20
  */
@@ -33,6 +31,8 @@ public class InStockinDetailController extends BaseController
 {
     @Autowired
     private IInStockinDetailService inStockinDetailService;
+    @Autowired
+    private IInStockinDetailFinishService inStockinDetailFinishService;
 
     /**
      * 查询入库单据子表列表
@@ -42,7 +42,12 @@ public class InStockinDetailController extends BaseController
     public TableDataInfo list(InStockinDetail inStockinDetail)
     {
         startPage();
-        List<InStockinDetail> list = inStockinDetailService.selectInStockinDetailList(inStockinDetail);
+        List<InStockinDetail> list = new ArrayList<>();
+        if (Convert.toInt(inStockinDetail.getStatus())<4){
+            list = inStockinDetailService.selectInStockinDetailList(inStockinDetail);
+        }else {
+            list = inStockinDetailFinishService.selectInStockinDetailList(inStockinDetail);
+        }
         return getDataTable(list);
     }
 
@@ -101,4 +106,16 @@ public class InStockinDetailController extends BaseController
     {
         return toAjax(inStockinDetailService.deleteInStockinDetailByStockinDetailIds(stockinDetailIds));
     }
+
+    /**
+     * 打印条码
+     * @param param
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('in:stockIn:barcodePrinting')")
+    @Log(title = "入库单据", businessType = BusinessType.INSERT)
+    @PostMapping("barcodePrinting")
+    public AjaxResult barcodePrinting(@RequestBody Map<String,Object> param) {
+        return toAjax(inStockinDetailService.barcodePrinting(param));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java

@@ -133,4 +133,6 @@ public class InStockinDetail extends BaseEntity
     @Excel(name = "备用字段6")
     private String spare6;
 
+    private String status;
+
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.in.stockindetail.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
@@ -74,4 +75,6 @@ public interface IInStockinDetailService
     void insertInStockinDetailHistory(InStockin inStockin);
 
     void deleteInStockinDetailByStockinGuid(String stockinGuid);
+
+    int barcodePrinting(Map<String,Object> stockinDetailId);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.in.stockindetail.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.in.stockin.domain.InStockin;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,4 +109,10 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
     public void deleteInStockinDetailByStockinGuid(String stockinGuid) {
         inStockinDetailMapper.deleteInStockinDetailByStockinGuid(stockinGuid);
     }
+
+    @Override
+    public int barcodePrinting(Map<String,Object> map) {
+        System.out.println(map);
+        return 0;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/mapper/InStockinDetailFinishMapper.java

@@ -1,19 +1,21 @@
 package com.ruoyi.in.stockindetailfinish.mapper;
 
 import java.util.List;
+
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
 
 /**
  * 历史入库单据子信息Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface InStockinDetailFinishMapper 
+public interface InStockinDetailFinishMapper
 {
     /**
      * 查询历史入库单据子信息
-     * 
+     *
      * @param stockinDetailId 历史入库单据子信息主键
      * @return 历史入库单据子信息
      */
@@ -21,7 +23,7 @@ public interface InStockinDetailFinishMapper
 
     /**
      * 查询历史入库单据子信息列表
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 历史入库单据子信息集合
      */
@@ -29,7 +31,7 @@ public interface InStockinDetailFinishMapper
 
     /**
      * 新增历史入库单据子信息
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface InStockinDetailFinishMapper
 
     /**
      * 修改历史入库单据子信息
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface InStockinDetailFinishMapper
 
     /**
      * 删除历史入库单据子信息
-     * 
+     *
      * @param stockinDetailId 历史入库单据子信息主键
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface InStockinDetailFinishMapper
 
     /**
      * 批量删除历史入库单据子信息
-     * 
+     *
      * @param stockinDetailIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteInStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
+
+    List<InStockinDetail> selectInStockinDetailFinishListByInStockinDetail(InStockinDetail inStockinDetail);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/IInStockinDetailFinishService.java

@@ -1,19 +1,21 @@
 package com.ruoyi.in.stockindetailfinish.service;
 
 import java.util.List;
+
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetailfinish.domain.InStockinDetailFinish;
 
 /**
  * 历史入库单据子信息Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface IInStockinDetailFinishService 
+public interface IInStockinDetailFinishService
 {
     /**
      * 查询历史入库单据子信息
-     * 
+     *
      * @param stockinDetailId 历史入库单据子信息主键
      * @return 历史入库单据子信息
      */
@@ -21,7 +23,7 @@ public interface IInStockinDetailFinishService
 
     /**
      * 查询历史入库单据子信息列表
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 历史入库单据子信息集合
      */
@@ -29,7 +31,7 @@ public interface IInStockinDetailFinishService
 
     /**
      * 新增历史入库单据子信息
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IInStockinDetailFinishService
 
     /**
      * 修改历史入库单据子信息
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IInStockinDetailFinishService
 
     /**
      * 批量删除历史入库单据子信息
-     * 
+     *
      * @param stockinDetailIds 需要删除的历史入库单据子信息主键集合
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface IInStockinDetailFinishService
 
     /**
      * 删除历史入库单据子信息信息
-     * 
+     *
      * @param stockinDetailId 历史入库单据子信息主键
      * @return 结果
      */
     public int deleteInStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/service/impl/InStockinDetailFinishServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.in.stockindetailfinish.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.in.stockindetailfinish.mapper.InStockinDetailFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.in.stockindetailfinish.service.IInStockinDetailFinishService;
 
 /**
  * 历史入库单据子信息Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
 @Service
-public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService 
+public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishService
 {
     @Autowired
     private InStockinDetailFinishMapper inStockinDetailFinishMapper;
 
     /**
      * 查询历史入库单据子信息
-     * 
+     *
      * @param stockinDetailId 历史入库单据子信息主键
      * @return 历史入库单据子信息
      */
@@ -33,7 +35,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
 
     /**
      * 查询历史入库单据子信息列表
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 历史入库单据子信息
      */
@@ -45,7 +47,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
 
     /**
      * 新增历史入库单据子信息
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 结果
      */
@@ -57,7 +59,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
 
     /**
      * 修改历史入库单据子信息
-     * 
+     *
      * @param inStockinDetailFinish 历史入库单据子信息
      * @return 结果
      */
@@ -69,7 +71,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
 
     /**
      * 批量删除历史入库单据子信息
-     * 
+     *
      * @param stockinDetailIds 需要删除的历史入库单据子信息主键
      * @return 结果
      */
@@ -81,7 +83,7 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
 
     /**
      * 删除历史入库单据子信息信息
-     * 
+     *
      * @param stockinDetailId 历史入库单据子信息主键
      * @return 结果
      */
@@ -90,4 +92,9 @@ public class InStockinDetailFinishServiceImpl implements IInStockinDetailFinishS
     {
         return inStockinDetailFinishMapper.deleteInStockinDetailFinishByStockinDetailId(stockinDetailId);
     }
+
+    @Override
+    public List<InStockinDetail> selectInStockinDetailList(InStockinDetail inStockinDetail) {
+        return inStockinDetailFinishMapper.selectInStockinDetailFinishListByInStockinDetail(inStockinDetail);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java

@@ -1,19 +1,21 @@
 package com.ruoyi.in.stockinfinish.mapper;
 
 import java.util.List;
+
+import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
 
 /**
  * 历史入库单据主信息Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface InStockinFinishMapper 
+public interface InStockinFinishMapper
 {
     /**
      * 查询历史入库单据主信息
-     * 
+     *
      * @param stockinGuid 历史入库单据主信息主键
      * @return 历史入库单据主信息
      */
@@ -21,7 +23,7 @@ public interface InStockinFinishMapper
 
     /**
      * 查询历史入库单据主信息列表
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 历史入库单据主信息集合
      */
@@ -29,7 +31,7 @@ public interface InStockinFinishMapper
 
     /**
      * 新增历史入库单据主信息
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface InStockinFinishMapper
 
     /**
      * 修改历史入库单据主信息
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface InStockinFinishMapper
 
     /**
      * 删除历史入库单据主信息
-     * 
+     *
      * @param stockinGuid 历史入库单据主信息主键
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface InStockinFinishMapper
 
     /**
      * 批量删除历史入库单据主信息
-     * 
+     *
      * @param stockinGuids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteInStockinFinishByStockinGuids(String[] stockinGuids);
+
+    List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java

@@ -1,19 +1,21 @@
 package com.ruoyi.in.stockinfinish.service;
 
 import java.util.List;
+
+import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
 
 /**
  * 历史入库单据主信息Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface IInStockinFinishService 
+public interface IInStockinFinishService
 {
     /**
      * 查询历史入库单据主信息
-     * 
+     *
      * @param stockinGuid 历史入库单据主信息主键
      * @return 历史入库单据主信息
      */
@@ -21,7 +23,7 @@ public interface IInStockinFinishService
 
     /**
      * 查询历史入库单据主信息列表
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 历史入库单据主信息集合
      */
@@ -29,7 +31,7 @@ public interface IInStockinFinishService
 
     /**
      * 新增历史入库单据主信息
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IInStockinFinishService
 
     /**
      * 修改历史入库单据主信息
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IInStockinFinishService
 
     /**
      * 批量删除历史入库单据主信息
-     * 
+     *
      * @param stockinGuids 需要删除的历史入库单据主信息主键集合
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface IInStockinFinishService
 
     /**
      * 删除历史入库单据主信息信息
-     * 
+     *
      * @param stockinGuid 历史入库单据主信息主键
      * @return 结果
      */
     public int deleteInStockinFinishByStockinGuid(String stockinGuid);
+
+    List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin);
 }

ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.in.stockinfinish.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.in.stockin.domain.InStockin;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.in.stockinfinish.mapper.InStockinFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
 
 /**
  * 历史入库单据主信息Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
 @Service
-public class InStockinFinishServiceImpl implements IInStockinFinishService 
+public class InStockinFinishServiceImpl implements IInStockinFinishService
 {
     @Autowired
     private InStockinFinishMapper inStockinFinishMapper;
 
     /**
      * 查询历史入库单据主信息
-     * 
+     *
      * @param stockinGuid 历史入库单据主信息主键
      * @return 历史入库单据主信息
      */
@@ -33,7 +35,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
 
     /**
      * 查询历史入库单据主信息列表
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 历史入库单据主信息
      */
@@ -45,7 +47,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
 
     /**
      * 新增历史入库单据主信息
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 结果
      */
@@ -57,7 +59,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
 
     /**
      * 修改历史入库单据主信息
-     * 
+     *
      * @param inStockinFinish 历史入库单据主信息
      * @return 结果
      */
@@ -69,7 +71,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
 
     /**
      * 批量删除历史入库单据主信息
-     * 
+     *
      * @param stockinGuids 需要删除的历史入库单据主信息主键
      * @return 结果
      */
@@ -81,7 +83,7 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
 
     /**
      * 删除历史入库单据主信息信息
-     * 
+     *
      * @param stockinGuid 历史入库单据主信息主键
      * @return 结果
      */
@@ -90,4 +92,9 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
     {
         return inStockinFinishMapper.deleteInStockinFinishByStockinGuid(stockinGuid);
     }
+
+    @Override
+    public List<InStockin> selectInStockinFinishListByInStockin(InStockin inStockin) {
+        return inStockinFinishMapper.selectInStockinFinishListByInStockin(inStockin);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java

@@ -46,6 +46,8 @@ public class MydoJob
     /** 部门ID */
     @Excel(name = "部门ID")
     private String departmentId;
+    @Excel(name = "部门")
+    private String departmentName;
 
     /** 托盘码 */
     @Excel(name = "托盘码")

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/controller/ReceiveStockinController.java

@@ -1,15 +1,18 @@
 package com.ruoyi.receive.stockin.controller;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveProductVo;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveStockVo;
+import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -36,6 +39,8 @@ public class ReceiveStockinController extends BaseController
 {
     @Autowired
     private IReceiveStockinService receiveStockinService;
+    @Autowired
+    private IReceiveStockinFinishService receiveStockinFinishService;
 
     /**
      * 查询收货单据列表
@@ -45,7 +50,13 @@ public class ReceiveStockinController extends BaseController
     public TableDataInfo list(ReceiveStockin receiveStockin)
     {
         startPage();
-        List<ReceiveStockin> list = receiveStockinService.selectReceiveStockinList(receiveStockin);
+        List<ReceiveStockin> list = new ArrayList<>() ;
+        if (Convert.toInt(receiveStockin.getStatus())<1){
+            list = receiveStockinService.selectReceiveStockinList(receiveStockin);
+        }else {
+            list = receiveStockinFinishService.selectReceiveStockinList(receiveStockin);
+        }
+
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/domain/ReceiveStockin.java

@@ -37,6 +37,8 @@ public class ReceiveStockin extends BaseEntity
     /** 创建人 */
     @Excel(name = "创建人")
     private String createManId;
+    @Excel(name = "创建人")
+    private String createManName;
 
     /** 单据状态 */
     @Excel(name = "单据状态")
@@ -45,6 +47,8 @@ public class ReceiveStockin extends BaseEntity
     /** 仓库ID */
     @Excel(name = "仓库ID")
     private String warehouseId;
+    @Excel(name = "仓库名称")
+    private String warehouseName;
 
     /** 备用字段5 */
     @Excel(name = "备用字段5")
@@ -81,6 +85,8 @@ public class ReceiveStockin extends BaseEntity
     /** 部门编码 */
     @Excel(name = "部门编码")
     private String departmentNo;
+    @Excel(name = "部门")
+    private String departmentName;
 
     /** 客户编码 */
     @Excel(name = "客户编码")
@@ -93,7 +99,40 @@ public class ReceiveStockin extends BaseEntity
     /** 供应商编码 */
     @Excel(name = "供应商编码")
     private String supplierNo;
+    @Excel(name = "供应商名称")
+    private String supplierName;
 
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName;
+    }
+
+    public String getWarehouseName() {
+        return warehouseName;
+    }
+
+    public void setWarehouseName(String warehouseName) {
+        this.warehouseName = warehouseName;
+    }
 
     public void setStockinGuid(String stockinGuid)
     {

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java

@@ -102,6 +102,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
         receiveStockin.setStockSource("1");
         //receiveStockin.setSpare1(receiveStockVo.getBatchId());
         receiveStockin.setCreateManId(Convert.toStr(SecurityUtils.getUserId()));
+        receiveStockin.setDepartmentNo(Convert.toStr(SecurityUtils.getDeptId()));
         receiveStockin.setStockinId(iBasJobIdService.getJobId("RED"));
         receiveStockin.setStatus("0");
         receiveStockinMapper.insertReceiveStockin(receiveStockin);

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/controller/ReceiveStockinDetailController.java

@@ -1,9 +1,12 @@
 package com.ruoyi.receive.stockindetail.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.receive.stockin.domain.vo.ReceiveStockQualityInsVo;
+import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinishService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +38,8 @@ public class ReceiveStockinDetailController extends BaseController
 {
     @Autowired
     private IReceiveStockinDetailService receiveStockinDetailService;
+    @Autowired
+    private IReceiveStockinDetailFinishService receiveStockinDetailFinishService;
 
     /**
      * 查询收货单据子单列表
@@ -44,7 +49,12 @@ public class ReceiveStockinDetailController extends BaseController
     public TableDataInfo list(ReceiveStockinDetail receiveStockinDetail)
     {
         startPage();
-        List<ReceiveStockinDetail> list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail);
+        List<ReceiveStockinDetail> list = new ArrayList<>();
+        if (Convert.toInt(receiveStockinDetail.getStatus())<1){
+            list = receiveStockinDetailService.selectReceiveStockinDetailList(receiveStockinDetail);
+        }else {
+            list =receiveStockinDetailFinishService.selectReceiveStockinDetailList(receiveStockinDetail);
+        }
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/domain/ReceiveStockinDetail.java

@@ -126,5 +126,5 @@ public class ReceiveStockinDetail extends BaseEntity
     @Excel(name = "备用字段6")
     private String spare6;
 
-
+    private String status;
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/mapper/ReceiveStockinDetailFinishMapper.java

@@ -1,19 +1,21 @@
 package com.ruoyi.receive.stockindetailfinish.mapper;
 
 import java.util.List;
+
+import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
 import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
 
 /**
  * 历史接收单据子信息Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface ReceiveStockinDetailFinishMapper 
+public interface ReceiveStockinDetailFinishMapper
 {
     /**
      * 查询历史接收单据子信息
-     * 
+     *
      * @param stockinDetailId 历史接收单据子信息主键
      * @return 历史接收单据子信息
      */
@@ -21,7 +23,7 @@ public interface ReceiveStockinDetailFinishMapper
 
     /**
      * 查询历史接收单据子信息列表
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 历史接收单据子信息集合
      */
@@ -29,7 +31,7 @@ public interface ReceiveStockinDetailFinishMapper
 
     /**
      * 新增历史接收单据子信息
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface ReceiveStockinDetailFinishMapper
 
     /**
      * 修改历史接收单据子信息
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface ReceiveStockinDetailFinishMapper
 
     /**
      * 删除历史接收单据子信息
-     * 
+     *
      * @param stockinDetailId 历史接收单据子信息主键
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface ReceiveStockinDetailFinishMapper
 
     /**
      * 批量删除历史接收单据子信息
-     * 
+     *
      * @param stockinDetailIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteReceiveStockinDetailFinishByStockinDetailIds(String[] stockinDetailIds);
+
+    List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/IReceiveStockinDetailFinishService.java

@@ -1,19 +1,21 @@
 package com.ruoyi.receive.stockindetailfinish.service;
 
 import java.util.List;
+
+import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
 import com.ruoyi.receive.stockindetailfinish.domain.ReceiveStockinDetailFinish;
 
 /**
  * 历史接收单据子信息Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface IReceiveStockinDetailFinishService 
+public interface IReceiveStockinDetailFinishService
 {
     /**
      * 查询历史接收单据子信息
-     * 
+     *
      * @param stockinDetailId 历史接收单据子信息主键
      * @return 历史接收单据子信息
      */
@@ -21,7 +23,7 @@ public interface IReceiveStockinDetailFinishService
 
     /**
      * 查询历史接收单据子信息列表
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 历史接收单据子信息集合
      */
@@ -29,7 +31,7 @@ public interface IReceiveStockinDetailFinishService
 
     /**
      * 新增历史接收单据子信息
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IReceiveStockinDetailFinishService
 
     /**
      * 修改历史接收单据子信息
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IReceiveStockinDetailFinishService
 
     /**
      * 批量删除历史接收单据子信息
-     * 
+     *
      * @param stockinDetailIds 需要删除的历史接收单据子信息主键集合
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface IReceiveStockinDetailFinishService
 
     /**
      * 删除历史接收单据子信息信息
-     * 
+     *
      * @param stockinDetailId 历史接收单据子信息主键
      * @return 结果
      */
     public int deleteReceiveStockinDetailFinishByStockinDetailId(String stockinDetailId);
+
+    List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail);
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetailfinish/service/impl/ReceiveStockinDetailFinishServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.receive.stockindetailfinish.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.receive.stockindetail.domain.ReceiveStockinDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.receive.stockindetailfinish.mapper.ReceiveStockinDetailFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.receive.stockindetailfinish.service.IReceiveStockinDetailFinish
 
 /**
  * 历史接收单据子信息Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
 @Service
-public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService 
+public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDetailFinishService
 {
     @Autowired
     private ReceiveStockinDetailFinishMapper receiveStockinDetailFinishMapper;
 
     /**
      * 查询历史接收单据子信息
-     * 
+     *
      * @param stockinDetailId 历史接收单据子信息主键
      * @return 历史接收单据子信息
      */
@@ -33,7 +35,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
 
     /**
      * 查询历史接收单据子信息列表
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 历史接收单据子信息
      */
@@ -45,7 +47,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
 
     /**
      * 新增历史接收单据子信息
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 结果
      */
@@ -57,7 +59,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
 
     /**
      * 修改历史接收单据子信息
-     * 
+     *
      * @param receiveStockinDetailFinish 历史接收单据子信息
      * @return 结果
      */
@@ -69,7 +71,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
 
     /**
      * 批量删除历史接收单据子信息
-     * 
+     *
      * @param stockinDetailIds 需要删除的历史接收单据子信息主键
      * @return 结果
      */
@@ -81,7 +83,7 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
 
     /**
      * 删除历史接收单据子信息信息
-     * 
+     *
      * @param stockinDetailId 历史接收单据子信息主键
      * @return 结果
      */
@@ -90,4 +92,9 @@ public class ReceiveStockinDetailFinishServiceImpl implements IReceiveStockinDet
     {
         return receiveStockinDetailFinishMapper.deleteReceiveStockinDetailFinishByStockinDetailId(stockinDetailId);
     }
+
+    @Override
+    public List<ReceiveStockinDetail> selectReceiveStockinDetailList(ReceiveStockinDetail receiveStockinDetail) {
+        return receiveStockinDetailFinishMapper.selectReceiveStockinDetailList(receiveStockinDetail);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/mapper/ReceiveStockinFinishMapper.java

@@ -1,19 +1,21 @@
 package com.ruoyi.receive.stockinfinish.mapper;
 
 import java.util.List;
+
+import com.ruoyi.receive.stockin.domain.ReceiveStockin;
 import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
 
 /**
  * 历史接收单据主信息Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface ReceiveStockinFinishMapper 
+public interface ReceiveStockinFinishMapper
 {
     /**
      * 查询历史接收单据主信息
-     * 
+     *
      * @param stockinGuid 历史接收单据主信息主键
      * @return 历史接收单据主信息
      */
@@ -21,7 +23,7 @@ public interface ReceiveStockinFinishMapper
 
     /**
      * 查询历史接收单据主信息列表
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 历史接收单据主信息集合
      */
@@ -29,7 +31,7 @@ public interface ReceiveStockinFinishMapper
 
     /**
      * 新增历史接收单据主信息
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface ReceiveStockinFinishMapper
 
     /**
      * 修改历史接收单据主信息
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface ReceiveStockinFinishMapper
 
     /**
      * 删除历史接收单据主信息
-     * 
+     *
      * @param stockinGuid 历史接收单据主信息主键
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface ReceiveStockinFinishMapper
 
     /**
      * 批量删除历史接收单据主信息
-     * 
+     *
      * @param stockinGuids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteReceiveStockinFinishByStockinGuids(String[] stockinGuids);
+
+    List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/IReceiveStockinFinishService.java

@@ -1,19 +1,21 @@
 package com.ruoyi.receive.stockinfinish.service;
 
 import java.util.List;
+
+import com.ruoyi.receive.stockin.domain.ReceiveStockin;
 import com.ruoyi.receive.stockinfinish.domain.ReceiveStockinFinish;
 
 /**
  * 历史接收单据主信息Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
-public interface IReceiveStockinFinishService 
+public interface IReceiveStockinFinishService
 {
     /**
      * 查询历史接收单据主信息
-     * 
+     *
      * @param stockinGuid 历史接收单据主信息主键
      * @return 历史接收单据主信息
      */
@@ -21,7 +23,7 @@ public interface IReceiveStockinFinishService
 
     /**
      * 查询历史接收单据主信息列表
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 历史接收单据主信息集合
      */
@@ -29,7 +31,7 @@ public interface IReceiveStockinFinishService
 
     /**
      * 新增历史接收单据主信息
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 结果
      */
@@ -37,7 +39,7 @@ public interface IReceiveStockinFinishService
 
     /**
      * 修改历史接收单据主信息
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 结果
      */
@@ -45,7 +47,7 @@ public interface IReceiveStockinFinishService
 
     /**
      * 批量删除历史接收单据主信息
-     * 
+     *
      * @param stockinGuids 需要删除的历史接收单据主信息主键集合
      * @return 结果
      */
@@ -53,9 +55,11 @@ public interface IReceiveStockinFinishService
 
     /**
      * 删除历史接收单据主信息信息
-     * 
+     *
      * @param stockinGuid 历史接收单据主信息主键
      * @return 结果
      */
     public int deleteReceiveStockinFinishByStockinGuid(String stockinGuid);
+
+    List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin);
 }

ruoyi-admin/src/main/java/com/ruoyi/receive/stockinfinish/service/impl/ReceiveStockinFinishServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.receive.stockinfinish.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.receive.stockin.domain.ReceiveStockin;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.receive.stockinfinish.mapper.ReceiveStockinFinishMapper;
@@ -9,19 +11,19 @@ import com.ruoyi.receive.stockinfinish.service.IReceiveStockinFinishService;
 
 /**
  * 历史接收单据主信息Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-28
  */
 @Service
-public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService 
+public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishService
 {
     @Autowired
     private ReceiveStockinFinishMapper receiveStockinFinishMapper;
 
     /**
      * 查询历史接收单据主信息
-     * 
+     *
      * @param stockinGuid 历史接收单据主信息主键
      * @return 历史接收单据主信息
      */
@@ -33,7 +35,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
 
     /**
      * 查询历史接收单据主信息列表
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 历史接收单据主信息
      */
@@ -45,7 +47,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
 
     /**
      * 新增历史接收单据主信息
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 结果
      */
@@ -57,7 +59,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
 
     /**
      * 修改历史接收单据主信息
-     * 
+     *
      * @param receiveStockinFinish 历史接收单据主信息
      * @return 结果
      */
@@ -69,7 +71,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
 
     /**
      * 批量删除历史接收单据主信息
-     * 
+     *
      * @param stockinGuids 需要删除的历史接收单据主信息主键
      * @return 结果
      */
@@ -81,7 +83,7 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
 
     /**
      * 删除历史接收单据主信息信息
-     * 
+     *
      * @param stockinGuid 历史接收单据主信息主键
      * @return 结果
      */
@@ -90,4 +92,9 @@ public class ReceiveStockinFinishServiceImpl implements IReceiveStockinFinishSer
     {
         return receiveStockinFinishMapper.deleteReceiveStockinFinishByStockinGuid(stockinGuid);
     }
+
+    @Override
+    public List<ReceiveStockin> selectReceiveStockinList(ReceiveStockin receiveStockin) {
+        return receiveStockinFinishMapper.selectReceiveStockinList(receiveStockin);
+    }
 }