[fix] 生产管理 品质管理 仓库管理

品质单新增委内加工费总价字段
修改品质单的插入查询接口、接口和修改接口
品质单详情新增委内加工费单价字段
修改品质单详情的插入查询接口、接口和修改接口
仓库入库单新增委内加工费总价字段
修改仓库入库单的插入查询接口、接口和修改接口
仓库入库单详情新增委内加工费单价字段
修改仓库入库单详情的插入查询接口、接口和修改接口
修改创建委内加工入库单的方法：新增筛选前端只有委内完成数大于0的数据才能加入到品质单中；新增筛选前传入的众多数据中只保存加工方式为委内加工的数据；

ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpInboundOrderServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ruoyi.erp.service.impl;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -31,6 +33,7 @@ import com.ruoyi.system.domain.SysSalesOrderChild;
 import com.ruoyi.system.mapper.SysMakeorderBomMapper;
 import com.ruoyi.system.mapper.SysSalesOrderChildMapper;
 import com.ruoyi.warehouse.domain.WarehouseOutOrderDetail;
+import com.ruoyi.warehouse.domain.WarehouseStorageOrderDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.erp.mapper.ErpInboundOrderMapper;
@@ -132,15 +135,49 @@ public class ErpInboundOrderServiceImpl implements IErpInboundOrderService
         qualityOrder.setCreateTime(new Date());
         qualityOrder.setCreateBy(loginName);
 
+
+
+        // 获取所有makeorderBomId对应的SysMakeorderBom对象
         List<SysMakeorderBom> sysMakeorderBoms = erpInboundOrder.getInboundDetails().stream()
                 .map(ErpInboundOrderDetail::getMakeorderBomId)
                 .map(this::getSysMakeorderBomById)
                 .collect(Collectors.toList());
 
+        // 筛选加工方式只有委内加工的数据
+        List<SysMakeorderBom> filterSysMakeorderBoms = sysMakeorderBoms.stream()
+                .filter(sysMakeorderBom -> "1".equals(sysMakeorderBom.getProcessMethod()))
+                .collect(Collectors.toList());
+
+        // 创建一个Set来存储filterSysMakeorderBoms中的所有物料号MaterialNo
+        Set<String> materialNoSet = filterSysMakeorderBoms.stream()
+                .map(SysMakeorderBom::getMaterialNo)
+                .collect(Collectors.toSet());
+
+        // 使用materialNoSet来过滤erpInboundOrder.getInboundDetails()
+        List<ErpInboundOrderDetail> filteredErpInboundOrderDetails = erpInboundOrder.getInboundDetails().stream()
+                .filter(detail -> materialNoSet.contains(detail.getMaterialNo()) && detail.getCurrentNum() != null)
+                .collect(Collectors.toList());
+
+
+
+        BigDecimal makeInTotalPrice = BigDecimal.ZERO;
+        //计算委内数据的加工费总价
+        boolean hasMakeInTotalPriceNull = filteredErpInboundOrderDetails.stream()
+                .anyMatch(item -> item.getProcessFeeUnitPrice() == null);
+
+        if (hasMakeInTotalPriceNull) {
+            throw new BusinessException("存在委内加工费为空，请检查！");
+        }
+        // 计算各个字段的总和
+        makeInTotalPrice = filteredErpInboundOrderDetails.stream()
+                .map(ErpInboundOrderDetail::getProcessFeeUnitPrice)
+                        .reduce(BigDecimal.ZERO,BigDecimal::add);
+        //加入到品质单中
+        qualityOrder.setMakeInTotalPrice(makeInTotalPrice);
         //添加委内加工品质单详情数据
-        addQualityOrderDetail(erpInboundOrder,qualityOrderCode,sysMakeorderBoms);
+        addQualityOrderDetail(erpInboundOrder, filteredErpInboundOrderDetails,qualityOrderCode,filterSysMakeorderBoms);
         //添加委内加工品质单报告数据
-        addQualityOrderReport(erpInboundOrder,qualityOrderCode,sysMakeorderBoms);
+        addQualityOrderReport(filteredErpInboundOrderDetails,qualityOrderCode,filterSysMakeorderBoms);
 
         //插入品质单
         return qualityOrderMapper.insertQualityOrder(qualityOrder);
