diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java index 75d1b84a..64f7f38e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityRefundsExchangesServiceImpl.java @@ -200,6 +200,7 @@ public class QualityRefundsExchangesServiceImpl implements IQualityRefundsExchan storageOrderDetail.setContactNumber(exchangeDetail.getContactNumber()); storageOrderDetail.setCustomerContact(exchangeDetail.getCustomerContact()); storageOrderDetail.setRefundsExchangesNum(exchangeDetail.getQualityUnqualifiedNum()); + storageOrderDetail.setQualityRemark(qualityRefundsExchanges.getQualityRemark()); storageOrderDetail.setCreateBy(ShiroUtils.getLoginName()); storageOrderDetail.setCreateTime(DateUtils.getNowDate()); detailList.add(storageOrderDetail); diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html index 51ad24b9..2682cd74 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html @@ -30,7 +30,7 @@
- +
@@ -38,7 +38,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html index 2600aef2..335b8735 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html @@ -22,14 +22,11 @@
- +
- +
-
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html index 90d5f832..7d8b0ad0 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html @@ -85,18 +85,18 @@
- -
+ +
- +
- -
- + +
+
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html index db5d36b7..6e06baf7 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html @@ -29,6 +29,14 @@
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnBeforeStorageDetail.html b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnBeforeStorageDetail.html index 2d5fcc27..afc78e5e 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnBeforeStorageDetail.html +++ b/ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnBeforeStorageDetail.html @@ -31,16 +31,25 @@
- +
- +
+ + +
+
+
+
+ +
+
- +
- +