[feat]采购管理

按照新版prd
新增采购入库单purchase_storage
新增采购订单实体类
新增采购入库单Controller
新增采购入库单Mapper
新增采购入库单Mapper.XML
新增采购入库单Service接口
新增采购入库单ServiceImpl实现类
按照新版prd
新增采购入库单子表purchase_storage_child
新增采购入库单子表实体类
新增采购入库单子表Mapper
新增采购入库单子表Mapper.XML
新增采购入库单子表Service接口
新增采购入库单子表ServiceImpl实现类

ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseStorageController.java

@@ -0,0 +1,151 @@
+package com.ruoyi.purchase.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.purchase.domain.PurchaseStorage;
+import com.ruoyi.purchase.service.IPurchaseStorageService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 采购入库单Controller
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+@Controller
+@RequestMapping("/purchase/purchaseStorage")
+public class PurchaseStorageController extends BaseController
+{
+    private String prefix = "purchase/purchaseStorage";
+
+    @Autowired
+    private IPurchaseStorageService purchaseStorageService;
+
+    @RequiresPermissions("purchase:purchaseStorage:view")
+    @GetMapping()
+    public String purchaseStorage()
+    {
+        return prefix + "/purchaseStorage";
+    }
+
+    /**
+     * 查询采购入库单列表
+     */
+    @RequiresPermissions("purchase:purchaseStorage:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(PurchaseStorage purchaseStorage)
+    {
+        startPage();
+        List<PurchaseStorage> list = purchaseStorageService.selectPurchaseStorageList(purchaseStorage);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出采购入库单列表
+     */
+    @RequiresPermissions("purchase:purchaseStorage:export")
+    @Log(title = "采购入库单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(PurchaseStorage purchaseStorage)
+    {
+        List<PurchaseStorage> list = purchaseStorageService.selectPurchaseStorageList(purchaseStorage);
+        ExcelUtil<PurchaseStorage> util = new ExcelUtil<PurchaseStorage>(PurchaseStorage.class);
+        return util.exportExcel(list, "采购入库单数据");
+    }
+
+    /**
+     * 新增采购入库单
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存采购入库单
+     */
+    @RequiresPermissions("purchase:purchaseStorage:add")
+    @Log(title = "采购入库单", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(PurchaseStorage purchaseStorage)
+    {
+        return toAjax(purchaseStorageService.insertPurchaseStorage(purchaseStorage));
+    }
+
+    /**
+     * 修改采购入库单
+     */
+    @GetMapping("/edit/{purchaseStorageId}")
+    public String edit(@PathVariable("purchaseStorageId") Long purchaseStorageId, ModelMap mmap)
+    {
+        PurchaseStorage purchaseStorage = purchaseStorageService.selectPurchaseStorageById(purchaseStorageId);
+        mmap.put("purchaseStorage", purchaseStorage);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存采购入库单
+     */
+    @RequiresPermissions("purchase:purchaseStorage:edit")
+    @Log(title = "采购入库单", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(PurchaseStorage purchaseStorage)
+    {
+        return toAjax(purchaseStorageService.updatePurchaseStorage(purchaseStorage));
+    }
+
+    /**
+     * 删除采购入库单
+     */
+    @RequiresPermissions("purchase:purchaseStorage:remove")
+    @Log(title = "采购入库单", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(purchaseStorageService.deletePurchaseStorageByIds(ids));
+    }
+
+    /**
+     * 作废采购入库单
+     */
+    @RequiresPermissions("purchase:purchaseStorage:cancel")
+    @Log(title = "采购入库单", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(purchaseStorageService.cancelPurchaseStorageById(id));
+    }
+
+    /**
+     * 恢复采购入库单
+     */
+    @RequiresPermissions("purchase:purchaseStorage:restore")
+    @Log(title = "采购入库单", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(purchaseStorageService.restorePurchaseStorageById(id));
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseStorage.java

@@ -0,0 +1,384 @@
+package com.ruoyi.purchase.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 采购入库单对象 purchase_storage
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+public class PurchaseStorage extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 采购入库单id */
+    private Long purchaseStorageId;
+
+    /** 入库单号 */
+    @Excel(name = "入库单号")
+    private String warehouseStorageCode;
+
+    /** 关联订单号（多种订单类型） */
+    @Excel(name = "关联订单号")
+    private String relatedOrderCode;
+
+    /** 入库状态(0待暂收、1已暂收、2待入库、3部分入库、4全部入库) */
+    @Excel(name = "入库状态",dictType = "warehouse_storage_status")
+    private String warehouseStorageStatus;
+
+    /** 品质状态(0待品质、1部分品质、2全部品质) */
+    @Excel(name = "品质状态",dictType = "warehouse_quality_status")
+    private String warehouseQualityStatus;
+
+    /** 入库类型(0采购入库、1供应商补货、2委内入库、3公司退货、4委外入库、5生产入库) */
+    @Excel(name = "入库类型",dictType ="warehouse_storage_type" )
+    private String warehouseStorageType;
+
+    /** 订单类型（0采购订单、1生产订单、2退换货订单、3委外订单) */
+    @Excel(name = "订单类型",dictType = "storage_order_type")
+    private String warehouseOrderType;
+
+    /** 入库部门类型(0仓库，1采购 ) */
+    @Excel(name = "入库部门类型",dictType = "warehouse_dept_type")
+    private String warehouseDeptType;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private String supplierCode;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 通知已到货数量 */
+    @Excel(name = "通知已到货数量")
+    private Integer notifyArrivedSum;
+
+    /** 实际已到货数量 */
+    @Excel(name = "实际已到货数量")
+    private Integer actualArrivedSum;
+
+    /** 暂收合格数量 */
+    @Excel(name = "暂收合格数量")
+    private Integer temporaryQualifiedSum;
+
+    /** 暂收不合格数量 */
+    @Excel(name = "暂收不合格数量")
+    private Integer temporaryUnqualifiedSum;
+
+    /** 品质合格数量 */
+    @Excel(name = "品质合格数量")
+    private Integer qualityQualifiedSum;
+
+    /** 退换货数 */
+    @Excel(name = "退换货数")
+    private Integer refundsExchangesSum;
+
+    /** 入库数量 */
+    @Excel(name = "入库数量")
+    private Integer storageSum;
+
+    /** 到货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date arrivedTime;
+
+    /** 暂收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "暂收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date temporaryTime;
+
+    /** 交付质检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "交付质检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryInspectionTime;
+
+    /** 品质时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "品质时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date qualityTime;
+
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date storageTime;
+
+    /** 仓库员工 */
+    @Excel(name = "仓库员工")
+    private String warehouseEmployee;
+
+    /** 仓库ID */
+    @Excel(name = "仓库ID")
+    private String warehouseCode;
+
+    /** 仓库名称 */
+    @Excel(name = "仓库名称")
+    private String warehouseName;
+
+    public void setPurchaseStorageId(Long purchaseStorageId) 
+    {
+        this.purchaseStorageId = purchaseStorageId;
+    }
+
+    public Long getPurchaseStorageId() 
+    {
+        return purchaseStorageId;
+    }
+    public void setWarehouseStorageCode(String warehouseStorageCode) 
+    {
+        this.warehouseStorageCode = warehouseStorageCode;
+    }
+
+    public String getWarehouseStorageCode() 
+    {
+        return warehouseStorageCode;
+    }
+    public void setRelatedOrderCode(String relatedOrderCode) 
+    {
+        this.relatedOrderCode = relatedOrderCode;
+    }
+
+    public String getRelatedOrderCode() 
+    {
+        return relatedOrderCode;
+    }
+    public void setWarehouseStorageStatus(String warehouseStorageStatus) 
+    {
+        this.warehouseStorageStatus = warehouseStorageStatus;
+    }
+
+    public String getWarehouseStorageStatus() 
+    {
+        return warehouseStorageStatus;
+    }
+    public void setWarehouseQualityStatus(String warehouseQualityStatus) 
+    {
+        this.warehouseQualityStatus = warehouseQualityStatus;
+    }
+
+    public String getWarehouseQualityStatus() 
+    {
+        return warehouseQualityStatus;
+    }
+    public void setWarehouseStorageType(String warehouseStorageType) 
+    {
+        this.warehouseStorageType = warehouseStorageType;
+    }
+
+    public String getWarehouseStorageType() 
+    {
+        return warehouseStorageType;
+    }
+    public void setWarehouseOrderType(String warehouseOrderType) 
+    {
+        this.warehouseOrderType = warehouseOrderType;
+    }
+
+    public String getWarehouseOrderType() 
+    {
+        return warehouseOrderType;
+    }
+    public void setWarehouseDeptType(String warehouseDeptType) 
+    {
+        this.warehouseDeptType = warehouseDeptType;
+    }
+
+    public String getWarehouseDeptType() 
+    {
+        return warehouseDeptType;
+    }
+    public void setSupplierCode(String supplierCode) 
+    {
+        this.supplierCode = supplierCode;
+    }
+
+    public String getSupplierCode() 
+    {
+        return supplierCode;
+    }
+    public void setSupplierName(String supplierName) 
+    {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierName() 
+    {
+        return supplierName;
+    }
+    public void setNotifyArrivedSum(Integer notifyArrivedSum) 
+    {
+        this.notifyArrivedSum = notifyArrivedSum;
+    }
+
+    public Integer getNotifyArrivedSum() 
+    {
+        return notifyArrivedSum;
+    }
+    public void setActualArrivedSum(Integer actualArrivedSum) 
+    {
+        this.actualArrivedSum = actualArrivedSum;
+    }
+
+    public Integer getActualArrivedSum() 
+    {
+        return actualArrivedSum;
+    }
+    public void setTemporaryQualifiedSum(Integer temporaryQualifiedSum) 
+    {
+        this.temporaryQualifiedSum = temporaryQualifiedSum;
+    }
+
+    public Integer getTemporaryQualifiedSum() 
+    {
+        return temporaryQualifiedSum;
+    }
+    public void setTemporaryUnqualifiedSum(Integer temporaryUnqualifiedSum) 
+    {
+        this.temporaryUnqualifiedSum = temporaryUnqualifiedSum;
+    }
+
+    public Integer getTemporaryUnqualifiedSum() 
+    {
+        return temporaryUnqualifiedSum;
+    }
+    public void setQualityQualifiedSum(Integer qualityQualifiedSum) 
+    {
+        this.qualityQualifiedSum = qualityQualifiedSum;
+    }
+
+    public Integer getQualityQualifiedSum() 
+    {
+        return qualityQualifiedSum;
+    }
+    public void setRefundsExchangesSum(Integer refundsExchangesSum) 
+    {
+        this.refundsExchangesSum = refundsExchangesSum;
+    }
+
+    public Integer getRefundsExchangesSum() 
+    {
+        return refundsExchangesSum;
+    }
+    public void setStorageSum(Integer storageSum) 
+    {
+        this.storageSum = storageSum;
+    }
+
+    public Integer getStorageSum() 
+    {
+        return storageSum;
+    }
+    public void setArrivedTime(Date arrivedTime) 
+    {
+        this.arrivedTime = arrivedTime;
+    }
+
+    public Date getArrivedTime() 
+    {
+        return arrivedTime;
+    }
+    public void setTemporaryTime(Date temporaryTime) 
+    {
+        this.temporaryTime = temporaryTime;
+    }
+
+    public Date getTemporaryTime() 
+    {
+        return temporaryTime;
+    }
+    public void setDeliveryInspectionTime(Date deliveryInspectionTime) 
+    {
+        this.deliveryInspectionTime = deliveryInspectionTime;
+    }
+
+    public Date getDeliveryInspectionTime() 
+    {
+        return deliveryInspectionTime;
+    }
+    public void setQualityTime(Date qualityTime) 
+    {
+        this.qualityTime = qualityTime;
+    }
+
+    public Date getQualityTime() 
+    {
+        return qualityTime;
+    }
+    public void setStorageTime(Date storageTime) 
+    {
+        this.storageTime = storageTime;
+    }
+
+    public Date getStorageTime() 
+    {
+        return storageTime;
+    }
+    public void setWarehouseEmployee(String warehouseEmployee) 
+    {
+        this.warehouseEmployee = warehouseEmployee;
+    }
+
+    public String getWarehouseEmployee() 
+    {
+        return warehouseEmployee;
+    }
+    public void setWarehouseCode(String warehouseCode) 
+    {
+        this.warehouseCode = warehouseCode;
+    }
+
+    public String getWarehouseCode() 
+    {
+        return warehouseCode;
+    }
+    public void setWarehouseName(String warehouseName) 
+    {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getWarehouseName() 
+    {
+        return warehouseName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("purchaseStorageId", getPurchaseStorageId())
+            .append("warehouseStorageCode", getWarehouseStorageCode())
+            .append("relatedOrderCode", getRelatedOrderCode())
+            .append("warehouseStorageStatus", getWarehouseStorageStatus())
+            .append("warehouseQualityStatus", getWarehouseQualityStatus())
+            .append("warehouseStorageType", getWarehouseStorageType())
+            .append("warehouseOrderType", getWarehouseOrderType())
+            .append("warehouseDeptType", getWarehouseDeptType())
+            .append("supplierCode", getSupplierCode())
+            .append("supplierName", getSupplierName())
+            .append("notifyArrivedSum", getNotifyArrivedSum())
+            .append("actualArrivedSum", getActualArrivedSum())
+            .append("temporaryQualifiedSum", getTemporaryQualifiedSum())
+            .append("temporaryUnqualifiedSum", getTemporaryUnqualifiedSum())
+            .append("qualityQualifiedSum", getQualityQualifiedSum())
+            .append("refundsExchangesSum", getRefundsExchangesSum())
+            .append("storageSum", getStorageSum())
+            .append("arrivedTime", getArrivedTime())
+            .append("temporaryTime", getTemporaryTime())
+            .append("deliveryInspectionTime", getDeliveryInspectionTime())
+            .append("qualityTime", getQualityTime())
+            .append("storageTime", getStorageTime())
+            .append("warehouseEmployee", getWarehouseEmployee())
+            .append("warehouseCode", getWarehouseCode())
+            .append("warehouseName", getWarehouseName())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseStorageChild.java

@@ -0,0 +1,511 @@
+package com.ruoyi.purchase.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+
+/**
+ * 采购入库单子表对象 purchase_storage_child
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+public class PurchaseStorageChild extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 采购入库单子表id */
+    private Long purchaseStorageChildId;
+
+    /** 入库单号 */
+    @Excel(name = "入库单号")
+    private String warehouseStorageCode;
+
+    /** 关联订单号（多种订单类型） */
+    @Excel(name = "关联订单号", readConverterExp = "多=种订单类型")
+    private String relatedOrderCode;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private String supplierCode;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    private String materialNo;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 物料类型 */
+    @Excel(name = "物料类型")
+    private String materialType;
+
+    /** 物料图片地址 */
+    @Excel(name = "物料图片地址")
+    private String materialPhotourl;
+
+    /** 物料型号 */
+    @Excel(name = "物料型号")
+    private String materialModel;
+
+    /** 物料品牌 */
+    @Excel(name = "物料品牌")
+    private String materialBrand;
+
+    /** 物料单位 */
+    @Excel(name = "物料单位")
+    private String materialUnit;
+
+    /** 物料描述 */
+    @Excel(name = "物料描述")
+    private String materialDescribe;
+
+    /** 物料加工方式 */
+    @Excel(name = "物料加工方式")
+    private String materialProcessMethod;
+
+    /** 物料入库部门(0仓库，1采购 ) */
+    @Excel(name = "物料入库部门(0仓库，1采购 )")
+    private String materialDeptType;
+
+    /** 生产订单数 */
+    @Excel(name = "生产订单数")
+    private Integer makeTotal;
+
+    /** 通知已到货数量 */
+    @Excel(name = "通知已到货数量")
+    private Integer notifyHasArrivedNum;
+
+    /** 通知到货数量 */
+    @Excel(name = "通知到货数量")
+    private Integer notifyArriveNum;
+
+    /** 实际已到货数量 */
+    @Excel(name = "实际已到货数量")
+    private Integer actualHasArrivedNum;
+
+    /** 实际到货数量 */
+    @Excel(name = "实际到货数量")
+    private Integer actualArriveNum;
+
+    /** 暂收已合格数量 */
+    @Excel(name = "暂收已合格数量")
+    private Integer temporaryHasQualifiedNum;
+
+    /** 暂收合格数量 */
+    @Excel(name = "暂收合格数量")
+    private Integer temporaryQualifiedNum;
+
+    /** 已入库数量 */
+    @Excel(name = "已入库数量")
+    private Integer hasStorageNum;
+
+    /** 入库数量 */
+    @Excel(name = "入库数量")
+    private Integer storageNum;
+
+    /** 生产入库数量 */
+    @Excel(name = "生产入库数量")
+    private Integer makeStorageNum;
+
+    /** 品质已合格数量 */
+    @Excel(name = "品质已合格数量")
+    private Integer qualityHasQualifiedNum;
+
+    /** 品质合格数量 */
+    @Excel(name = "品质合格数量")
+    private Integer qualityQualifiedNum;
+
+    /** 退换货数 */
+    @Excel(name = "退换货数")
+    private Integer refundsExchangesNum;
+
+    /** 委内加工费单价 */
+    @Excel(name = "委内加工费单价")
+    private BigDecimal makeInUnitPrice;
+
+    /** 到货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "到货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date arrivedTime;
+
+    /** 暂收时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "暂收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date temporaryTime;
+
+    /** 交付质检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "交付质检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryInspectionTime;
+
+    /** 品质时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "品质时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date qualityTime;
+
+    /** 入库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date storageTime;
+
+    public void setPurchaseStorageChildId(Long purchaseStorageChildId) 
+    {
+        this.purchaseStorageChildId = purchaseStorageChildId;
+    }
+
+    public Long getPurchaseStorageChildId() 
+    {
+        return purchaseStorageChildId;
+    }
+    public void setWarehouseStorageCode(String warehouseStorageCode) 
+    {
+        this.warehouseStorageCode = warehouseStorageCode;
+    }
+
+    public String getWarehouseStorageCode() 
+    {
+        return warehouseStorageCode;
+    }
+    public void setRelatedOrderCode(String relatedOrderCode) 
+    {
+        this.relatedOrderCode = relatedOrderCode;
+    }
+
+    public String getRelatedOrderCode() 
+    {
+        return relatedOrderCode;
+    }
+    public void setSupplierCode(String supplierCode) 
+    {
+        this.supplierCode = supplierCode;
+    }
+
+    public String getSupplierCode() 
+    {
+        return supplierCode;
+    }
+    public void setSupplierName(String supplierName) 
+    {
+        this.supplierName = supplierName;
+    }
+
+    public String getSupplierName() 
+    {
+        return supplierName;
+    }
+    public void setMaterialNo(String materialNo) 
+    {
+        this.materialNo = materialNo;
+    }
+
+    public String getMaterialNo() 
+    {
+        return materialNo;
+    }
+    public void setMaterialName(String materialName) 
+    {
+        this.materialName = materialName;
+    }
+
+    public String getMaterialName() 
+    {
+        return materialName;
+    }
+    public void setMaterialType(String materialType) 
+    {
+        this.materialType = materialType;
+    }
+
+    public String getMaterialType() 
+    {
+        return materialType;
+    }
+    public void setMaterialPhotourl(String materialPhotourl) 
+    {
+        this.materialPhotourl = materialPhotourl;
+    }
+
+    public String getMaterialPhotourl() 
+    {
+        return materialPhotourl;
+    }
+    public void setMaterialModel(String materialModel) 
+    {
+        this.materialModel = materialModel;
+    }
+
+    public String getMaterialModel() 
+    {
+        return materialModel;
+    }
+    public void setMaterialBrand(String materialBrand) 
+    {
+        this.materialBrand = materialBrand;
+    }
+
+    public String getMaterialBrand() 
+    {
+        return materialBrand;
+    }
+    public void setMaterialUnit(String materialUnit) 
+    {
+        this.materialUnit = materialUnit;
+    }
+
+    public String getMaterialUnit() 
+    {
+        return materialUnit;
+    }
+    public void setMaterialDescribe(String materialDescribe) 
+    {
+        this.materialDescribe = materialDescribe;
+    }
+
+    public String getMaterialDescribe() 
+    {
+        return materialDescribe;
+    }
+    public void setMaterialProcessMethod(String materialProcessMethod) 
+    {
+        this.materialProcessMethod = materialProcessMethod;
+    }
+
+    public String getMaterialProcessMethod() 
+    {
+        return materialProcessMethod;
+    }
+    public void setMaterialDeptType(String materialDeptType) 
+    {
+        this.materialDeptType = materialDeptType;
+    }
+
+    public String getMaterialDeptType() 
+    {
+        return materialDeptType;
+    }
+    public void setMakeTotal(Integer makeTotal) 
+    {
+        this.makeTotal = makeTotal;
+    }
+
+    public Integer getMakeTotal() 
+    {
+        return makeTotal;
+    }
+    public void setNotifyHasArrivedNum(Integer notifyHasArrivedNum) 
+    {
+        this.notifyHasArrivedNum = notifyHasArrivedNum;
+    }
+
+    public Integer getNotifyHasArrivedNum() 
+    {
+        return notifyHasArrivedNum;
+    }
+    public void setNotifyArriveNum(Integer notifyArriveNum) 
+    {
+        this.notifyArriveNum = notifyArriveNum;
+    }
+
+    public Integer getNotifyArriveNum() 
+    {
+        return notifyArriveNum;
+    }
+    public void setActualHasArrivedNum(Integer actualHasArrivedNum) 
+    {
+        this.actualHasArrivedNum = actualHasArrivedNum;
+    }
+
+    public Integer getActualHasArrivedNum() 
+    {
+        return actualHasArrivedNum;
+    }
+    public void setActualArriveNum(Integer actualArriveNum) 
+    {
+        this.actualArriveNum = actualArriveNum;
+    }
+
+    public Integer getActualArriveNum() 
+    {
+        return actualArriveNum;
+    }
+    public void setTemporaryHasQualifiedNum(Integer temporaryHasQualifiedNum) 
+    {
+        this.temporaryHasQualifiedNum = temporaryHasQualifiedNum;
+    }
+
+    public Integer getTemporaryHasQualifiedNum() 
+    {
+        return temporaryHasQualifiedNum;
+    }
+    public void setTemporaryQualifiedNum(Integer temporaryQualifiedNum) 
+    {
+        this.temporaryQualifiedNum = temporaryQualifiedNum;
+    }
+
+    public Integer getTemporaryQualifiedNum() 
+    {
+        return temporaryQualifiedNum;
+    }
+    public void setHasStorageNum(Integer hasStorageNum) 
+    {
+        this.hasStorageNum = hasStorageNum;
+    }
+
+    public Integer getHasStorageNum() 
+    {
+        return hasStorageNum;
+    }
+    public void setStorageNum(Integer storageNum) 
+    {
+        this.storageNum = storageNum;
+    }
+
+    public Integer getStorageNum() 
+    {
+        return storageNum;
+    }
+    public void setMakeStorageNum(Integer makeStorageNum) 
+    {
+        this.makeStorageNum = makeStorageNum;
+    }
+
+    public Integer getMakeStorageNum() 
+    {
+        return makeStorageNum;
+    }
+    public void setQualityHasQualifiedNum(Integer qualityHasQualifiedNum) 
+    {
+        this.qualityHasQualifiedNum = qualityHasQualifiedNum;
+    }
+
+    public Integer getQualityHasQualifiedNum() 
+    {
+        return qualityHasQualifiedNum;
+    }
+    public void setQualityQualifiedNum(Integer qualityQualifiedNum) 
+    {
+        this.qualityQualifiedNum = qualityQualifiedNum;
+    }
+
+    public Integer getQualityQualifiedNum() 
+    {
+        return qualityQualifiedNum;
+    }
+    public void setRefundsExchangesNum(Integer refundsExchangesNum) 
+    {
+        this.refundsExchangesNum = refundsExchangesNum;
+    }
+
+    public Integer getRefundsExchangesNum() 
+    {
+        return refundsExchangesNum;
+    }
+    public void setMakeInUnitPrice(BigDecimal makeInUnitPrice) 
+    {
+        this.makeInUnitPrice = makeInUnitPrice;
+    }
+
+    public BigDecimal getMakeInUnitPrice() 
+    {
+        return makeInUnitPrice;
+    }
+    public void setArrivedTime(Date arrivedTime) 
+    {
+        this.arrivedTime = arrivedTime;
+    }
+
+    public Date getArrivedTime() 
+    {
+        return arrivedTime;
+    }
+    public void setTemporaryTime(Date temporaryTime) 
+    {
+        this.temporaryTime = temporaryTime;
+    }
+
+    public Date getTemporaryTime() 
+    {
+        return temporaryTime;
+    }
+    public void setDeliveryInspectionTime(Date deliveryInspectionTime) 
+    {
+        this.deliveryInspectionTime = deliveryInspectionTime;
+    }
+
+    public Date getDeliveryInspectionTime() 
+    {
+        return deliveryInspectionTime;
+    }
+    public void setQualityTime(Date qualityTime) 
+    {
+        this.qualityTime = qualityTime;
+    }
+
+    public Date getQualityTime() 
+    {
+        return qualityTime;
+    }
+    public void setStorageTime(Date storageTime) 
+    {
+        this.storageTime = storageTime;
+    }
+
+    public Date getStorageTime() 
+    {
+        return storageTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("purchaseStorageChildId", getPurchaseStorageChildId())
+            .append("warehouseStorageCode", getWarehouseStorageCode())
+            .append("relatedOrderCode", getRelatedOrderCode())
+            .append("supplierCode", getSupplierCode())
+            .append("supplierName", getSupplierName())
+            .append("materialNo", getMaterialNo())
+            .append("materialName", getMaterialName())
+            .append("materialType", getMaterialType())
+            .append("materialPhotourl", getMaterialPhotourl())
+            .append("materialModel", getMaterialModel())
+            .append("materialBrand", getMaterialBrand())
+            .append("materialUnit", getMaterialUnit())
+            .append("materialDescribe", getMaterialDescribe())
+            .append("materialProcessMethod", getMaterialProcessMethod())
+            .append("materialDeptType", getMaterialDeptType())
+            .append("makeTotal", getMakeTotal())
+            .append("notifyHasArrivedNum", getNotifyHasArrivedNum())
+            .append("notifyArriveNum", getNotifyArriveNum())
+            .append("actualHasArrivedNum", getActualHasArrivedNum())
+            .append("actualArriveNum", getActualArriveNum())
+            .append("temporaryHasQualifiedNum", getTemporaryHasQualifiedNum())
+            .append("temporaryQualifiedNum", getTemporaryQualifiedNum())
+            .append("hasStorageNum", getHasStorageNum())
+            .append("storageNum", getStorageNum())
+            .append("makeStorageNum", getMakeStorageNum())
+            .append("qualityHasQualifiedNum", getQualityHasQualifiedNum())
+            .append("qualityQualifiedNum", getQualityQualifiedNum())
+            .append("refundsExchangesNum", getRefundsExchangesNum())
+            .append("makeInUnitPrice", getMakeInUnitPrice())
+            .append("arrivedTime", getArrivedTime())
+            .append("temporaryTime", getTemporaryTime())
+            .append("deliveryInspectionTime", getDeliveryInspectionTime())
+            .append("qualityTime", getQualityTime())
+            .append("storageTime", getStorageTime())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseStorageChildMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.purchase.mapper;
+
+import java.util.List;
+import com.ruoyi.purchase.domain.PurchaseStorageChild;
+
+/**
+ * 采购入库单子表Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+public interface PurchaseStorageChildMapper 
+{
+    /**
+     * 查询采购入库单子表
+     * 
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 采购入库单子表
+     */
+    public PurchaseStorageChild selectPurchaseStorageChildById(Long purchaseStorageChildId);
+
+    /**
+     * 查询采购入库单子表列表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 采购入库单子表集合
+     */
+    public List<PurchaseStorageChild> selectPurchaseStorageChildList(PurchaseStorageChild purchaseStorageChild);
+
+    /**
+     * 新增采购入库单子表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 结果
+     */
+    public int insertPurchaseStorageChild(PurchaseStorageChild purchaseStorageChild);
+
+    /**
+     * 修改采购入库单子表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 结果
+     */
+    public int updatePurchaseStorageChild(PurchaseStorageChild purchaseStorageChild);
+
+    /**
+     * 删除采购入库单子表
+     * 
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageChildById(Long purchaseStorageChildId);
+
+    /**
+     * 批量删除采购入库单子表
+     * 
+     * @param purchaseStorageChildIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageChildByIds(String[] purchaseStorageChildIds);
+
+    /**
+     * 作废采购入库单子表
+     *
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 结果
+     */
+    public int cancelPurchaseStorageChildById(Long purchaseStorageChildId);
+
+    /**
+     * 恢复采购入库单子表
+     *
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 结果
+     */
+    public int restorePurchaseStorageChildById(Long purchaseStorageChildId);
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/mapper/PurchaseStorageMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.purchase.mapper;
+
+import java.util.List;
+import com.ruoyi.purchase.domain.PurchaseStorage;
+
+/**
+ * 采购入库单Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+public interface PurchaseStorageMapper 
+{
+    /**
+     * 查询采购入库单
+     * 
+     * @param purchaseStorageId 采购入库单ID
+     * @return 采购入库单
+     */
+    public PurchaseStorage selectPurchaseStorageById(Long purchaseStorageId);
+
+    /**
+     * 查询采购入库单列表
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 采购入库单集合
+     */
+    public List<PurchaseStorage> selectPurchaseStorageList(PurchaseStorage purchaseStorage);
+
+    /**
+     * 新增采购入库单
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 结果
+     */
+    public int insertPurchaseStorage(PurchaseStorage purchaseStorage);
+
+    /**
+     * 修改采购入库单
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 结果
+     */
+    public int updatePurchaseStorage(PurchaseStorage purchaseStorage);
+
+    /**
+     * 删除采购入库单
+     * 
+     * @param purchaseStorageId 采购入库单ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageById(Long purchaseStorageId);
+
+    /**
+     * 批量删除采购入库单
+     * 
+     * @param purchaseStorageIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageByIds(String[] purchaseStorageIds);
+
+    /**
+     * 作废采购入库单
+     *
+     * @param purchaseStorageId 采购入库单ID
+     * @return 结果
+     */
+    public int cancelPurchaseStorageById(Long purchaseStorageId);
+
+    /**
+     * 恢复采购入库单
+     *
+     * @param purchaseStorageId 采购入库单ID
+     * @return 结果
+     */
+    public int restorePurchaseStorageById(Long purchaseStorageId);
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageChildService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.purchase.service;
+
+import java.util.List;
+import com.ruoyi.purchase.domain.PurchaseStorageChild;
+
+/**
+ * 采购入库单子表Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+public interface IPurchaseStorageChildService 
+{
+    /**
+     * 查询采购入库单子表
+     * 
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 采购入库单子表
+     */
+    public PurchaseStorageChild selectPurchaseStorageChildById(Long purchaseStorageChildId);
+
+    /**
+     * 查询采购入库单子表列表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 采购入库单子表集合
+     */
+    public List<PurchaseStorageChild> selectPurchaseStorageChildList(PurchaseStorageChild purchaseStorageChild);
+
+    /**
+     * 新增采购入库单子表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 结果
+     */
+    public int insertPurchaseStorageChild(PurchaseStorageChild purchaseStorageChild);
+
+    /**
+     * 修改采购入库单子表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 结果
+     */
+    public int updatePurchaseStorageChild(PurchaseStorageChild purchaseStorageChild);
+
+    /**
+     * 批量删除采购入库单子表
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageChildByIds(String ids);
+
+    /**
+     * 删除采购入库单子表信息
+     * 
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageChildById(Long purchaseStorageChildId);
+
+    /**
+     * 作废采购入库单子表
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return
+     */
+    int cancelPurchaseStorageChildById(Long purchaseStorageChildId);
+
+    /**
+     * 恢复采购入库单子表
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return
+     */
+    int restorePurchaseStorageChildById(Long purchaseStorageChildId);
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseStorageService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.purchase.service;
+
+import java.util.List;
+import com.ruoyi.purchase.domain.PurchaseStorage;
+
+/**
+ * 采购入库单Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+public interface IPurchaseStorageService 
+{
+    /**
+     * 查询采购入库单
+     * 
+     * @param purchaseStorageId 采购入库单ID
+     * @return 采购入库单
+     */
+    public PurchaseStorage selectPurchaseStorageById(Long purchaseStorageId);
+
+    /**
+     * 查询采购入库单列表
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 采购入库单集合
+     */
+    public List<PurchaseStorage> selectPurchaseStorageList(PurchaseStorage purchaseStorage);
+
+    /**
+     * 新增采购入库单
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 结果
+     */
+    public int insertPurchaseStorage(PurchaseStorage purchaseStorage);
+
+    /**
+     * 修改采购入库单
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 结果
+     */
+    public int updatePurchaseStorage(PurchaseStorage purchaseStorage);
+
+    /**
+     * 批量删除采购入库单
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageByIds(String ids);
+
+    /**
+     * 删除采购入库单信息
+     * 
+     * @param purchaseStorageId 采购入库单ID
+     * @return 结果
+     */
+    public int deletePurchaseStorageById(Long purchaseStorageId);
+
+    /**
+     * 作废采购入库单
+     * @param purchaseStorageId 采购入库单ID
+     * @return
+     */
+    int cancelPurchaseStorageById(Long purchaseStorageId);
+
+    /**
+     * 恢复采购入库单
+     * @param purchaseStorageId 采购入库单ID
+     * @return
+     */
+    int restorePurchaseStorageById(Long purchaseStorageId);
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageChildServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.purchase.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.purchase.mapper.PurchaseStorageChildMapper;
+import com.ruoyi.purchase.domain.PurchaseStorageChild;
+import com.ruoyi.purchase.service.IPurchaseStorageChildService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 采购入库单子表Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+@Service
+public class PurchaseStorageChildServiceImpl implements IPurchaseStorageChildService 
+{
+    @Autowired
+    private PurchaseStorageChildMapper purchaseStorageChildMapper;
+
+    /**
+     * 查询采购入库单子表
+     * 
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 采购入库单子表
+     */
+    @Override
+    public PurchaseStorageChild selectPurchaseStorageChildById(Long purchaseStorageChildId)
+    {
+        return purchaseStorageChildMapper.selectPurchaseStorageChildById(purchaseStorageChildId);
+    }
+
+    /**
+     * 查询采购入库单子表列表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 采购入库单子表
+     */
+    @Override
+    public List<PurchaseStorageChild> selectPurchaseStorageChildList(PurchaseStorageChild purchaseStorageChild)
+    {
+        return purchaseStorageChildMapper.selectPurchaseStorageChildList(purchaseStorageChild);
+    }
+
+    /**
+     * 新增采购入库单子表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 结果
+     */
+    @Override
+    public int insertPurchaseStorageChild(PurchaseStorageChild purchaseStorageChild)
+    {
+        purchaseStorageChild.setCreateTime(DateUtils.getNowDate());
+        String loginName = ShiroUtils.getLoginName();
+        purchaseStorageChild.setCreateBy(loginName);
+        return purchaseStorageChildMapper.insertPurchaseStorageChild(purchaseStorageChild);
+    }
+
+    /**
+     * 修改采购入库单子表
+     * 
+     * @param purchaseStorageChild 采购入库单子表
+     * @return 结果
+     */
+    @Override
+    public int updatePurchaseStorageChild(PurchaseStorageChild purchaseStorageChild)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        purchaseStorageChild.setUpdateBy(loginName);
+        purchaseStorageChild.setUpdateTime(DateUtils.getNowDate());
+        return purchaseStorageChildMapper.updatePurchaseStorageChild(purchaseStorageChild);
+    }
+
+    /**
+     * 删除采购入库单子表对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deletePurchaseStorageChildByIds(String ids)
+    {
+        return purchaseStorageChildMapper.deletePurchaseStorageChildByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除采购入库单子表信息
+     * 
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 结果
+     */
+    @Override
+    public int deletePurchaseStorageChildById(Long purchaseStorageChildId)
+    {
+        return purchaseStorageChildMapper.deletePurchaseStorageChildById(purchaseStorageChildId);
+    }
+
+    /**
+     * 作废采购入库单子表
+     *
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 结果
+     */
+    @Override
+    public int cancelPurchaseStorageChildById(Long purchaseStorageChildId)
+    {
+        return purchaseStorageChildMapper.cancelPurchaseStorageChildById(purchaseStorageChildId);
+    }
+
+    /**
+     * 恢复采购入库单子表信息
+     *
+     * @param purchaseStorageChildId 采购入库单子表ID
+     * @return 结果
+     */
+    @Override
+    public int restorePurchaseStorageChildById(Long purchaseStorageChildId)
+    {
+        return purchaseStorageChildMapper.restorePurchaseStorageChildById(purchaseStorageChildId);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseStorageServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.purchase.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.purchase.mapper.PurchaseStorageMapper;
+import com.ruoyi.purchase.domain.PurchaseStorage;
+import com.ruoyi.purchase.service.IPurchaseStorageService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 采购入库单Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-11-20
+ */
+@Service
+public class PurchaseStorageServiceImpl implements IPurchaseStorageService 
+{
+    @Autowired
+    private PurchaseStorageMapper purchaseStorageMapper;
+
+    /**
+     * 查询采购入库单
+     * 
+     * @param purchaseStorageId 采购入库单ID
+     * @return 采购入库单
+     */
+    @Override
+    public PurchaseStorage selectPurchaseStorageById(Long purchaseStorageId)
+    {
+        return purchaseStorageMapper.selectPurchaseStorageById(purchaseStorageId);
+    }
+
+    /**
+     * 查询采购入库单列表
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 采购入库单
+     */
+    @Override
+    public List<PurchaseStorage> selectPurchaseStorageList(PurchaseStorage purchaseStorage)
+    {
+        return purchaseStorageMapper.selectPurchaseStorageList(purchaseStorage);
+    }
+
+    /**
+     * 新增采购入库单
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 结果
+     */
+    @Override
+    public int insertPurchaseStorage(PurchaseStorage purchaseStorage)
+    {
+        purchaseStorage.setCreateTime(DateUtils.getNowDate());
+        String loginName = ShiroUtils.getLoginName();
+        purchaseStorage.setCreateBy(loginName);
+        return purchaseStorageMapper.insertPurchaseStorage(purchaseStorage);
+    }
+
+    /**
+     * 修改采购入库单
+     * 
+     * @param purchaseStorage 采购入库单
+     * @return 结果
+     */
+    @Override
+    public int updatePurchaseStorage(PurchaseStorage purchaseStorage)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        purchaseStorage.setUpdateBy(loginName);
+        purchaseStorage.setUpdateTime(DateUtils.getNowDate());
+        return purchaseStorageMapper.updatePurchaseStorage(purchaseStorage);
+    }
+
+    /**
+     * 删除采购入库单对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deletePurchaseStorageByIds(String ids)
+    {
+        return purchaseStorageMapper.deletePurchaseStorageByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除采购入库单信息
+     * 
+     * @param purchaseStorageId 采购入库单ID
+     * @return 结果
+     */
+    @Override
+    public int deletePurchaseStorageById(Long purchaseStorageId)
+    {
+        return purchaseStorageMapper.deletePurchaseStorageById(purchaseStorageId);
+    }
+
+    /**
+     * 作废采购入库单
+     *
+     * @param purchaseStorageId 采购入库单ID
+     * @return 结果
+     */
+    @Override
+    public int cancelPurchaseStorageById(Long purchaseStorageId)
+    {
+        return purchaseStorageMapper.cancelPurchaseStorageById(purchaseStorageId);
+    }
+
+    /**
+     * 恢复采购入库单信息
+     *
+     * @param purchaseStorageId 采购入库单ID
+     * @return 结果
+     */
+    @Override
+    public int restorePurchaseStorageById(Long purchaseStorageId)
+    {
+        return purchaseStorageMapper.restorePurchaseStorageById(purchaseStorageId);
+    }
+}

ruoyi-admin/src/main/resources/mapper/purchase/PurchaseStorageChildMapper.xml

@@ -0,0 +1,208 @@
+<?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.purchase.mapper.PurchaseStorageChildMapper">
+    
+    <resultMap type="PurchaseStorageChild" id="PurchaseStorageChildResult">
+        <result property="purchaseStorageChildId"    column="purchase_storage_child_id"    />
+        <result property="warehouseStorageCode"    column="warehouse_storage_code"    />
+        <result property="relatedOrderCode"    column="related_order_code"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="materialNo"    column="material_no"    />
+        <result property="materialName"    column="material_name"    />
+        <result property="materialType"    column="material_type"    />
+        <result property="materialPhotourl"    column="material_photoUrl"    />
+        <result property="materialModel"    column="material_model"    />
+        <result property="materialBrand"    column="material_brand"    />
+        <result property="materialUnit"    column="material_unit"    />
+        <result property="materialDescribe"    column="material_describe"    />
+        <result property="materialProcessMethod"    column="material_process_method"    />
+        <result property="materialDeptType"    column="material_dept_type"    />
+        <result property="makeTotal"    column="make_total"    />
+        <result property="notifyHasArrivedNum"    column="notify_has_arrived_num"    />
+        <result property="notifyArriveNum"    column="notify_arrive_num"    />
+        <result property="actualHasArrivedNum"    column="actual_has_arrived_num"    />
+        <result property="actualArriveNum"    column="actual_arrive_num"    />
+        <result property="temporaryHasQualifiedNum"    column="temporary_has_qualified_num"    />
+        <result property="temporaryQualifiedNum"    column="temporary_qualified_num"    />
+        <result property="hasStorageNum"    column="has_storage_num"    />
+        <result property="storageNum"    column="storage_num"    />
+        <result property="makeStorageNum"    column="make_storage_num"    />
+        <result property="qualityHasQualifiedNum"    column="quality_has_qualified_num"    />
+        <result property="qualityQualifiedNum"    column="quality_qualified_num"    />
+        <result property="refundsExchangesNum"    column="refunds_exchanges_num"    />
+        <result property="makeInUnitPrice"    column="make_in_unit_price"    />
+        <result property="arrivedTime"    column="arrived_time"    />
+        <result property="temporaryTime"    column="temporary_time"    />
+        <result property="deliveryInspectionTime"    column="delivery_inspection_time"    />
+        <result property="qualityTime"    column="quality_time"    />
+        <result property="storageTime"    column="storage_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectPurchaseStorageChildVo">
+        select purchase_storage_child_id, warehouse_storage_code, related_order_code, supplier_code, supplier_name, material_no, material_name, material_type, material_photoUrl, material_model, material_brand, material_unit, material_describe, material_process_method, material_dept_type, make_total, notify_has_arrived_num, notify_arrive_num, actual_has_arrived_num, actual_arrive_num, temporary_has_qualified_num, temporary_qualified_num, has_storage_num, storage_num, make_storage_num, quality_has_qualified_num, quality_qualified_num, refunds_exchanges_num, make_in_unit_price, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, create_time, create_by, update_by, update_time from purchase_storage_child
+    </sql>
+
+    <select id="selectPurchaseStorageChildList" parameterType="PurchaseStorageChild" resultMap="PurchaseStorageChildResult">
+        <include refid="selectPurchaseStorageChildVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectPurchaseStorageChildById" parameterType="Long" resultMap="PurchaseStorageChildResult">
+        <include refid="selectPurchaseStorageChildVo"/>
+        where purchase_storage_child_id = #{purchaseStorageChildId}
+    </select>
+        
+    <insert id="insertPurchaseStorageChild" parameterType="PurchaseStorageChild" useGeneratedKeys="true" keyProperty="purchaseStorageChildId">
+        insert into purchase_storage_child
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">warehouse_storage_code,</if>
+            <if test="relatedOrderCode != null">related_order_code,</if>
+            <if test="supplierCode != null">supplier_code,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="materialNo != null">material_no,</if>
+            <if test="materialName != null">material_name,</if>
+            <if test="materialType != null">material_type,</if>
+            <if test="materialPhotourl != null">material_photoUrl,</if>
+            <if test="materialModel != null">material_model,</if>
+            <if test="materialBrand != null">material_brand,</if>
+            <if test="materialUnit != null">material_unit,</if>
+            <if test="materialDescribe != null">material_describe,</if>
+            <if test="materialProcessMethod != null">material_process_method,</if>
+            <if test="materialDeptType != null">material_dept_type,</if>
+            <if test="makeTotal != null">make_total,</if>
+            <if test="notifyHasArrivedNum != null">notify_has_arrived_num,</if>
+            <if test="notifyArriveNum != null">notify_arrive_num,</if>
+            <if test="actualHasArrivedNum != null">actual_has_arrived_num,</if>
+            <if test="actualArriveNum != null">actual_arrive_num,</if>
+            <if test="temporaryHasQualifiedNum != null">temporary_has_qualified_num,</if>
+            <if test="temporaryQualifiedNum != null">temporary_qualified_num,</if>
+            <if test="hasStorageNum != null">has_storage_num,</if>
+            <if test="storageNum != null">storage_num,</if>
+            <if test="makeStorageNum != null">make_storage_num,</if>
+            <if test="qualityHasQualifiedNum != null">quality_has_qualified_num,</if>
+            <if test="qualityQualifiedNum != null">quality_qualified_num,</if>
+            <if test="refundsExchangesNum != null">refunds_exchanges_num,</if>
+            <if test="makeInUnitPrice != null">make_in_unit_price,</if>
+            <if test="arrivedTime != null">arrived_time,</if>
+            <if test="temporaryTime != null">temporary_time,</if>
+            <if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
+            <if test="qualityTime != null">quality_time,</if>
+            <if test="storageTime != null">storage_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">#{warehouseStorageCode},</if>
+            <if test="relatedOrderCode != null">#{relatedOrderCode},</if>
+            <if test="supplierCode != null">#{supplierCode},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="materialNo != null">#{materialNo},</if>
+            <if test="materialName != null">#{materialName},</if>
+            <if test="materialType != null">#{materialType},</if>
+            <if test="materialPhotourl != null">#{materialPhotourl},</if>
+            <if test="materialModel != null">#{materialModel},</if>
+            <if test="materialBrand != null">#{materialBrand},</if>
+            <if test="materialUnit != null">#{materialUnit},</if>
+            <if test="materialDescribe != null">#{materialDescribe},</if>
+            <if test="materialProcessMethod != null">#{materialProcessMethod},</if>
+            <if test="materialDeptType != null">#{materialDeptType},</if>
+            <if test="makeTotal != null">#{makeTotal},</if>
+            <if test="notifyHasArrivedNum != null">#{notifyHasArrivedNum},</if>
+            <if test="notifyArriveNum != null">#{notifyArriveNum},</if>
+            <if test="actualHasArrivedNum != null">#{actualHasArrivedNum},</if>
+            <if test="actualArriveNum != null">#{actualArriveNum},</if>
+            <if test="temporaryHasQualifiedNum != null">#{temporaryHasQualifiedNum},</if>
+            <if test="temporaryQualifiedNum != null">#{temporaryQualifiedNum},</if>
+            <if test="hasStorageNum != null">#{hasStorageNum},</if>
+            <if test="storageNum != null">#{storageNum},</if>
+            <if test="makeStorageNum != null">#{makeStorageNum},</if>
+            <if test="qualityHasQualifiedNum != null">#{qualityHasQualifiedNum},</if>
+            <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
+            <if test="refundsExchangesNum != null">#{refundsExchangesNum},</if>
+            <if test="makeInUnitPrice != null">#{makeInUnitPrice},</if>
+            <if test="arrivedTime != null">#{arrivedTime},</if>
+            <if test="temporaryTime != null">#{temporaryTime},</if>
+            <if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
+            <if test="qualityTime != null">#{qualityTime},</if>
+            <if test="storageTime != null">#{storageTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePurchaseStorageChild" parameterType="PurchaseStorageChild">
+        update purchase_storage_child
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if>
+            <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="materialType != null">material_type = #{materialType},</if>
+            <if test="materialPhotourl != null">material_photoUrl = #{materialPhotourl},</if>
+            <if test="materialModel != null">material_model = #{materialModel},</if>
+            <if test="materialBrand != null">material_brand = #{materialBrand},</if>
+            <if test="materialUnit != null">material_unit = #{materialUnit},</if>
+            <if test="materialDescribe != null">material_describe = #{materialDescribe},</if>
+            <if test="materialProcessMethod != null">material_process_method = #{materialProcessMethod},</if>
+            <if test="materialDeptType != null">material_dept_type = #{materialDeptType},</if>
+            <if test="makeTotal != null">make_total = #{makeTotal},</if>
+            <if test="notifyHasArrivedNum != null">notify_has_arrived_num = #{notifyHasArrivedNum},</if>
+            <if test="notifyArriveNum != null">notify_arrive_num = #{notifyArriveNum},</if>
+            <if test="actualHasArrivedNum != null">actual_has_arrived_num = #{actualHasArrivedNum},</if>
+            <if test="actualArriveNum != null">actual_arrive_num = #{actualArriveNum},</if>
+            <if test="temporaryHasQualifiedNum != null">temporary_has_qualified_num = #{temporaryHasQualifiedNum},</if>
+            <if test="temporaryQualifiedNum != null">temporary_qualified_num = #{temporaryQualifiedNum},</if>
+            <if test="hasStorageNum != null">has_storage_num = #{hasStorageNum},</if>
+            <if test="storageNum != null">storage_num = #{storageNum},</if>
+            <if test="makeStorageNum != null">make_storage_num = #{makeStorageNum},</if>
+            <if test="qualityHasQualifiedNum != null">quality_has_qualified_num = #{qualityHasQualifiedNum},</if>
+            <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
+            <if test="refundsExchangesNum != null">refunds_exchanges_num = #{refundsExchangesNum},</if>
+            <if test="makeInUnitPrice != null">make_in_unit_price = #{makeInUnitPrice},</if>
+            <if test="arrivedTime != null">arrived_time = #{arrivedTime},</if>
+            <if test="temporaryTime != null">temporary_time = #{temporaryTime},</if>
+            <if test="deliveryInspectionTime != null">delivery_inspection_time = #{deliveryInspectionTime},</if>
+            <if test="qualityTime != null">quality_time = #{qualityTime},</if>
+            <if test="storageTime != null">storage_time = #{storageTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where purchase_storage_child_id = #{purchaseStorageChildId}
+    </update>
+
+    <delete id="deletePurchaseStorageChildById" parameterType="Long">
+        delete from purchase_storage_child where purchase_storage_child_id = #{purchaseStorageChildId}
+    </delete>
+
+    <delete id="deletePurchaseStorageChildByIds" parameterType="String">
+        delete from purchase_storage_child where purchase_storage_child_id in 
+        <foreach item="purchaseStorageChildId" collection="array" open="(" separator="," close=")">
+            #{purchaseStorageChildId}
+        </foreach>
+    </delete>
+
+    <update id="cancelPurchaseStorageChildById" parameterType="Long">
+        update purchase_storage_child set del_flag = '1' where purchase_storage_child_id = #{purchaseStorageChildId}
+    </update>
+
+    <update id="restorePurchaseStorageChildById" parameterType="Long">
+        update purchase_storage_child set del_flag = '0' where purchase_storage_child_id = #{purchaseStorageChildId}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/mapper/purchase/PurchaseStorageMapper.xml

@@ -0,0 +1,182 @@
+<?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.purchase.mapper.PurchaseStorageMapper">
+    
+    <resultMap type="PurchaseStorage" id="PurchaseStorageResult">
+        <result property="purchaseStorageId"    column="purchase_storage_id"    />
+        <result property="warehouseStorageCode"    column="warehouse_storage_code"    />
+        <result property="relatedOrderCode"    column="related_order_code"    />
+        <result property="warehouseStorageStatus"    column="warehouse_storage_status"    />
+        <result property="warehouseQualityStatus"    column="warehouse_quality_status"    />
+        <result property="warehouseStorageType"    column="warehouse_storage_type"    />
+        <result property="warehouseOrderType"    column="warehouse_order_type"    />
+        <result property="warehouseDeptType"    column="warehouse_dept_type"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="notifyArrivedSum"    column="notify_arrived_sum"    />
+        <result property="actualArrivedSum"    column="actual_arrived_sum"    />
+        <result property="temporaryQualifiedSum"    column="temporary_qualified_sum"    />
+        <result property="temporaryUnqualifiedSum"    column="temporary_unqualified_sum"    />
+        <result property="qualityQualifiedSum"    column="quality_qualified_sum"    />
+        <result property="refundsExchangesSum"    column="refunds_exchanges_sum"    />
+        <result property="storageSum"    column="storage_sum"    />
+        <result property="arrivedTime"    column="arrived_time"    />
+        <result property="temporaryTime"    column="temporary_time"    />
+        <result property="deliveryInspectionTime"    column="delivery_inspection_time"    />
+        <result property="qualityTime"    column="quality_time"    />
+        <result property="storageTime"    column="storage_time"    />
+        <result property="warehouseEmployee"    column="warehouse_employee"    />
+        <result property="warehouseCode"    column="warehouse_code"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectPurchaseStorageVo">
+        select purchase_storage_id, warehouse_storage_code, related_order_code, warehouse_storage_status, warehouse_quality_status, warehouse_storage_type, warehouse_order_type, warehouse_dept_type, supplier_code, supplier_name, notify_arrived_sum, actual_arrived_sum, temporary_qualified_sum, temporary_unqualified_sum, quality_qualified_sum, refunds_exchanges_sum, storage_sum, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code, warehouse_name, create_time, create_by, update_by, update_time from purchase_storage
+    </sql>
+
+    <select id="selectPurchaseStorageList" parameterType="PurchaseStorage" resultMap="PurchaseStorageResult">
+        <include refid="selectPurchaseStorageVo"/>
+        <where>  
+            <if test="warehouseStorageCode != null  and warehouseStorageCode != ''"> and warehouse_storage_code like concat('%', #{warehouseStorageCode}, '%')</if>
+            <if test="relatedOrderCode != null  and relatedOrderCode != ''"> and related_order_code like concat('%', #{relatedOrderCode}, '%')</if>
+            <if test="warehouseStorageStatus != null  and warehouseStorageStatus != ''"> and warehouse_storage_status = #{warehouseStorageStatus}</if>
+            <if test="warehouseQualityStatus != null  and warehouseQualityStatus != ''"> and warehouse_quality_status = #{warehouseQualityStatus}</if>
+            <if test="warehouseStorageType != null  and warehouseStorageType != ''"> and warehouse_storage_type = #{warehouseStorageType}</if>
+            <if test="warehouseOrderType != null  and warehouseOrderType != ''"> and warehouse_order_type = #{warehouseOrderType}</if>
+            <if test="warehouseDeptType != null  and warehouseDeptType != ''"> and warehouse_dept_type = #{warehouseDeptType}</if>
+            <if test="supplierCode != null  and supplierCode != ''"> and supplier_code like concat('%', #{supplierCode}, '%')</if>
+            <if test="supplierName != null  and supplierName != ''"> and supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectPurchaseStorageById" parameterType="Long" resultMap="PurchaseStorageResult">
+        <include refid="selectPurchaseStorageVo"/>
+        where purchase_storage_id = #{purchaseStorageId}
+    </select>
+        
+    <insert id="insertPurchaseStorage" parameterType="PurchaseStorage" useGeneratedKeys="true" keyProperty="purchaseStorageId">
+        insert into purchase_storage
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">warehouse_storage_code,</if>
+            <if test="relatedOrderCode != null">related_order_code,</if>
+            <if test="warehouseStorageStatus != null">warehouse_storage_status,</if>
+            <if test="warehouseQualityStatus != null">warehouse_quality_status,</if>
+            <if test="warehouseStorageType != null">warehouse_storage_type,</if>
+            <if test="warehouseOrderType != null">warehouse_order_type,</if>
+            <if test="warehouseDeptType != null">warehouse_dept_type,</if>
+            <if test="supplierCode != null">supplier_code,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="notifyArrivedSum != null">notify_arrived_sum,</if>
+            <if test="actualArrivedSum != null">actual_arrived_sum,</if>
+            <if test="temporaryQualifiedSum != null">temporary_qualified_sum,</if>
+            <if test="temporaryUnqualifiedSum != null">temporary_unqualified_sum,</if>
+            <if test="qualityQualifiedSum != null">quality_qualified_sum,</if>
+            <if test="refundsExchangesSum != null">refunds_exchanges_sum,</if>
+            <if test="storageSum != null">storage_sum,</if>
+            <if test="arrivedTime != null">arrived_time,</if>
+            <if test="temporaryTime != null">temporary_time,</if>
+            <if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
+            <if test="qualityTime != null">quality_time,</if>
+            <if test="storageTime != null">storage_time,</if>
+            <if test="warehouseEmployee != null">warehouse_employee,</if>
+            <if test="warehouseCode != null">warehouse_code,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">#{warehouseStorageCode},</if>
+            <if test="relatedOrderCode != null">#{relatedOrderCode},</if>
+            <if test="warehouseStorageStatus != null">#{warehouseStorageStatus},</if>
+            <if test="warehouseQualityStatus != null">#{warehouseQualityStatus},</if>
+            <if test="warehouseStorageType != null">#{warehouseStorageType},</if>
+            <if test="warehouseOrderType != null">#{warehouseOrderType},</if>
+            <if test="warehouseDeptType != null">#{warehouseDeptType},</if>
+            <if test="supplierCode != null">#{supplierCode},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="notifyArrivedSum != null">#{notifyArrivedSum},</if>
+            <if test="actualArrivedSum != null">#{actualArrivedSum},</if>
+            <if test="temporaryQualifiedSum != null">#{temporaryQualifiedSum},</if>
+            <if test="temporaryUnqualifiedSum != null">#{temporaryUnqualifiedSum},</if>
+            <if test="qualityQualifiedSum != null">#{qualityQualifiedSum},</if>
+            <if test="refundsExchangesSum != null">#{refundsExchangesSum},</if>
+            <if test="storageSum != null">#{storageSum},</if>
+            <if test="arrivedTime != null">#{arrivedTime},</if>
+            <if test="temporaryTime != null">#{temporaryTime},</if>
+            <if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
+            <if test="qualityTime != null">#{qualityTime},</if>
+            <if test="storageTime != null">#{storageTime},</if>
+            <if test="warehouseEmployee != null">#{warehouseEmployee},</if>
+            <if test="warehouseCode != null">#{warehouseCode},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updatePurchaseStorage" parameterType="PurchaseStorage">
+        update purchase_storage
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if>
+            <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if>
+            <if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if>
+            <if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if>
+            <if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
+            <if test="warehouseDeptType != null">warehouse_dept_type = #{warehouseDeptType},</if>
+            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="notifyArrivedSum != null">notify_arrived_sum = #{notifyArrivedSum},</if>
+            <if test="actualArrivedSum != null">actual_arrived_sum = #{actualArrivedSum},</if>
+            <if test="temporaryQualifiedSum != null">temporary_qualified_sum = #{temporaryQualifiedSum},</if>
+            <if test="temporaryUnqualifiedSum != null">temporary_unqualified_sum = #{temporaryUnqualifiedSum},</if>
+            <if test="qualityQualifiedSum != null">quality_qualified_sum = #{qualityQualifiedSum},</if>
+            <if test="refundsExchangesSum != null">refunds_exchanges_sum = #{refundsExchangesSum},</if>
+            <if test="storageSum != null">storage_sum = #{storageSum},</if>
+            <if test="arrivedTime != null">arrived_time = #{arrivedTime},</if>
+            <if test="temporaryTime != null">temporary_time = #{temporaryTime},</if>
+            <if test="deliveryInspectionTime != null">delivery_inspection_time = #{deliveryInspectionTime},</if>
+            <if test="qualityTime != null">quality_time = #{qualityTime},</if>
+            <if test="storageTime != null">storage_time = #{storageTime},</if>
+            <if test="warehouseEmployee != null">warehouse_employee = #{warehouseEmployee},</if>
+            <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where purchase_storage_id = #{purchaseStorageId}
+    </update>
+
+    <delete id="deletePurchaseStorageById" parameterType="Long">
+        delete from purchase_storage where purchase_storage_id = #{purchaseStorageId}
+    </delete>
+
+    <delete id="deletePurchaseStorageByIds" parameterType="String">
+        delete from purchase_storage where purchase_storage_id in 
+        <foreach item="purchaseStorageId" collection="array" open="(" separator="," close=")">
+            #{purchaseStorageId}
+        </foreach>
+    </delete>
+
+    <update id="cancelPurchaseStorageById" parameterType="Long">
+        update purchase_storage set del_flag = '1' where purchase_storage_id = #{purchaseStorageId}
+    </update>
+
+    <update id="restorePurchaseStorageById" parameterType="Long">
+        update purchase_storage set del_flag = '0' where purchase_storage_id = #{purchaseStorageId}
+    </update>
+
+</mapper>