@@ -152,13 +189,13 @@ public class ErpInboundOrderServiceImpl implements IErpInboundOrderService
     }
 
     //添加委内加工品质单报告数据
-    private void addQualityOrderReport(ErpInboundOrder erpInboundOrder,String qualityOrderCode,List<SysMakeorderBom> sysMakeorderBoms) {
-        List<ErpInboundOrderDetail> inboundDetails = erpInboundOrder.getInboundDetails();
-        if (CollectionUtils.isEmpty(inboundDetails)) {
-            throw new BusinessException("委内加工详情数据为空");
-        }
-        for (int i = 0; i < inboundDetails.size(); i++) {
-            ErpInboundOrderDetail inboundDetail = inboundDetails.get(i);
+    private void addQualityOrderReport(List<ErpInboundOrderDetail> filteredErpInboundOrderDetails,String qualityOrderCode,List<SysMakeorderBom> sysMakeorderBoms) {
+//        List<ErpInboundOrderDetail> inboundDetails = erpInboundOrder.getInboundDetails();
+//        if (CollectionUtils.isEmpty(inboundDetails)) {
+//            throw new BusinessException("委内加工详情数据为空");
+//        }
+        for (int i = 0; i < filteredErpInboundOrderDetails.size(); i++) {
+            ErpInboundOrderDetail inboundDetail = filteredErpInboundOrderDetails.get(i);
             SysMakeorderBom sysMakeorderBom = sysMakeorderBoms.get(i);
             QualityOrderReport qualityOrderReport = new QualityOrderReport();
             qualityOrderReport.setQualityOrderCode(qualityOrderCode);
@@ -187,13 +224,13 @@ public class ErpInboundOrderServiceImpl implements IErpInboundOrderService
     }
 
     //添加委内加工品质单详情数据
-    private void addQualityOrderDetail(ErpInboundOrder erpInboundOrder,String qualityOrderCode,List<SysMakeorderBom> sysMakeorderBoms) {
-        List<ErpInboundOrderDetail> inboundDetails = erpInboundOrder.getInboundDetails();
-        if (CollectionUtils.isEmpty(inboundDetails)) {
-            throw new BusinessException("委内加工详情数据为空");
-        }
-        for (int i = 0; i < inboundDetails.size(); i++) {
-            ErpInboundOrderDetail inboundDetail = inboundDetails.get(i);
+    private void addQualityOrderDetail(ErpInboundOrder erpInboundOrder,List<ErpInboundOrderDetail> filteredErpInboundOrderDetails,String qualityOrderCode,List<SysMakeorderBom> sysMakeorderBoms) {
+//        List<ErpInboundOrderDetail> inboundDetails = erpInboundOrder.getInboundDetails();
+//        if (CollectionUtils.isEmpty(inboundDetails)) {
+//            throw new BusinessException("委内加工详情数据为空");
+//        }
+        for (int i = 0; i < filteredErpInboundOrderDetails.size(); i++) {
+            ErpInboundOrderDetail inboundDetail = filteredErpInboundOrderDetails.get(i);
             SysMakeorderBom sysMakeorderBom = sysMakeorderBoms.get(i);
 
             QualityOrderDetail qualityOrderDetail = new QualityOrderDetail();
@@ -221,6 +258,8 @@ public class ErpInboundOrderServiceImpl implements IErpInboundOrderService
                 qualityOrderDetail.setMaterialType(sysMakeorderBom.getMaterialType());
                 //添加委内已完成数
                 qualityOrderDetail.setMakeInNum(Math.toIntExact(inboundDetail.getCurrentNum()));
+                //添加委内加工费单价
+                qualityOrderDetail.setMakeInUnitPrice(inboundDetail.getProcessFeeUnitPrice());
                 qualityOrderDetail.setCreateBy(ShiroUtils.getLoginName());
                 qualityOrderDetail.setCreateTime(new Date());
                 qualityOrderDetailMapper.insertQualityOrderDetail(qualityOrderDetail);

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrder.java

@@ -1,5 +1,6 @@
 package com.ruoyi.quality.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -58,6 +59,9 @@ public class QualityOrder extends BaseEntity
     @Excel(name = "品质不合格数")
     private Integer qualityUnqualifiedNum;
 
+    /** 委内加工费总价 */
+    private BigDecimal makeInTotalPrice;
+
     /** 仓库Id */
     @Excel(name = "仓库Id")
     private String warehouseCode;
@@ -168,6 +172,15 @@ public class QualityOrder extends BaseEntity
     {
         return qualityUnqualifiedNum;
     }
+
+    public BigDecimal getMakeInTotalPrice() {
+        return makeInTotalPrice;
+    }
+
+    public void setMakeInTotalPrice(BigDecimal makeInTotalPrice) {
+        this.makeInTotalPrice = makeInTotalPrice;
+    }
+
     public void setDeliveryInspectionTime(Date deliveryInspectionTime)
     {
         this.deliveryInspectionTime = deliveryInspectionTime;
@@ -224,6 +237,7 @@ public class QualityOrder extends BaseEntity
             .append("thisArrivedNum", getThisArrivedNum())
             .append("qualityQualifiedNum", getQualityQualifiedNum())
             .append("qualityUnqualifiedNum", getQualityUnqualifiedNum())
+            .append("makeInTotalPrice",getMakeInTotalPrice())
             .append("deliveryInspectionTime", getDeliveryInspectionTime())
             .append("qualityEmployee", getQualityEmployee())
             .append("warehouseCode", getWarehouseCode())

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderDetail.java

@@ -1,5 +1,6 @@
 package com.ruoyi.quality.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -142,6 +143,10 @@ public class QualityOrderDetail extends BaseEntity
     private Integer makeInNum;
 
 
+    /** 委内加工费单价 */
+    private BigDecimal makeInUnitPrice;
+
+
     public void setQualityOrderDetailId(Long qualityOrderDetailId) 
     {
         this.qualityOrderDetailId = qualityOrderDetailId;
@@ -405,6 +410,14 @@ public class QualityOrderDetail extends BaseEntity
         this.makeInNum = makeInNum;
     }
 
+    public BigDecimal getMakeInUnitPrice() {
+        return makeInUnitPrice;
+    }
+
+    public void setMakeInUnitPrice(BigDecimal makeInUnitPrice) {
+        this.makeInUnitPrice = makeInUnitPrice;
+    }
+
     public String getMaterialDeptType() {
         return materialDeptType;
     }
@@ -447,6 +460,7 @@ public class QualityOrderDetail extends BaseEntity
             .append("qualityQualifiedNum", getQualityQualifiedNum())
             .append("qualityUnqualifiedNum", getQualityUnqualifiedNum())
             .append("makeInNum",getMakeInNum())
+            .append("makeInUnitPrice",getMakeInUnitPrice())
             .append("remark", getRemark())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())

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

@@ -1,5 +1,6 @@
 package com.ruoyi.warehouse.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -80,6 +81,10 @@ public class WarehouseStorageOrder extends BaseEntity
     @Excel(name = "入库数量")
     private Integer storageNum;
 
+
+    /** 委内加工费总价 */
+    private BigDecimal makeInTotalPrice;
+
     /** 到货时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "到货时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -259,6 +264,15 @@ public class WarehouseStorageOrder extends BaseEntity
     {
         return storageNum;
     }
+
+    public BigDecimal getMakeInTotalPrice() {
+        return makeInTotalPrice;
+    }
+
+    public void setMakeInTotalPrice(BigDecimal makeInTotalPrice) {
+        this.makeInTotalPrice = makeInTotalPrice;
+    }
+
     public void setArrivedTime(Date arrivedTime)
     {
         this.arrivedTime = arrivedTime;
@@ -366,6 +380,7 @@ public class WarehouseStorageOrder extends BaseEntity
             .append("qualityQualifiedNum", getQualityQualifiedNum())
             .append("qualityUnqualifiedNum", getQualityUnqualifiedNum())
             .append("storageNum", getStorageNum())
+            .append("makeInTotalPrice",getMakeInTotalPrice())
             .append("arrivedTime", getArrivedTime())
             .append("temporaryTime", getTemporaryTime())
             .append("deliveryInspectionTime", getDeliveryInspectionTime())

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

@@ -1,5 +1,6 @@
 package com.ruoyi.warehouse.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -172,6 +173,10 @@ public class WarehouseStorageOrderDetail extends BaseEntity
     @Excel(name = "退换货数")
     private Integer refundsExchangesNum;
 
+
+    /** 委内加工费单价 */
+    private BigDecimal makeInUnitPrice;
+
     /** 到货时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "到货时间", width = 30, dateFormat = "yyyy-MM-dd")
@@ -706,6 +711,14 @@ public class WarehouseStorageOrderDetail extends BaseEntity
         this.customerCompanyAddress = customerCompanyAddress;
     }
 
+    public BigDecimal getMakeInUnitPrice() {
+        return makeInUnitPrice;
+    }
+
+    public void setMakeInUnitPrice(BigDecimal makeInUnitPrice) {
+        this.makeInUnitPrice = makeInUnitPrice;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -766,6 +779,7 @@ public class WarehouseStorageOrderDetail extends BaseEntity
             .append("createBy", getCreateBy())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("makeInUnitPrice",getMakeInUnitPrice())
             .toString();
     }
 }

ruoyi-admin/src/main/resources/mapper/quality/QualityOrderDetailMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qualityQualifiedNum"    column="quality_qualified_num"    />
         <result property="qualityUnqualifiedNum"    column="quality_unqualified_num"    />
         <result property="makeInNum"    column="make_in_num"    />
+        <result property="makeInUnitPrice"                 column="make_in_unit_price"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -44,7 +45,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQualityOrderDetailVo">
-        select quality_order_detail_id, quality_order_code, in_storage_code, related_order_code, quality_status, quality_order_type, quality_storage_status, delivery_inspection_time, warehouse_code, warehouse_name, supplier_code, supplier_name, customer_contact, contact_number, supplier_address, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_dept_type ,make_total, actual_arrive_num, this_arrived_num, quality_hasqualified_num, quality_qualified_num, quality_unqualified_num, make_in_num, remark, create_by, create_time, update_by, update_time from quality_order_detail
+        select quality_order_detail_id,
+               quality_order_code,
+               in_storage_code,
+               related_order_code,
+               quality_status,
+               quality_order_type,
+               quality_storage_status,
+               delivery_inspection_time,
+               warehouse_code,
+               warehouse_name,
+               supplier_code,
+               supplier_name,
+               customer_contact,
+               contact_number,
+               supplier_address,
+               material_no,
+               material_name,
+               material_type,
+               material_photoUrl,
+               material_brand,
+               material_unit,
+               material_describe,
+               material_process_method,
+               material_dept_type,
+               make_total,
+               actual_arrive_num,
+               this_arrived_num,
+               quality_hasqualified_num,
+               quality_qualified_num,
+               quality_unqualified_num,
+               make_in_num,
+               make_in_unit_price,
+               remark,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from quality_order_detail
     </sql>
 
     <select id="selectQualityOrderDetailList" parameterType="QualityOrderDetail" resultMap="QualityOrderDetailResult">
@@ -122,6 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityQualifiedNum != null">quality_qualified_num,</if>
             <if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if>
             <if test="makeInNum != null">make_in_num,</if>
+            <if test="makeInUnitPrice != null">make_in_unit_price,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -159,6 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
             <if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if>
             <if test="makeInNum != null">#{makeInNum},</if>
+            <if test="makeInUnitPrice != null">#{makeInUnitPrice},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -200,6 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
             <if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
             <if test="makeInNum != null">make_in_num = #{makeInNum},</if>
+            <if test="makeInUnitPrice != null">make_in_unit_price= #{makeInUnitPrice},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

ruoyi-admin/src/main/resources/mapper/quality/QualityOrderMapper.xml

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="thisArrivedNum"    column="this_arrived_num"    />
         <result property="qualityQualifiedNum"    column="quality_qualified_num"    />
         <result property="qualityUnqualifiedNum"    column="quality_unqualified_num"    />
+        <result property="makeInTotalPrice"                 column="make_in_total_price"    />
         <result property="deliveryInspectionTime"    column="delivery_inspection_time"    />
         <result property="qualityEmployee"    column="quality_employee"    />
         <result property="warehouseCode"    column="warehouse_code"    />
@@ -27,7 +28,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQualityOrderVo">
-        select quality_order_id, quality_order_code, in_storage_code, related_order_code, quality_status, quality_order_type, quality_storage_status, this_arrived_num, quality_qualified_num, quality_unqualified_num, warehouse_code, warehouse_name,delivery_inspection_time, quality_employee, remark, create_by, create_time, update_by, update_time from quality_order
+        select quality_order_id,
+               quality_order_code,
+               in_storage_code,
+               related_order_code,
+               quality_status,
+               quality_order_type,
+               quality_storage_status,
+               this_arrived_num,
+               quality_qualified_num,
+               quality_unqualified_num,
+               warehouse_code,
+               warehouse_name,
+               delivery_inspection_time,
+               quality_employee,
+               remark,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               make_in_total_price
+        from quality_order
     </sql>
 
     <select id="selectQualityOrderList" parameterType="QualityOrder" resultMap="QualityOrderResult">
@@ -67,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisArrivedNum != null">this_arrived_num,</if>
             <if test="qualityQualifiedNum != null">quality_qualified_num,</if>
             <if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if>
+            <if test="makeInTotalPrice != null">make_in_total_price,</if>
             <if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
             <if test="qualityEmployee != null">quality_employee,</if>
             <if test="warehouseCode != null">warehouse_code,</if>
@@ -87,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisArrivedNum != null">#{thisArrivedNum},</if>
             <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
             <if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if>
+            <if test="makeInTotalPrice != null">#{makeInTotalPrice},</if>
             <if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
             <if test="qualityEmployee != null">#{qualityEmployee},</if>
             <if test="warehouseCode != null">#{warehouseCode},</if>
@@ -111,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="thisArrivedNum != null">this_arrived_num = #{thisArrivedNum},</if>
             <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
             <if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
+            <if test="makeInTotalPrice != null">make_in_total_price = #{makeInTotalPrice},</if>
             <if test="deliveryInspectionTime != null">delivery_inspection_time = #{deliveryInspectionTime},</if>
             <if test="qualityEmployee != null">quality_employee = #{qualityEmployee},</if>
             <if test="warehouseCode != null">warehouse_code = #{warehouseCode},</if>

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

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="temporaryQualifiedNum"    column="temporary_qualified_num"    />
         <result property="hasStorageNum"    column="has_storage_num"    />
         <result property="storageNum"    column="storage_num"    />
+        <result property="makeInUnitPrice"                 column="make_in_unit_price"    />
         <result property="makeStorageNum"    column="make_storage_num"    />
         <result property="qualityHasQualifiedNum"    column="quality_has_qualified_num"    />
         <result property="qualityQualifiedNum"    column="quality_qualified_num"    />
@@ -65,7 +66,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWarehouseStorageOrderDetailVo">
-        select warehouse_storage_detail_id, warehouse_storage_code, related_order_code, warehouse_storage_status, warehouse_quality_status, warehouse_storage_type, warehouse_storage_class, warehouse_order_type, warehouse_dept_type, warehouse_employee, warehouse_code, warehouse_name, warehouse_detail_address, supplier_code, supplier_name, customer_contact, contact_number, supplier_address, customer_id, customer_name, customer_contact_people, customer_contact_number, customer_company_address, material_no, material_name, material_type, material_photoUrl, 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, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, temporary_remark, temporary_report_url, storage_location, create_time, create_by, update_by, update_time from warehouse_storage_order_detail
+        select warehouse_storage_detail_id,
+               warehouse_storage_code,
+               related_order_code,
+               warehouse_storage_status,
+               warehouse_quality_status,
+               warehouse_storage_type,
+               warehouse_storage_class,
+               warehouse_order_type,
+               warehouse_dept_type,
+               warehouse_employee,
+               warehouse_code,
+               warehouse_name,
+               warehouse_detail_address,
+               supplier_code,
+               supplier_name,
+               customer_contact,
+               contact_number,
+               supplier_address,
+               customer_id,
+               customer_name,
+               customer_contact_people,
+               customer_contact_number,
+               customer_company_address,
+               material_no,
+               material_name,
+               material_type,
+               material_photoUrl,
+               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_in_unit_price,
+               make_storage_num,
+               quality_has_qualified_num,
+               quality_qualified_num,
+               refunds_exchanges_num,
+               arrived_time,
+               temporary_time,
+               delivery_inspection_time,
+               quality_time,
+               storage_time,
+               temporary_remark,
+               temporary_report_url,
+               storage_location,
+               create_time,
+               create_by,
+               update_by,
+               update_time
+        from warehouse_storage_order_detail
     </sql>
 
     <select id="selectWarehouseStorageOrderDetailList" parameterType="WarehouseStorageOrderDetail" resultMap="WarehouseStorageOrderDetailResult">
@@ -142,6 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="makeInUnitPrice != null">make_in_unit_price,</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>
@@ -200,6 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="temporaryQualifiedNum != null">#{temporaryQualifiedNum},</if>
             <if test="hasStorageNum != null">#{hasStorageNum},</if>
             <if test="storageNum != null">#{storageNum},</if>
+            <if test="makeInUnitPrice != null">#{makeInUnitPrice},</if>
             <if test="makeStorageNum != null">#{makeStorageNum},</if>
             <if test="qualityHasQualifiedNum != null">#{qualityHasQualifiedNum},</if>
             <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
@@ -262,6 +323,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="makeInUnitPrice != null">make_in_unit_price= #{makeInUnitPrice},</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>
@@ -327,6 +389,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="makeInUnitPrice != null">make_in_unit_price= #{makeInUnitPrice},</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>
@@ -393,6 +456,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="makeInUnitPrice != null">make_in_unit_price= #{makeInUnitPrice},</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>
@@ -460,6 +524,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="makeInUnitPrice != null">make_in_unit_price= #{makeInUnitPrice},</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>

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qualityQualifiedNum"              column="quality_qualified_num"    />
         <result property="qualityUnqualifiedNum"            column="quality_unqualified_num"    />
         <result property="storageNum"                       column="storage_num"    />
+        <result property="makeInTotalPrice"                 column="make_in_total_price"    />
         <result property="arrivedTime"                      column="arrived_time"    />
         <result property="temporaryTime"                    column="temporary_time"    />
         <result property="deliveryInspectionTime"           column="delivery_inspection_time"    />
@@ -41,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                notify_arrived_num, actual_arrived_num, temporary_qualified_num, temporary_unqualified_num,
                quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time,
                delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code,
-               warehouse_name, warehouse_detail_address ,create_time, create_by, update_by, update_time
+               warehouse_name, warehouse_detail_address ,create_time, create_by, update_by, update_time,
+               make_in_total_price
         from warehouse_storage_order
     </sql>
 
@@ -98,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityQualifiedNum != null">quality_qualified_num,</if>
             <if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if>
             <if test="storageNum != null">storage_num,</if>
+            <if test="makeInTotalPrice != null">make_in_total_price,</if>
             <if test="arrivedTime != null">arrived_time,</if>
             <if test="temporaryTime != null">temporary_time,</if>
             <if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
@@ -127,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
             <if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if>
             <if test="storageNum != null">#{storageNum},</if>
+            <if test="makeInTotalPrice != null">#{makeInTotalPrice},</if>
             <if test="arrivedTime != null">#{arrivedTime},</if>
             <if test="temporaryTime != null">#{temporaryTime},</if>
             <if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
@@ -160,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
             <if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
             <if test="storageNum != null">storage_num = #{storageNum},</if>
+            <if test="makeInTotalPrice != null">make_in_total_price = #{makeInTotalPrice},</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>
@@ -195,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
             <if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
             <if test="storageNum != null">storage_num = #{storageNum},</if>
+            <if test="makeInTotalPrice != null">make_in_total_price = #{makeInTotalPrice},</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>