From 361b90c80b19f51b0be756eb845f404b049f9153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 13 Feb 2025 16:52:13 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E5=85=A5=E5=BA=93=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=93=81=E8=B4=A8=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E8=AF=A6=E6=83=85mapper=E3=80=81=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5=E5=AD=90?= =?UTF-8?q?=E8=A1=A8mapper=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E9=80=80?= =?UTF-8?q?=E5=9B=9E=E4=BE=9B=E5=BA=94=E5=95=86=E3=80=81=E4=B8=8D=E9=80=80?= =?UTF-8?q?=E5=9B=9E=E4=BE=9B=E5=BA=94=E5=95=86=E5=85=A5=E5=BA=93=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=93=81=E8=B4=A8=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E4=BE=9B=E5=BA=94=E5=95=86=E3=80=81=E4=B8=8D?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=80=E6=8D=A2?= =?UTF-8?q?=E8=B4=A7=E5=85=A5=E5=BA=93=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=93=81=E8=B4=A8=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/WarehouseStorageOrderDetail.java | 11 ++++++++++ .../WarehouseStorageOrderDetailMapper.xml | 10 ++++++++++ .../warehouse/WarehouseStorageOrderMapper.xml | 4 ++-- .../storageRefundsExchangesDetail.html | 20 +++++++++++++++++-- .../storageRefundsNotToSupplier.html | 5 +++++ .../storageRefundsNotToSupplierDetail.html | 6 ++++++ .../storageRefundsToSupplier.html | 5 +++++ 7 files changed, 57 insertions(+), 4 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrderDetail.java index ea163c81..b5782024 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrderDetail.java +++ b/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) diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml index ec833b25..df4ce4fb 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml @@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -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" temporary_time, delivery_inspection_time, quality_time, + quality_remark, storage_time, temporary_remark, temporary_report_url, @@ -275,6 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{temporaryTime}, #{deliveryInspectionTime}, #{qualityTime}, + #{qualityRemark}, #{storageTime}, #{temporaryRemark}, #{temporaryReportUrl}, @@ -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" temporary_time = #{temporaryTime}, delivery_inspection_time = #{deliveryInspectionTime}, quality_time = #{qualityTime}, + quality_remark = #{qualityRemark}, storage_time = #{storageTime}, temporary_remark = #{temporaryRemark}, temporary_report_url = #{temporaryReportUrl}, @@ -533,6 +540,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" temporary_time = #{temporaryTime}, delivery_inspection_time = #{deliveryInspectionTime}, quality_time = #{qualityTime}, + quality_remark = #{qualityRemark}, storage_time = #{storageTime}, temporary_remark = #{temporaryRemark}, temporary_report_url = #{temporaryReportUrl}, @@ -600,6 +608,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" temporary_time = #{temporaryTime}, delivery_inspection_time = #{deliveryInspectionTime}, quality_time = #{qualityTime}, + quality_remark = #{qualityRemark}, storage_time = #{storageTime}, temporary_remark = #{temporaryRemark}, temporary_report_url = #{temporaryReportUrl}, @@ -668,6 +677,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" temporary_time = #{temporaryTime}, delivery_inspection_time = #{deliveryInspectionTime}, quality_time = #{qualityTime}, + quality_remark = #{qualityRemark}, storage_time = #{storageTime}, temporary_remark = #{temporaryRemark}, temporary_report_url = #{temporaryReportUrl}, diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml index 52eb277b..0a612605 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml @@ -311,9 +311,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 - ( #{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}) diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html index b212eec4..b4cb53b1 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html +++ b/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', }, ] diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplier.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplier.html index f771e47f..6c38fd39 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplier.html +++ b/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', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplierDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplierDetail.html index 8adc4bcf..8526f78b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsNotToSupplierDetail.html +++ b/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: '已入库数', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsToSupplier.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsToSupplier.html index 39370921..02b2d9b5 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsToSupplier.html +++ b/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',