[feat]

仓库管理 入库单
修改入库单详情实体类，新增品质备注字段；
修改入库单详情mapper、入库单批量插入子表mapper方法，新增字段；
修改退回供应商、不退回供应商入库页面，添加品质备注字段；
修改退回供应商、不退回供应商退换货入库详情页面，添加品质备注字段；

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

@@ -177,6 +177,9 @@ public class WarehouseStorageOrderDetail extends BaseEntity
     @Excel(name = "退换货数")
     private Integer refundsExchangesNum;
 
+    /** 品质备注 */
+    @Excel(name = "品质备注")
+    private String qualityRemark;
 
     /** 委内加工费单价 */
     private BigDecimal makeInUnitPrice;
@@ -732,6 +735,14 @@ public class WarehouseStorageOrderDetail extends BaseEntity
         this.makeInUnitPrice = makeInUnitPrice;
     }
 
+    public String getQualityRemark() {
+        return qualityRemark;
+    }
+
+    public void setQualityRemark(String qualityRemark) {
+        this.qualityRemark = qualityRemark;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="temporaryTime"    column="temporary_time"    />
         <result property="deliveryInspectionTime"    column="delivery_inspection_time"    />
         <result property="qualityTime"    column="quality_time"    />
+        <result property="qualityRemark"    column="quality_remark"    />
         <result property="storageTime"    column="storage_time"    />
         <result property="temporaryRemark"    column="temporary_remark"    />
         <result property="temporaryReportUrl"    column="temporary_report_url"    />
@@ -118,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                temporary_time,
                delivery_inspection_time,
                quality_time,
+               quality_remark,
                storage_time,
                temporary_remark,
                temporary_report_url,
@@ -215,6 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="temporaryTime != null">temporary_time,</if>
             <if test="deliveryInspectionTime != null">delivery_inspection_time,</if>
             <if test="qualityTime != null">quality_time,</if>
+            <if test="qualityRemark != null">quality_remark,</if>
             <if test="storageTime != null">storage_time,</if>
             <if test="temporaryRemark != null">temporary_remark,</if>
             <if test="temporaryReportUrl != null">temporary_report_url,</if>
@@ -275,6 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="temporaryTime != null">#{temporaryTime},</if>
             <if test="deliveryInspectionTime != null">#{deliveryInspectionTime},</if>
             <if test="qualityTime != null">#{qualityTime},</if>
+            <if test="qualityRemark != null">#{qualityRemark},</if>
             <if test="storageTime != null">#{storageTime},</if>
             <if test="temporaryRemark != null">#{temporaryRemark},</if>
             <if test="temporaryReportUrl != null">#{temporaryReportUrl},</if>
@@ -340,6 +344,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         temporary_time,
         delivery_inspection_time,
         quality_time,
+        quality_remark,
         storage_time,
         temporary_remark,
         temporary_report_url,
@@ -399,6 +404,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.temporaryTime},
             #{item.deliveryInspectionTime},
             #{item.qualityTime},
+            #{item.qualityRemark},
             #{item.storageTime},
             #{item.temporaryRemark},
             #{item.temporaryReportUrl},
@@ -466,6 +472,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="qualityRemark != null">quality_remark = #{qualityRemark},</if>
             <if test="storageTime != null">storage_time = #{storageTime},</if>
             <if test="temporaryRemark != null">temporary_remark = #{temporaryRemark},</if>
             <if test="temporaryReportUrl != null">temporary_report_url = #{temporaryReportUrl},</if>
@@ -533,6 +540,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="qualityRemark != null">quality_remark = #{qualityRemark},</if>
             <if test="storageTime != null">storage_time = #{storageTime},</if>
             <if test="temporaryRemark != null">temporary_remark = #{temporaryRemark},</if>
             <if test="temporaryReportUrl != null">temporary_report_url = #{temporaryReportUrl},</if>
@@ -600,6 +608,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="qualityRemark != null">quality_remark = #{qualityRemark},</if>
             <if test="storageTime != null">storage_time = #{storageTime},</if>
             <if test="temporaryRemark != null">temporary_remark = #{temporaryRemark},</if>
             <if test="temporaryReportUrl != null">temporary_report_url = #{temporaryReportUrl},</if>
@@ -668,6 +677,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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="qualityRemark != null">quality_remark = #{qualityRemark},</if>
             <if test="storageTime != null">storage_time = #{storageTime},</if>
             <if test="temporaryRemark != null">temporary_remark = #{temporaryRemark},</if>
             <if test="temporaryReportUrl != null">temporary_report_url = #{temporaryReportUrl},</if>

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

@@ -311,9 +311,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <insert id="batchWarehouseStorageOrderDetail">
-        insert into warehouse_storage_order_detail( 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, storage_location, temporary_remark, temporary_report_url, create_time, create_by, update_by, update_time) values
+        insert into warehouse_storage_order_detail( 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,quality_remark, storage_time, storage_location, temporary_remark, temporary_report_url, create_time, create_by, update_by, update_time) values
         <foreach item="item" index="index" collection="list" separator=",">
