From 9e4c4b523f8a417f9046aaf3af66f148ec596c00 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 27 Nov 2024 14:43:16 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A0=B9=E6=8D=AE=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=92=8C=E7=89=A9=E6=96=99=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=85=A8=E9=83=A8=E5=93=81=E8=B4=A8?=
 =?UTF-8?q?=E7=9A=84=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E6=A0=B9=E6=8D=AE=E7=89=A9=E6=96=99=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=85=A8=E9=83=A8=E5=93=81?=
 =?UTF-8?q?=E8=B4=A8=E7=9A=84=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=80=E6=AC=A1=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=92=8C=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=EF=BC=8C=E9=99=A4=E4=BA=86=E5=87=BA=E5=BA=93=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=AD=97=E6=AE=B5=E5=85=A8=E9=83=BD=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=8F=AA=E8=AF=BB=E5=B1=9E=E6=80=A7=EF=BC=9B?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B=E5=8A=A0=E4=B8=8A=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=B1=9E=E6=80=A7=20=E4=BF=AE=E6=94=B9=E7=AC=AC?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=BB=B4=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E7=94=9F=E4=BA=A7=E5=8D=95=E5=8F=B7=E5=92=8C?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E5=8F=B7=EF=BC=8C=E9=99=A4=E4=BA=86?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=AF=B9=E8=B1=A1=E5=85=B6=E4=BB=96=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=85=A8=E9=83=BD=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=8F=AA?=
 =?UTF-8?q?=E8=AF=BB=E5=B1=9E=E6=80=A7=EF=BC=9B=E7=89=A9=E6=96=99=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=8A=A0=E4=B8=8A=E5=AD=97=E5=85=B8=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AD=90=E8=A1=A8=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AfterSalesShippingDeviceMapper.xml        |  2 +
 .../aftersales/AftersalesOutOrderMapper.xml   |  1 +
 .../system/SysSalesOrderChildMapper.xml       |  2 +-
 .../maintenanceEquipmentOne.html              | 43 ++++++++++--------
 .../maintenanceEquipmentTwo.html              | 44 ++++++++++---------
 5 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index 57f3dbaf..a1d3c25f 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -166,6 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectAfterSalesShippingDeviceVo"/>
         where sales_order_code = #{salesOrderCode}
         and material_no = #{materialNo}
+        and  quality_status = '2'
     </select>
 
     <select id="selectHasAddShippingDevice" parameterType="AfterSalesShippingDevice" resultMap="AfterSalesShippingDeviceResult">
@@ -178,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectShippingDevicesByMaterialNo" parameterType="String" resultMap="AfterSalesShippingDeviceResult">
         <include refid="selectAfterSalesShippingDeviceVo"/>
         where material_no = #{materialNo}
+        and  quality_status = '2'
     </select>
 
 
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml
index 7a796d30..46b53a5a 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml
@@ -60,6 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyName != null  and applyName != ''"> and apply_name like concat('%', #{applyName}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
         </where>
+        order by create_time desc
     </select>
     
     <select id="selectAftersalesOutOrderById" parameterType="Long" resultMap="AftersalesOutOrderResult">
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
index f1fb8b57..ee64769f 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
@@ -241,7 +241,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">materialName = #{materialName},</if>
             <if test="materialType != null">materialType = #{materialType},</if>
             <if test="processMethod != null">processMethod = #{processMethod},</if>
-            <if test="materialModel != null">materialModel = #{materialModel},</if>
+            <if test="materialModel != null">material_model = #{materialModel},</if>
             <if test="brand != null">brand = #{brand},</if>
             <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
             <if test="unit != null">unit = #{unit},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentOne.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentOne.html
index 9a048b3a..30c819af 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentOne.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentOne.html
@@ -11,7 +11,7 @@
     <div class="form-group">
       <label class="col-sm-3 control-label">出库单号：</label>
       <div class="col-sm-8">
-        <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text">
+        <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
@@ -20,53 +20,53 @@
         <input name="outOrderName" th:field="*{outOrderName}" class="form-control" type="text">
       </div>
     </div>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">销售单号：</label>
-      <div class="col-sm-8">
-        <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text">
-      </div>
-    </div>
+<!--    <div class="form-group">-->
+<!--      <label class="col-sm-3 control-label">销售单号：</label>-->
+<!--      <div class="col-sm-8">-->
+<!--        <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text">-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="form-group">
       <label class="col-sm-3 control-label">申请人员：</label>
       <div class="col-sm-8">
-        <input name="applyName" th:field="*{applyName}" class="form-control" type="text">
-      </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">生产单号：</label>
-      <div class="col-sm-8">
-        <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text">
+        <input name="applyName" th:field="*{applyName}" class="form-control" type="text" readonly>
       </div>
     </div>
+<!--    <div class="form-group">-->
+<!--      <label class="col-sm-3 control-label">生产单号：</label>-->
+<!--      <div class="col-sm-8">-->
+<!--        <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text">-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="form-group">
       <label class="col-sm-3 control-label">客户ID：</label>
       <div class="col-sm-8">
