From 3b7ba095e1ba472935d0a1baf4fb9e2f30958d70 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:48:51 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E9=80=80=E6=8D=A2=E8=B4=A7=20=E4=BF=AE=E6=94=B9=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=89=8D=E3=80=81=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80?=
 =?UTF-8?q?=E6=8D=A2=E8=B4=A7=E6=8A=A5=E5=91=8A=E6=98=BE=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8F=AA=E8=AF=BB=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=89=8D=E9=80=80=E6=8D=A2=E8=B4=A7=E7=A1=AE=E8=AE=A4=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=89=8D=E3=80=81=E5=85=A5=E5=BA=93=E5=90=8E=E9=80=80=E6=8D=A2?=
 =?UTF-8?q?=E8=B4=A7=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=93=81=E8=B4=A8=E5=A4=87=E6=B3=A8=E3=80=81=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=80=80=E5=9B=9E=E4=BE=9B=E5=BA=94=E5=95=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=80=80=E6=8D=A2=E8=B4=A7=E5=85=A5=E5=BA=93=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=AF=B9=E8=B1=A1service=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=93=81=E8=B4=A8=E5=A4=87=E6=B3=A8=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E8=AF=AD=E5=8F=A5=EF=BC=8C=E5=80=BC=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E5=8D=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QualityRefundsExchangesServiceImpl.java   |  1 +
 .../afterQualityReportDetail.html             |  4 ++--
 .../beforeHasConfirmSupplier.html             |  7 ++-----
 .../beforeQualityReportDetail.html            | 12 ++++++------
 .../returnAfterStorageDetail.html             |  8 ++++++++
 .../returnBeforeStorageDetail.html            | 19 ++++++++++++++-----
 6 files changed, 33 insertions(+), 18 deletions(-)

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 @@
             <label class="col-sm-3 control-label">检验完成时间：</label>
             <div class="col-sm-8">
                 <div class="input-group date">
-                    <input name="inspectionTime" th:value="${#dates.format(qualityRefundsExchangesDetail.inspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <input name="inspectionTime" readonly th:value="${#dates.format(qualityRefundsExchangesDetail.inspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
@@ -38,7 +38,7 @@
         <div class="form-group" style="padding-top: 20px;">
             <label class="col-sm-3 control-label">备注：</label>
             <div class="col-sm-8">
-                <textarea name="remark" th:text="*{remark}" class="form-control" type="text"></textarea>
+                <textarea name="remark" th:text="*{remark}" class="form-control" type="text" readonly></textarea>
             </div>
         </div>
     </form>
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 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">品质单入库类型：</label>
+            <label class="col-sm-3 control-label">品质备注：</label>
             <div class="col-sm-8">
-                <select name="warehouseStorageType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_storage_type')}" disabled>
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseStorageType}"></option>
-                </select>
+                <input name="qualityRemark" th:field="*{qualityRemark}" class="form-control" type="text" readonly>
             </div>
         </div>
-
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">是否退回供应商：</label>
             <div class="col-sm-8">
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 @@
 
         <!--其他字段-->
         <div class="form-group" style="padding-top: 20px;">
-            <label class="col-sm-4 control-label">检验完成时间：</label>
-            <div class="col-sm-8">
+            <label class="col-sm-3 control-label">检验完成时间：</label>
+            <div class="col-sm-6">
                 <div class="input-group date">
-                    <input name="checkoutCompletionTime" th:value="${#dates.format(qualityRefundsExchangesOrder.checkoutCompletionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <input name="checkoutCompletionTime" readonly th:value="${#dates.format(qualityRefundsExchangesOrder.checkoutCompletionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                 </div>
             </div>
         </div>
         <div class="form-group" style="padding-top: 20px;">
-            <label class="col-sm-4 control-label">备注：</label>
-            <div class="col-sm-8">
-                <textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea>
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-6">
+                <textarea name="remark" th:field="*{remark}" class="form-control" type="text" readonly></textarea>
             </div>
         </div>
     </form>
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 @@
                 <input name="qualityRemark" th:field="*{qualityRemark}" class="form-control" type="text" disabled>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">是否退回供应商：</label>
+            <div class="col-sm-8">
+                <select name="isReturnedToSupplier" id="isReturnedToSupplier" class="form-control m-b" th:with="type=${@dict.getType('yes_or_no')}" th:field="*{isReturnedToSupplier}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
     </form>
     <!--物料信息-->
     <div class="container">
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 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">关联单号：</label>
+            <label class="col-sm-3 control-label">交检时间：</label>
             <div class="col-sm-8">
-                <input name="relatedOrderCode" th:field="*{relatedOrderCode}" class="form-control" type="text" disabled>
+                <div class="input-group date">
+                    <input name="deliveryInspectionTime" th:value="${#dates.format(qualityRefundsExchanges.deliveryInspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">品质备注：</label>
+            <div class="col-sm-8">
+                <input name="qualityRemark" th:field="*{qualityRemark}" class="form-control" type="text" disabled>
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">品质单入库类型：</label>
+            <label class="col-sm-3 control-label is-required">是否退回供应商：</label>
             <div class="col-sm-8">
-                <select name="warehouseStorageType" class="form-control m-b" th:with="type=${@dict.getType('warehouse_storage_type')}" disabled>
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseStorageType}"></option>
+                <select name="isReturnedToSupplier" id="isReturnedToSupplier" class="form-control m-b" th:with="type=${@dict.getType('yes_or_no')}" th:field="*{isReturnedToSupplier}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
             </div>
         </div>