-            ( #{item.warehouseStorageDetailId}, #{item.warehouseStorageCode}, #{item.relatedOrderCode}, #{item.warehouseStorageStatus}, #{item.warehouseQualityStatus}, #{item.warehouseStorageType}, #{item.warehouseStorageClass}, #{item.warehouseOrderType}, #{item.warehouseDeptType}, #{item.warehouseEmployee}, #{item.warehouseCode}, #{item.warehouseName}, #{item.warehouseDetailAddress}, #{item.supplierCode}, #{item.supplierName}, #{item.customerContact}, #{item.contactNumber}, #{item.supplierAddress}, #{item.customerId}, #{item.customerName}, #{item.customerContactPeople}, #{item.customerContactNumber}, #{item.customerCompanyAddress}, #{item.materialNo}, #{item.materialName}, #{item.materialType}, #{item.materialPhotourl}, #{item.materialBrand}, #{item.materialUnit}, #{item.materialDescribe}, #{item.materialProcessMethod}, #{item.materialDeptType}, #{item.makeTotal}, #{item.notifyHasArrivedNum}, #{item.notifyArriveNum}, #{item.actualHasArrivedNum}, #{item.actualArriveNum}, #{item.temporaryHasQualifiedNum}, #{item.temporaryQualifiedNum}, #{item.hasStorageNum}, #{item.storageNum}, #{item.makeStorageNum}, #{item.qualityHasQualifiedNum}, #{item.qualityQualifiedNum}, #{item.refundsExchangesNum}, #{item.arrivedTime}, #{item.temporaryTime}, #{item.deliveryInspectionTime}, #{item.qualityTime}, #{item.storageTime}, #{item.storageLocation}, #{item.temporaryRemark}, #{item.temporaryReportUrl}, #{item.createTime}, #{item.createBy}, #{item.updateBy}, #{item.updateTime})
+            ( #{item.warehouseStorageDetailId}, #{item.warehouseStorageCode}, #{item.relatedOrderCode}, #{item.warehouseStorageStatus}, #{item.warehouseQualityStatus}, #{item.warehouseStorageType}, #{item.warehouseStorageClass}, #{item.warehouseOrderType}, #{item.warehouseDeptType}, #{item.warehouseEmployee}, #{item.warehouseCode}, #{item.warehouseName}, #{item.warehouseDetailAddress}, #{item.supplierCode}, #{item.supplierName}, #{item.customerContact}, #{item.contactNumber}, #{item.supplierAddress}, #{item.customerId}, #{item.customerName}, #{item.customerContactPeople}, #{item.customerContactNumber}, #{item.customerCompanyAddress}, #{item.materialNo}, #{item.materialName}, #{item.materialType}, #{item.materialPhotourl}, #{item.materialBrand}, #{item.materialUnit}, #{item.materialDescribe}, #{item.materialProcessMethod}, #{item.materialDeptType}, #{item.makeTotal}, #{item.notifyHasArrivedNum}, #{item.notifyArriveNum}, #{item.actualHasArrivedNum}, #{item.actualArriveNum}, #{item.temporaryHasQualifiedNum}, #{item.temporaryQualifiedNum}, #{item.hasStorageNum}, #{item.storageNum}, #{item.makeStorageNum}, #{item.qualityHasQualifiedNum}, #{item.qualityQualifiedNum}, #{item.refundsExchangesNum}, #{item.arrivedTime}, #{item.temporaryTime}, #{item.deliveryInspectionTime}, #{item.qualityTime}, #{item.qualityRemark}, #{item.storageTime}, #{item.storageLocation}, #{item.temporaryRemark}, #{item.temporaryReportUrl}, #{item.createTime}, #{item.createBy}, #{item.updateBy}, #{item.updateTime})
         </foreach>
     </insert>
 

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html

@@ -203,38 +203,47 @@
                 },
                 {
                     title: '料号',
-                    field: 'materialNo'
+                    field: 'materialNo',
+                    align: 'center',
                 }, {
                     title: '物料名称',
-                    field: 'materialName'
+                    field: 'materialName',
+                    align: 'center',
                 },
                 {
                     title: '类型',
                     field: 'materialType',
+                    align: 'center',
                 },
                 {
                     title: '图片',
                     field: 'materialPhotourl',
+                    align: 'center',
                 },
                 {
                     title: '型号',
                     field: 'materialModel',
+                    align: 'center',
                 },
                 {
                     title: '描述',
                     field: 'materialDescribe',
+                    align: 'center',
                 },
                 {
                     title: '品牌',
                     field: 'materialBrand',
+                    align: 'center',
                 },
                 {
                     title: '单位',
                     field: 'materialUnit',
+                    align: 'center',
                 },
                 {
                     title: '加工方式',
                     field: 'materialProcessMethod',
+                    align: 'center',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(processMethodDatas, value);
                     }
@@ -247,6 +256,12 @@
                 {
                     title: '退货数',
                     field: 'refundsExchangesNum',
+                    align: 'center',
+                },
+                {
+                    title: '品质备注',
+                    field: 'qualityRemark',
+                    align: 'center',
                 },
                 {
                     title: '已入库数',
@@ -256,6 +271,7 @@
                 {
                     title: '存放位置',
                     field: 'storageLocation',
+                    align: 'center',
                 },
 
             ]

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplier.html

@@ -247,6 +247,11 @@
                     align: 'center',
                     field: 'refundsExchangesNum',
                 },
+                {
+                    title: '品质备注',
+                    field: 'qualityRemark',
+                    align: 'center',
+                },
                 {
                     title: '已入库数',
                     align: 'center',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplierDetail.html

@@ -182,6 +182,12 @@
                 {
                     title: '退货数',
                     field: 'refundsExchangesNum',
+                    align: 'center',
+                },
+                {
+                    title: '品质备注',
+                    field: 'qualityRemark',
+                    align: 'center',
                 },
                 {
                     title: '已入库数',

ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsToSupplier.html

@@ -274,6 +274,11 @@
                     align: 'center',
                     field: 'refundsExchangesNum',
                 },
+                {
+                    title: '品质备注',
+                    field: 'qualityRemark',
+                    align: 'center',
+                },
                 {
                     title: '已入库数',
                     align: 'center',