-        <input name="customerId" th:field="*{customerId}" class="form-control" type="text">
+        <input name="customerId" th:field="*{customerId}" class="form-control" type="text" readonly>
       </div>
     </div>
 
     <div class="form-group">
       <label class="col-sm-3 control-label">客户名称：</label>
       <div class="col-sm-8">
-        <input name="customerName" th:field="*{customerName}" class="form-control" type="text">
+        <input name="customerName" th:field="*{customerName}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-3 control-label">收货联系人：</label>
       <div class="col-sm-8">
-        <input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text">
+        <input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-3 control-label">收货电话：</label>
       <div class="col-sm-8">
-        <input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text">
+        <input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-3 control-label">收货地址：</label>
       <div class="col-sm-8">
-        <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
+        <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" readonly>
       </div>
     </div>
 
@@ -104,6 +104,8 @@
 <script th:inline="javascript">
   var addFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:addShippingDevices')}]];
 
+  var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+
   var prefix = ctx + "aftersales/aftersalesOutOrder";
   var aftersalesOutOrder = [[${aftersalesOutOrder}]];
 
@@ -212,6 +214,9 @@
         {
           title: '物料类型',
           field: 'materialType',
+          formatter: function(value, row, index) {
+            return $.table.selectCategoryLabel(materialTypeDatas, value);
+          }
         },
         {
           title: '单位',
diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
index 9c76d828..aa398156 100644
--- a/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
+++ b/ruoyi-admin/src/main/resources/templates/aftersales/aftersalesOutOrder/maintenanceEquipmentTwo.html
@@ -12,62 +12,62 @@
     <div class="form-group">
       <label class="col-sm-3 control-label">出库单号：</label>
       <div class="col-sm-8">
-        <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text">
+        <input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-3 control-label">出库对象：</label>
       <div class="col-sm-8">
-        <input name="outOrderName" th:field="*{outOrderName}" class="form-control" type="text">
-      </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">销售单号：</label>
-      <div class="col-sm-8">
-        <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text">
+        <input name="outOrderName" th:field="*{outOrderName}" class="form-control" type="text" readonly>
       </div>
     </div>
+<!--    <div class="form-group">-->
+<!--      <label class="col-sm-3 control-label">销售单号：</label>-->
+<!--      <div class="col-sm-8">-->
+<!--        <input name="salesOrderCode" th:field="*{salesOrderCode}" class="form-control" type="text">-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="form-group">
       <label class="col-sm-3 control-label">申请人员：</label>
       <div class="col-sm-8">
-        <input name="applyName" th:field="*{applyName}" class="form-control" type="text">
-      </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-3 control-label">生产单号：</label>
-      <div class="col-sm-8">
-        <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text">
+        <input name="applyName" th:field="*{applyName}" class="form-control" type="text" readonly>
       </div>
     </div>
+<!--    <div class="form-group">-->
+<!--      <label class="col-sm-3 control-label">生产单号：</label>-->
+<!--      <div class="col-sm-8">-->
+<!--        <input name="makeNo" th:field="*{makeNo}" class="form-control" type="text">-->
+<!--      </div>-->
+<!--    </div>-->
     <div class="form-group">
       <label class="col-sm-3 control-label">客户ID：</label>
       <div class="col-sm-8">
-        <input name="customerId" th:field="*{customerId}" class="form-control" type="text">
+        <input name="customerId" th:field="*{customerId}" class="form-control" type="text" readonly>
       </div>
     </div>
 
     <div class="form-group">
       <label class="col-sm-3 control-label">客户名称：</label>
       <div class="col-sm-8">
-        <input name="customerName" th:field="*{customerName}" class="form-control" type="text">
+        <input name="customerName" th:field="*{customerName}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-3 control-label">收货联系人：</label>
       <div class="col-sm-8">
-        <input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text">
+        <input name="deliveryName" th:field="*{deliveryName}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-3 control-label">收货电话：</label>
       <div class="col-sm-8">
-        <input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text">
+        <input name="deliveryNumber" th:field="*{deliveryNumber}" class="form-control" type="text" readonly>
       </div>
     </div>
     <div class="form-group">
       <label class="col-sm-3 control-label">收货地址：</label>
       <div class="col-sm-8">
-        <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text">
+        <input name="deliveryAddress" th:field="*{deliveryAddress}" class="form-control" type="text" readonly>
       </div>
     </div>
 
@@ -105,6 +105,7 @@
 <script th:inline="javascript">
   var addFlag = [[${@permission.hasPermi('aftersales:aftersalesOutOrder:addShippingDevices')}]];
 
+  var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
   var prefix = ctx + "aftersales/aftersalesOutOrder";
   var aftersalesOutOrder = [[${aftersalesOutOrder}]];
 
@@ -218,6 +219,9 @@
         {
           title: '物料类型',
           field: 'materialType',
+          formatter: function(value, row, index) {
+            return $.table.selectCategoryLabel(materialTypeDatas, value);
+          }
         },
         {
           title: '单位',