[feat]仓库管理:

出库单详情
新增出库单详情Mapper
新增出库单详情Mapper.xml
新增出库单详情Service
新增出库单详情ServiceImpl

ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseOutOrderDetail.java

@@ -0,0 +1,663 @@
+package com.ruoyi.warehouse.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;
+
+/**
+ * 出库单详情对象 warehouse_out_order_detail
+ * 
+ * @author 刘晓旭
+ * @date 2024-06-04
+ */
+public class WarehouseOutOrderDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 出库单详情Id */
+    private Long outOrderDetailId;
+
+    /** 出库单号 */
+    @Excel(name = "出库单号")
+    private String outOrderCode;
+
+    /** 关联生产订单号 */
+    @Excel(name = "关联生产订单号")
+    private String makeNo;
+
+    /** 出库状态 */
+    @Excel(name = "出库状态")
+    private String warehouseOutStatus;
+
+    /** 关联订单号（多种订单类型） */
+    @Excel(name = "关联订单号", readConverterExp = "多=种订单类型")
+    private String relatedOrderCode;
+
+    /** 关联销售订单编号 */
+    @Excel(name = "关联销售订单编号")
+    private String salesOrderCode;
+
+    /** 出库订单类型 */
+    @Excel(name = "出库订单类型")
+    private String warehouseOrderType;
+
+    /** 委外单号 */
+    @Excel(name = "委外单号")
+    private String outMakeCode;
+
+    /** 请购单号 */
+    @Excel(name = "请购单号")
+    private String requisitioningCode;
+
+    /** 出库类型 */
+    @Excel(name = "出库类型")
+    private String warehouseOutType;
+
+    /** 业务人员 */
+    @Excel(name = "业务人员")
+    private String businessName;
+
+    /** 售后人员 */
+    @Excel(name = "售后人员")
+    private String aftersalesName;
+
+    /** 仓库人员 */
+    @Excel(name = "仓库人员")
+    private String warehouseName;
+
+    /** 出货设备id */
+    @Excel(name = "出货设备id")
+    private String shippingDeviceId;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    private String materialNo;
+
+    /** 物料名称 */
+    @Excel(name = "物料名称")
+    private String materialName;
+
+    /** 物料类型 */
+    @Excel(name = "物料类型")
+    private String materialType;
+
+    /** 物料图片地址 */
+    @Excel(name = "物料图片地址")
+    private String materialPhotourl;
+
+    /** 物料品牌 */
+    @Excel(name = "物料品牌")
+    private String materialBrand;
+
+    /** 物料单位 */
+    @Excel(name = "物料单位")
+    private String materialUnit;
+
+    /** 物料描述 */
+    @Excel(name = "物料描述")
+    private String materialDescribe;
+
+    /** 物料加工方式 */
+    @Excel(name = "物料加工方式")
+    private String materialProcessMethod;
+
+    /** 物料型号 */
+    @Excel(name = "物料型号")
+    private String materialModel;
+
+    /** 物料规格 */
+    @Excel(name = "物料规格")
+    private String materialSpecification;
+
+    /** 物料数合计 */
+    @Excel(name = "物料数合计")
+    private Integer materialSum;
+
+    /** 数量合计 */
+    @Excel(name = "数量合计")
+    private Integer enterpriseSum;
+
+    /** 生产订单数 */
+    @Excel(name = "生产订单数")
+    private Integer makeNum;
+
+    /** 出库数 */
+    @Excel(name = "出库数")
+    private Integer outOrderSum;
+
+    /** 已出库数 */
+    @Excel(name = "已出库数")
+    private Integer hasOutOrderSum;
+
+    /** 申请出库数 */
+    @Excel(name = "申请出库数")
+    private Integer applyOutOrderSum;
+
+    /** 准备出库数 */
+    @Excel(name = "准备出库数")
+    private Integer prepareOutOrderSum;
+
+    /** 实际出库数 */
+    @Excel(name = "实际出库数")
+    private Integer actualOutOrderSum;
+
+    /** 出库对象 */
+    @Excel(name = "出库对象")
+    private String outOrderName;
+
+    /** 出库时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outOrderTime;
+
+    /** 供应商ID */
+    @Excel(name = "供应商ID")
+    private String supplierCode;
+
+    /** 供应商名称 */
+    @Excel(name = "供应商名称")
+    private String supplierName;
+
+    /** 客户ID */
+    @Excel(name = "客户ID")
+    private String customerId;
+
+    /** 客户名称 */
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    /** 计划交付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "计划交付时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planDeliveryTime;
+
+    /** 送货日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "送货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryDate;
+
+    /** 交付条件 */
+    @Excel(name = "交付条件")
+    private String deliveryCondition;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private String applyName;
+
+    /** 收货地址 */
+    @Excel(name = "收货地址")
+    private String deliveryAddress;
+
+    /** 收货联系人 */
+    @Excel(name = "收货联系人")
+    private String deliveryName;
+
+    /** 收货电话 */
+    @Excel(name = "收货电话")
+    private String deliveryNumber;
+
+    public void setOutOrderDetailId(Long outOrderDetailId) 
+    {
+        this.outOrderDetailId = outOrderDetailId;
+    }
+
+    public Long getOutOrderDetailId() 
+    {
+        return outOrderDetailId;
+    }
+    public void setOutOrderCode(String outOrderCode) 
+    {
+        this.outOrderCode = outOrderCode;
+    }
+
+    public String getOutOrderCode() 
+    {
+        return outOrderCode;
+    }
+    public void setMakeNo(String makeNo) 
+    {
+        this.makeNo = makeNo;
+    }
+
+    public String getMakeNo() 
+    {
+        return makeNo;
+    }
+    public void setWarehouseOutStatus(String warehouseOutStatus) 
+    {
+        this.warehouseOutStatus = warehouseOutStatus;
+    }
+
+    public String getWarehouseOutStatus() 
+    {
+        return warehouseOutStatus;
+    }
+    public void setRelatedOrderCode(String relatedOrderCode) 
+    {
+        this.relatedOrderCode = relatedOrderCode;
+    }
+
+    public String getRelatedOrderCode() 
+    {
+        return relatedOrderCode;
+    }
+    public void setSalesOrderCode(String salesOrderCode) 
+    {
+        this.salesOrderCode = salesOrderCode;
+    }
+
+    public String getSalesOrderCode() 
+    {
+        return salesOrderCode;
+    }
+    public void setWarehouseOrderType(String warehouseOrderType) 
+    {
+        this.warehouseOrderType = warehouseOrderType;
+    }
+
+    public String getWarehouseOrderType() 
+    {
+        return warehouseOrderType;
+    }
+    public void setOutMakeCode(String outMakeCode) 
+    {
+        this.outMakeCode = outMakeCode;
+    }
+
+    public String getOutMakeCode() 
+    {
+        return outMakeCode;
+    }
+    public void setRequisitioningCode(String requisitioningCode) 
+    {
+        this.requisitioningCode = requisitioningCode;
+    }
+
+    public String getRequisitioningCode() 
+    {
+        return requisitioningCode;
+    }
+    public void setWarehouseOutType(String warehouseOutType) 
+    {
+        this.warehouseOutType = warehouseOutType;
+    }
+
+    public String getWarehouseOutType() 
+    {
+        return warehouseOutType;
+    }
+    public void setBusinessName(String businessName) 
+    {
+        this.businessName = businessName;
+    }
+
+    public String getBusinessName() 
+    {
+        return businessName;
+    }
+    public void setAftersalesName(String aftersalesName) 
+    {
+        this.aftersalesName = aftersalesName;
+    }
+
+    public String getAftersalesName() 
+    {
+        return aftersalesName;
+    }
+    public void setWarehouseName(String warehouseName) 
+    {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getWarehouseName() 
+    {
+        return warehouseName;
+    }
+    public void setShippingDeviceId(String shippingDeviceId) 
+    {
+        this.shippingDeviceId = shippingDeviceId;
+    }
+
+    public String getShippingDeviceId() 
+    {
+        return shippingDeviceId;
+    }
+    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 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 setMaterialModel(String materialModel) 
+    {
+        this.materialModel = materialModel;
+    }
+
+    public String getMaterialModel() 
+    {
+        return materialModel;
+    }
+    public void setMaterialSpecification(String materialSpecification) 
+    {
+        this.materialSpecification = materialSpecification;
+    }
+
+    public String getMaterialSpecification() 
+    {
+        return materialSpecification;
+    }
+    public void setMaterialSum(Integer materialSum) 
+    {
+        this.materialSum = materialSum;
+    }
+
+    public Integer getMaterialSum() 
+    {
+        return materialSum;
+    }
+    public void setEnterpriseSum(Integer enterpriseSum) 
+    {
+        this.enterpriseSum = enterpriseSum;
+    }
+
+    public Integer getEnterpriseSum() 
+    {
+        return enterpriseSum;
+    }
+    public void setMakeNum(Integer makeNum) 
+    {
+        this.makeNum = makeNum;
+    }
+
+    public Integer getMakeNum() 
+    {
+        return makeNum;
+    }
+    public void setOutOrderSum(Integer outOrderSum) 
+    {
+        this.outOrderSum = outOrderSum;
+    }
+
+    public Integer getOutOrderSum() 
+    {
+        return outOrderSum;
+    }
+    public void setHasOutOrderSum(Integer hasOutOrderSum) 
+    {
+        this.hasOutOrderSum = hasOutOrderSum;
+    }
+
+    public Integer getHasOutOrderSum() 
+    {
+        return hasOutOrderSum;
+    }
+    public void setApplyOutOrderSum(Integer applyOutOrderSum) 
+    {
+        this.applyOutOrderSum = applyOutOrderSum;
+    }
+
+    public Integer getApplyOutOrderSum() 
+    {
+        return applyOutOrderSum;
+    }
+    public void setPrepareOutOrderSum(Integer prepareOutOrderSum) 
+    {
+        this.prepareOutOrderSum = prepareOutOrderSum;
+    }
+
+    public Integer getPrepareOutOrderSum() 
+    {
+        return prepareOutOrderSum;
+    }
+    public void setActualOutOrderSum(Integer actualOutOrderSum) 
+    {
+        this.actualOutOrderSum = actualOutOrderSum;
+    }
+
+    public Integer getActualOutOrderSum() 
+    {
+        return actualOutOrderSum;
+    }
+    public void setOutOrderName(String outOrderName) 
+    {
+        this.outOrderName = outOrderName;
+    }
+
+    public String getOutOrderName() 
+    {
+        return outOrderName;
+    }
+    public void setOutOrderTime(Date outOrderTime) 
+    {
+        this.outOrderTime = outOrderTime;
+    }
+
+    public Date getOutOrderTime() 
+    {
+        return outOrderTime;
+    }
+    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 setCustomerId(String customerId) 
+    {
+        this.customerId = customerId;
+    }
+
+    public String getCustomerId() 
+    {
+        return customerId;
+    }
+    public void setCustomerName(String customerName) 
+    {
+        this.customerName = customerName;
+    }
+
+    public String getCustomerName() 
+    {
+        return customerName;
+    }
+    public void setPlanDeliveryTime(Date planDeliveryTime) 
+    {
+        this.planDeliveryTime = planDeliveryTime;
+    }
+
+    public Date getPlanDeliveryTime() 
+    {
+        return planDeliveryTime;
+    }
+    public void setDeliveryDate(Date deliveryDate) 
+    {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public Date getDeliveryDate() 
+    {
+        return deliveryDate;
+    }
+    public void setDeliveryCondition(String deliveryCondition) 
+    {
+        this.deliveryCondition = deliveryCondition;
+    }
+
+    public String getDeliveryCondition() 
+    {
+        return deliveryCondition;
+    }
+    public void setApplyName(String applyName) 
+    {
+        this.applyName = applyName;
+    }
+
+    public String getApplyName() 
+    {
+        return applyName;
+    }
+    public void setDeliveryAddress(String deliveryAddress) 
+    {
+        this.deliveryAddress = deliveryAddress;
+    }
+
+    public String getDeliveryAddress() 
+    {
+        return deliveryAddress;
+    }
+    public void setDeliveryName(String deliveryName) 
+    {
+        this.deliveryName = deliveryName;
+    }
+
+    public String getDeliveryName() 
+    {
+        return deliveryName;
+    }
+    public void setDeliveryNumber(String deliveryNumber) 
+    {
+        this.deliveryNumber = deliveryNumber;
+    }
+
+    public String getDeliveryNumber() 
+    {
+        return deliveryNumber;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("outOrderDetailId", getOutOrderDetailId())
+            .append("outOrderCode", getOutOrderCode())
+            .append("makeNo", getMakeNo())
+            .append("warehouseOutStatus", getWarehouseOutStatus())
+            .append("relatedOrderCode", getRelatedOrderCode())
+            .append("salesOrderCode", getSalesOrderCode())
+            .append("warehouseOrderType", getWarehouseOrderType())
+            .append("outMakeCode", getOutMakeCode())
+            .append("requisitioningCode", getRequisitioningCode())
+            .append("warehouseOutType", getWarehouseOutType())
+            .append("businessName", getBusinessName())
+            .append("aftersalesName", getAftersalesName())
+            .append("warehouseName", getWarehouseName())
+            .append("shippingDeviceId", getShippingDeviceId())
+            .append("materialNo", getMaterialNo())
+            .append("materialName", getMaterialName())
+            .append("materialType", getMaterialType())
+            .append("materialPhotourl", getMaterialPhotourl())
+            .append("materialBrand", getMaterialBrand())
+            .append("materialUnit", getMaterialUnit())
+            .append("materialDescribe", getMaterialDescribe())
+            .append("materialProcessMethod", getMaterialProcessMethod())
+            .append("materialModel", getMaterialModel())
+            .append("materialSpecification", getMaterialSpecification())
+            .append("materialSum", getMaterialSum())
+            .append("enterpriseSum", getEnterpriseSum())
+            .append("makeNum", getMakeNum())
+            .append("outOrderSum", getOutOrderSum())
+            .append("hasOutOrderSum", getHasOutOrderSum())
+            .append("applyOutOrderSum", getApplyOutOrderSum())
+            .append("prepareOutOrderSum", getPrepareOutOrderSum())
+            .append("actualOutOrderSum", getActualOutOrderSum())
+            .append("outOrderName", getOutOrderName())
+            .append("outOrderTime", getOutOrderTime())
+            .append("supplierCode", getSupplierCode())
+            .append("supplierName", getSupplierName())
+            .append("customerId", getCustomerId())
+            .append("customerName", getCustomerName())
+            .append("planDeliveryTime", getPlanDeliveryTime())
+            .append("deliveryDate", getDeliveryDate())
+            .append("deliveryCondition", getDeliveryCondition())
+            .append("applyName", getApplyName())
+            .append("deliveryAddress", getDeliveryAddress())
+            .append("deliveryName", getDeliveryName())
+            .append("deliveryNumber", getDeliveryNumber())
+            .append("remark", getRemark())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseOutOrderDetailMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.warehouse.mapper;
+
+import java.util.List;
+import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
+
+/**
+ * 出库单详情Mapper接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-06-04
+ */
+public interface WarehouseOutOrderDetailMapper 
+{
+    /**
+     * 查询出库单详情
+     * 
+     * @param outOrderDetailId 出库单详情ID
+     * @return 出库单详情
+     */
+    public WarehouseOutOrderDetail selectWarehouseOutOrderDetailById(Long outOrderDetailId);
+
+    /**
+     * 查询出库单详情列表
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 出库单详情集合
+     */
+    public List<WarehouseOutOrderDetail> selectWarehouseOutOrderDetailList(WarehouseOutOrderDetail warehouseOutOrderDetail);
+
+    /**
+     * 新增出库单详情
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 结果
+     */
+    public int insertWarehouseOutOrderDetail(WarehouseOutOrderDetail warehouseOutOrderDetail);
+
+    /**
+     * 修改出库单详情
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 结果
+     */
+    public int updateWarehouseOutOrderDetail(WarehouseOutOrderDetail warehouseOutOrderDetail);
+
+    /**
+     * 删除出库单详情
+     * 
+     * @param outOrderDetailId 出库单详情ID
+     * @return 结果
+     */
+    public int deleteWarehouseOutOrderDetailById(Long outOrderDetailId);
+
+    /**
+     * 批量删除出库单详情
+     * 
+     * @param outOrderDetailIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteWarehouseOutOrderDetailByIds(String[] outOrderDetailIds);
+
+    /**
+     * 作废出库单详情
+     *
+     * @param outOrderDetailId 出库单详情ID
+     * @return 结果
+     */
+    public int cancelWarehouseOutOrderDetailById(Long outOrderDetailId);
+
+    /**
+     * 恢复出库单详情
+     *
+     * @param outOrderDetailId 出库单详情ID
+     * @return 结果
+     */
+    public int restoreWarehouseOutOrderDetailById(Long outOrderDetailId);
+}

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseOutOrderDetailService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.warehouse.service;
+
+import java.util.List;
+import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
+
+/**
+ * 出库单详情Service接口
+ * 
+ * @author 刘晓旭
+ * @date 2024-06-04
+ */
+public interface IWarehouseOutOrderDetailService 
+{
+    /**
+     * 查询出库单详情
+     * 
+     * @param outOrderDetailId 出库单详情ID
+     * @return 出库单详情
+     */
+    public WarehouseOutOrderDetail selectWarehouseOutOrderDetailById(Long outOrderDetailId);
+
+    /**
+     * 查询出库单详情列表
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 出库单详情集合
+     */
+    public List<WarehouseOutOrderDetail> selectWarehouseOutOrderDetailList(WarehouseOutOrderDetail warehouseOutOrderDetail);
+
+    /**
+     * 新增出库单详情
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 结果
+     */
+    public int insertWarehouseOutOrderDetail(WarehouseOutOrderDetail warehouseOutOrderDetail);
+
+    /**
+     * 修改出库单详情
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 结果
+     */
+    public int updateWarehouseOutOrderDetail(WarehouseOutOrderDetail warehouseOutOrderDetail);
+
+    /**
+     * 批量删除出库单详情
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteWarehouseOutOrderDetailByIds(String ids);
+
+    /**
+     * 删除出库单详情信息
+     * 
+     * @param outOrderDetailId 出库单详情ID
+     * @return 结果
+     */
+    public int deleteWarehouseOutOrderDetailById(Long outOrderDetailId);
+
+    /**
+     * 作废出库单详情
+     * @param outOrderDetailId 出库单详情ID
+     * @return
+     */
+    int cancelWarehouseOutOrderDetailById(Long outOrderDetailId);
+
+    /**
+     * 恢复出库单详情
+     * @param outOrderDetailId 出库单详情ID
+     * @return
+     */
+    int restoreWarehouseOutOrderDetailById(Long outOrderDetailId);
+}

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseOutOrderDetailServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.warehouse.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.warehouse.mapper.WarehouseOutOrderDetailMapper;
+import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
+import com.ruoyi.warehouse.service.IWarehouseOutOrderDetailService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 出库单详情Service业务层处理
+ * 
+ * @author 刘晓旭
+ * @date 2024-06-04
+ */
+@Service
+public class WarehouseOutOrderDetailServiceImpl implements IWarehouseOutOrderDetailService 
+{
+    @Autowired
+    private WarehouseOutOrderDetailMapper warehouseOutOrderDetailMapper;
+
+    /**
+     * 查询出库单详情
+     * 
+     * @param outOrderDetailId 出库单详情ID
+     * @return 出库单详情
+     */
+    @Override
+    public WarehouseOutOrderDetail selectWarehouseOutOrderDetailById(Long outOrderDetailId)
+    {
+        return warehouseOutOrderDetailMapper.selectWarehouseOutOrderDetailById(outOrderDetailId);
+    }
+
+    /**
+     * 查询出库单详情列表
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 出库单详情
+     */
+    @Override
+    public List<WarehouseOutOrderDetail> selectWarehouseOutOrderDetailList(WarehouseOutOrderDetail warehouseOutOrderDetail)
+    {
+        return warehouseOutOrderDetailMapper.selectWarehouseOutOrderDetailList(warehouseOutOrderDetail);
+    }
+
+    /**
+     * 新增出库单详情
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 结果
+     */
+    @Override
+    public int insertWarehouseOutOrderDetail(WarehouseOutOrderDetail warehouseOutOrderDetail)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        warehouseOutOrderDetail.setCreateBy(loginName);
+        warehouseOutOrderDetail.setCreateTime(DateUtils.getNowDate());
+        return warehouseOutOrderDetailMapper.insertWarehouseOutOrderDetail(warehouseOutOrderDetail);
+    }
+
+    /**
+     * 修改出库单详情
+     * 
+     * @param warehouseOutOrderDetail 出库单详情
+     * @return 结果
+     */
+    @Override
+    public int updateWarehouseOutOrderDetail(WarehouseOutOrderDetail warehouseOutOrderDetail)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        warehouseOutOrderDetail.setUpdateBy(loginName);
+        warehouseOutOrderDetail.setUpdateTime(DateUtils.getNowDate());
+        return warehouseOutOrderDetailMapper.updateWarehouseOutOrderDetail(warehouseOutOrderDetail);
+    }
+
+    /**
+     * 删除出库单详情对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteWarehouseOutOrderDetailByIds(String ids)
+    {
+        return warehouseOutOrderDetailMapper.deleteWarehouseOutOrderDetailByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除出库单详情信息
+     * 
+     * @param outOrderDetailId 出库单详情ID
+     * @return 结果
+     */
+    @Override
+    public int deleteWarehouseOutOrderDetailById(Long outOrderDetailId)
+    {
+        return warehouseOutOrderDetailMapper.deleteWarehouseOutOrderDetailById(outOrderDetailId);
+    }
+
+    /**
+     * 作废出库单详情
+     *
+     * @param outOrderDetailId 出库单详情ID
+     * @return 结果
+     */
+    @Override
+    public int cancelWarehouseOutOrderDetailById(Long outOrderDetailId)
+    {
+        return warehouseOutOrderDetailMapper.cancelWarehouseOutOrderDetailById(outOrderDetailId);
+    }
+
+    /**
+     * 恢复出库单详情信息
+     *
+     * @param outOrderDetailId 出库单详情ID
+     * @return 结果
+     */
+    @Override
+    public int restoreWarehouseOutOrderDetailById(Long outOrderDetailId)
+    {
+        return warehouseOutOrderDetailMapper.restoreWarehouseOutOrderDetailById(outOrderDetailId);
+    }
+}

ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseOutOrderDetailMapper.xml

@@ -0,0 +1,256 @@
+<?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.warehouse.mapper.WarehouseOutOrderDetailMapper">
+    
+    <resultMap type="WarehouseOutOrderDetail" id="WarehouseOutOrderDetailResult">
+        <result property="outOrderDetailId"    column="out_order_detail_id"    />
+        <result property="outOrderCode"    column="out_order_code"    />
+        <result property="makeNo"    column="make_no"    />
+        <result property="warehouseOutStatus"    column="warehouse_out_status"    />
+        <result property="relatedOrderCode"    column="related_order_code"    />
+        <result property="salesOrderCode"    column="sales_order_code"    />
+        <result property="warehouseOrderType"    column="warehouse_order_type"    />
+        <result property="outMakeCode"    column="out_make_code"    />
+        <result property="requisitioningCode"    column="requisitioning_code"    />
+        <result property="warehouseOutType"    column="warehouse_out_type"    />
+        <result property="businessName"    column="business_name"    />
+        <result property="aftersalesName"    column="aftersales_name"    />
+        <result property="warehouseName"    column="warehouse_name"    />
+        <result property="shippingDeviceId"    column="shipping_device_id"    />
+        <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="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="materialModel"    column="material_model"    />
+        <result property="materialSpecification"    column="material_specification"    />
+        <result property="materialSum"    column="material_sum"    />
+        <result property="enterpriseSum"    column="enterprise_sum"    />
+        <result property="makeNum"    column="make_num"    />
+        <result property="outOrderSum"    column="out_order_sum"    />
+        <result property="hasOutOrderSum"    column="has_out_order_sum"    />
+        <result property="applyOutOrderSum"    column="apply_out_order_sum"    />
+        <result property="prepareOutOrderSum"    column="prepare_out_order_sum"    />
+        <result property="actualOutOrderSum"    column="actual_out_order_sum"    />
+        <result property="outOrderName"    column="out_order_name"    />
+        <result property="outOrderTime"    column="out_order_time"    />
+        <result property="supplierCode"    column="supplier_code"    />
+        <result property="supplierName"    column="supplier_name"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="planDeliveryTime"    column="plan_delivery_time"    />
+        <result property="deliveryDate"    column="delivery_date"    />
+        <result property="deliveryCondition"    column="delivery_condition"    />
+        <result property="applyName"    column="apply_name"    />
+        <result property="deliveryAddress"    column="delivery_address"    />
+        <result property="deliveryName"    column="delivery_name"    />
+        <result property="deliveryNumber"    column="delivery_number"    />
+        <result property="remark"    column="remark"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectWarehouseOutOrderDetailVo">
+        select out_order_detail_id, out_order_code, make_no, warehouse_out_status, related_order_code, sales_order_code, warehouse_order_type, out_make_code, requisitioning_code, warehouse_out_type, business_name, aftersales_name, warehouse_name, shipping_device_id, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_model, material_specification, material_sum, enterprise_sum, make_num, out_order_sum, has_out_order_sum, apply_out_order_sum, prepare_out_order_sum, actual_out_order_sum, out_order_name, out_order_time, supplier_code, supplier_name, customer_id, customer_name, plan_delivery_time, delivery_date, delivery_condition, apply_name, delivery_address, delivery_name, delivery_number, remark, create_by, create_time, update_by, update_time from warehouse_out_order_detail
+    </sql>
+
+    <select id="selectWarehouseOutOrderDetailList" parameterType="WarehouseOutOrderDetail" resultMap="WarehouseOutOrderDetailResult">
+        <include refid="selectWarehouseOutOrderDetailVo"/>
+        <where>  
+        </where>
+    </select>
+    
+    <select id="selectWarehouseOutOrderDetailById" parameterType="Long" resultMap="WarehouseOutOrderDetailResult">
+        <include refid="selectWarehouseOutOrderDetailVo"/>
+        where out_order_detail_id = #{outOrderDetailId}
+    </select>
+        
+    <insert id="insertWarehouseOutOrderDetail" parameterType="WarehouseOutOrderDetail" useGeneratedKeys="true" keyProperty="outOrderDetailId">
+        insert into warehouse_out_order_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="outOrderCode != null">out_order_code,</if>
+            <if test="makeNo != null">make_no,</if>
+            <if test="warehouseOutStatus != null">warehouse_out_status,</if>
+            <if test="relatedOrderCode != null">related_order_code,</if>
+            <if test="salesOrderCode != null">sales_order_code,</if>
+            <if test="warehouseOrderType != null">warehouse_order_type,</if>
+            <if test="outMakeCode != null">out_make_code,</if>
+            <if test="requisitioningCode != null">requisitioning_code,</if>
+            <if test="warehouseOutType != null">warehouse_out_type,</if>
+            <if test="businessName != null">business_name,</if>
+            <if test="aftersalesName != null">aftersales_name,</if>
+            <if test="warehouseName != null">warehouse_name,</if>
+            <if test="shippingDeviceId != null">shipping_device_id,</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="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="materialModel != null">material_model,</if>
+            <if test="materialSpecification != null">material_specification,</if>
+            <if test="materialSum != null">material_sum,</if>
+            <if test="enterpriseSum != null">enterprise_sum,</if>
+            <if test="makeNum != null">make_num,</if>
+            <if test="outOrderSum != null">out_order_sum,</if>
+            <if test="hasOutOrderSum != null">has_out_order_sum,</if>
+            <if test="applyOutOrderSum != null">apply_out_order_sum,</if>
+            <if test="prepareOutOrderSum != null">prepare_out_order_sum,</if>
+            <if test="actualOutOrderSum != null">actual_out_order_sum,</if>
+            <if test="outOrderName != null">out_order_name,</if>
+            <if test="outOrderTime != null">out_order_time,</if>
+            <if test="supplierCode != null">supplier_code,</if>
+            <if test="supplierName != null">supplier_name,</if>
+            <if test="customerId != null">customer_id,</if>
+            <if test="customerName != null">customer_name,</if>
+            <if test="planDeliveryTime != null">plan_delivery_time,</if>
+            <if test="deliveryDate != null">delivery_date,</if>
+            <if test="deliveryCondition != null">delivery_condition,</if>
+            <if test="applyName != null">apply_name,</if>
+            <if test="deliveryAddress != null">delivery_address,</if>
+            <if test="deliveryName != null">delivery_name,</if>
+            <if test="deliveryNumber != null">delivery_number,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="outOrderCode != null">#{outOrderCode},</if>
+            <if test="makeNo != null">#{makeNo},</if>
+            <if test="warehouseOutStatus != null">#{warehouseOutStatus},</if>
+            <if test="relatedOrderCode != null">#{relatedOrderCode},</if>
+            <if test="salesOrderCode != null">#{salesOrderCode},</if>
+            <if test="warehouseOrderType != null">#{warehouseOrderType},</if>
+            <if test="outMakeCode != null">#{outMakeCode},</if>
+            <if test="requisitioningCode != null">#{requisitioningCode},</if>
+            <if test="warehouseOutType != null">#{warehouseOutType},</if>
+            <if test="businessName != null">#{businessName},</if>
+            <if test="aftersalesName != null">#{aftersalesName},</if>
+            <if test="warehouseName != null">#{warehouseName},</if>
+            <if test="shippingDeviceId != null">#{shippingDeviceId},</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="materialBrand != null">#{materialBrand},</if>
+            <if test="materialUnit != null">#{materialUnit},</if>
+            <if test="materialDescribe != null">#{materialDescribe},</if>
+            <if test="materialProcessMethod != null">#{materialProcessMethod},</if>
+            <if test="materialModel != null">#{materialModel},</if>
+            <if test="materialSpecification != null">#{materialSpecification},</if>
+            <if test="materialSum != null">#{materialSum},</if>
+            <if test="enterpriseSum != null">#{enterpriseSum},</if>
+            <if test="makeNum != null">#{makeNum},</if>
+            <if test="outOrderSum != null">#{outOrderSum},</if>
+            <if test="hasOutOrderSum != null">#{hasOutOrderSum},</if>
+            <if test="applyOutOrderSum != null">#{applyOutOrderSum},</if>
+            <if test="prepareOutOrderSum != null">#{prepareOutOrderSum},</if>
+            <if test="actualOutOrderSum != null">#{actualOutOrderSum},</if>
+            <if test="outOrderName != null">#{outOrderName},</if>
+            <if test="outOrderTime != null">#{outOrderTime},</if>
+            <if test="supplierCode != null">#{supplierCode},</if>
+            <if test="supplierName != null">#{supplierName},</if>
+            <if test="customerId != null">#{customerId},</if>
+            <if test="customerName != null">#{customerName},</if>
+            <if test="planDeliveryTime != null">#{planDeliveryTime},</if>
+            <if test="deliveryDate != null">#{deliveryDate},</if>
+            <if test="deliveryCondition != null">#{deliveryCondition},</if>
+            <if test="applyName != null">#{applyName},</if>
+            <if test="deliveryAddress != null">#{deliveryAddress},</if>
+            <if test="deliveryName != null">#{deliveryName},</if>
+            <if test="deliveryNumber != null">#{deliveryNumber},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateWarehouseOutOrderDetail" parameterType="WarehouseOutOrderDetail">
+        update warehouse_out_order_detail
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
+            <if test="makeNo != null">make_no = #{makeNo},</if>
+            <if test="warehouseOutStatus != null">warehouse_out_status = #{warehouseOutStatus},</if>
+            <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
+            <if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
+            <if test="outMakeCode != null">out_make_code = #{outMakeCode},</if>
+            <if test="requisitioningCode != null">requisitioning_code = #{requisitioningCode},</if>
+            <if test="warehouseOutType != null">warehouse_out_type = #{warehouseOutType},</if>
+            <if test="businessName != null">business_name = #{businessName},</if>
+            <if test="aftersalesName != null">aftersales_name = #{aftersalesName},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</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="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="materialModel != null">material_model = #{materialModel},</if>
+            <if test="materialSpecification != null">material_specification = #{materialSpecification},</if>
+            <if test="materialSum != null">material_sum = #{materialSum},</if>
+            <if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
+            <if test="makeNum != null">make_num = #{makeNum},</if>
+            <if test="outOrderSum != null">out_order_sum = #{outOrderSum},</if>
+            <if test="hasOutOrderSum != null">has_out_order_sum = #{hasOutOrderSum},</if>
+            <if test="applyOutOrderSum != null">apply_out_order_sum = #{applyOutOrderSum},</if>
+            <if test="prepareOutOrderSum != null">prepare_out_order_sum = #{prepareOutOrderSum},</if>
+            <if test="actualOutOrderSum != null">actual_out_order_sum = #{actualOutOrderSum},</if>
+            <if test="outOrderName != null">out_order_name = #{outOrderName},</if>
+            <if test="outOrderTime != null">out_order_time = #{outOrderTime},</if>
+            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="planDeliveryTime != null">plan_delivery_time = #{planDeliveryTime},</if>
+            <if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
+            <if test="deliveryCondition != null">delivery_condition = #{deliveryCondition},</if>
+            <if test="applyName != null">apply_name = #{applyName},</if>
+            <if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
+            <if test="deliveryName != null">delivery_name = #{deliveryName},</if>
+            <if test="deliveryNumber != null">delivery_number = #{deliveryNumber},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where out_order_detail_id = #{outOrderDetailId}
+    </update>
+
+    <delete id="deleteWarehouseOutOrderDetailById" parameterType="Long">
+        delete from warehouse_out_order_detail where out_order_detail_id = #{outOrderDetailId}
+    </delete>
+
+    <delete id="deleteWarehouseOutOrderDetailByIds" parameterType="String">
+        delete from warehouse_out_order_detail where out_order_detail_id in 
+        <foreach item="outOrderDetailId" collection="array" open="(" separator="," close=")">
+            #{outOrderDetailId}
+        </foreach>
+    </delete>
+
+    <update id="cancelWarehouseOutOrderDetailById" parameterType="Long">
+        update warehouse_out_order_detail set del_flag = '1' where out_order_detail_id = #{outOrderDetailId}
+    </update>
+
+    <update id="restoreWarehouseOutOrderDetailById" parameterType="Long">
+        update warehouse_out_order_detail set del_flag = '0' where out_order_detail_id = #{outOrderDetailId}
+    </update>
+
+</mapper>