[feat]

品质管理 退换货
修改入库前、入库后退换货报告显示页面，添加只读属性；
修改入库前退换货确认供应商页面，添加品质备注字段显示；
修改入库前、入库后退换货详情页面，添加品质备注、是否退回供应商字段；
修改生成退换货入库单详情对象service方法，新增品质备注赋值语句，值来源品质报告单；

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);

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>

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>
+                <input name="qualityRemark" th:field="*{qualityRemark}" class="form-control" type="text" readonly>
-                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseStorageType}"></option>
-                </select>
             </div>
         </div>
-
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">是否退回供应商：</label>
             <div class="col-sm-8">

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>
+            <label class="col-sm-3 control-label">检验完成时间：</label>
-            <div class="col-sm-8">
+            <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>
+            <label class="col-sm-3 control-label">备注：</label>
-            <div class="col-sm-8">
+            <div class="col-sm-6">
-                <textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea>
+                <textarea name="remark" th:field="*{remark}" class="form-control" type="text" readonly></textarea>
             </div>
         </div>
     </form>

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">

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>
+                <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}" th:field="*{warehouseStorageType}"></option>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                 </select>
             </div>
         </div>