From 1cbaddd92eda119dc405b32f01daf7305e0dfda2 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Sat, 9 Nov 2024 11:00:24 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E6=96=B0=E5=A2=9E=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88=E5=8F=91=E8=B4=A7=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9id?=
 =?UTF-8?q?=E4=B8=BAcode=E5=AD=97=E6=AE=B5=20=E5=94=AE=E5=90=8E=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=BE=E5=A4=87=E5=87=BA=E5=BA=93=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20=E9=80=9A=E8=BF=87=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=87=BA=E5=BA=93=E5=90=8E=E7=AB=AF=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E7=A1=AE=E8=AE=A4=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=89=93=E5=BC=80=E9=A1=B5=E9=9D=A2=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E6=96=B0=E5=A2=9E=E7=A1=AE=E8=AE=A4=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A=E5=AE=9E=E7=8E=B0=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BB=93=E5=BA=93=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=E3=80=81=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=87=BA=E5=BA=93=E5=8D=95=E7=9A=84=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E5=94=AE=E5=90=8E=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=872?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/AftersalesOutOrderMapper.java      | 10 ++++
 .../SysSalesShippingInformServiceImpl.java    | 38 +++++++++++----
 .../aftersales/AftersalesOutOrderMapper.xml   | 46 +++++++++++++++++++
 .../salesShippingInform/cancelShipping.html   |  2 +-
 4 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java
index 703d8d25..fccd1060 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/mapper/AftersalesOutOrderMapper.java
@@ -43,6 +43,16 @@ public interface AftersalesOutOrderMapper
      */
     public int updateAftersalesOutOrder(AftersalesOutOrder aftersalesOutOrder);
 
+
+    /**
+     * 通过出库单号修改售后维护设备出库
+     *
+     * @param aftersalesOutOrder 售后维护设备出库
+     * @return 结果
+     */
+
+    public int updateAftersalesOutOrderByOutOrderCode(AftersalesOutOrder aftersalesOutOrder);
+
     /**
      * 删除售后维护设备出库
      * 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
index bded2fda..1cda2ade 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java
@@ -14,7 +14,9 @@ import com.alibaba.excel.util.MapUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.ruoyi.aftersales.domain.AfterSalesShippingDevice;
+import com.ruoyi.aftersales.domain.AftersalesOutOrder;
 import com.ruoyi.aftersales.mapper.AfterSalesShippingDeviceMapper;
+import com.ruoyi.aftersales.mapper.AftersalesOutOrderMapper;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.BusinessException;
 import com.ruoyi.common.utils.DateUtils;
@@ -79,6 +81,9 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
     private SalesShippingInformationMapper salesShippingInformationMapper;
 
 
+    @Autowired
+    private AftersalesOutOrderMapper aftersalesOutOrderMapper;
+
 
     /**
      * 查询销售出货通知
@@ -325,18 +330,31 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor
         warehouseOutOrder.setUpdateBy(loginName);
         warehouseOutOrder.setUpdateTime(new Date());
 
+
+        //更新售后维护设备出库单数据
+        AftersalesOutOrder aftersalesOutOrder = new AftersalesOutOrder();
+        aftersalesOutOrder.setOutOrderCode(outOrderCode);
+        //设置出库状态为 待设备维护2
+        aftersalesOutOrder.setWarehouseOutStatus("3");
+        aftersalesOutOrder.setUpdateBy(loginName);
+        aftersalesOutOrder.setUpdateTime(new Date());
+        int updateAftersalesOutOrderResult = aftersalesOutOrderMapper.updateAftersalesOutOrderByOutOrderCode(aftersalesOutOrder);
+        if (updateAftersalesOutOrderResult <= 0){
+            throw new BusinessException("更新售后出库单数据失败");
+        }
+
         //更新销售订单的出货状态
 //        SysSalesShippingInform tempShippingInform = sysSalesShippingInformMapper.selectSysSalesShippingInformByCode(outOrderCode);
-        SysSalesOrder sysSalesOrder = new SysSalesOrder();
-        sysSalesOrder.setUpdateBy(loginName);
-        sysSalesOrder.setUpdateTime(new Date());
-        sysSalesOrder.setSalesOrderCode(warehouseOutOrder.getSalesOrderCode());
-        //暂收设置为全部出货
-        sysSalesOrder.setDeliveryStatus("6");
-        int updateSysSalesOrderResult = sysSalesOrderMapper.updateSysSalesOrderBySalesOrderCode(sysSalesOrder);
-         if (updateSysSalesOrderResult <= 0){
-             throw new BusinessException("更新销售订单数据失败");
-         }
+//        SysSalesOrder sysSalesOrder = new SysSalesOrder();
+//        sysSalesOrder.setUpdateBy(loginName);
+//        sysSalesOrder.setUpdateTime(new Date());
+//        sysSalesOrder.setSalesOrderCode(warehouseOutOrder.getSalesOrderCode());
+//        //暂收设置为全部出货
+//        sysSalesOrder.setDeliveryStatus("6");
+//        int updateSysSalesOrderResult = sysSalesOrderMapper.updateSysSalesOrderBySalesOrderCode(sysSalesOrder);
+//         if (updateSysSalesOrderResult <= 0){
+//             throw new BusinessException("更新销售订单数据失败");
+//         }
 
         int updateWarehouseOutOrderResult = warehouseOutOrderMapper.updateWarehouseOutOrder(warehouseOutOrder);
         if (updateWarehouseOutOrderResult <= 0){
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml
index ebe762cb..7a796d30 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AftersalesOutOrderMapper.xml
@@ -190,6 +190,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where out_order_id = #{outOrderId}
     </update>
 
+
+
+    <update id="updateAftersalesOutOrderByOutOrderCode" parameterType="AftersalesOutOrder">
+        update aftersales_out_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
+            <if test="makeNo != null">make_no = #{makeNo},</if>
+            <if test="warehouseOutStatus != null">warehouse_out_status = #{warehouseOutStatus},</if>
+            <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
+            <if test="warehouseOrderType != null">warehouse_order_type = #{warehouseOrderType},</if>
+            <if test="outMakeCode != null">out_make_code = #{outMakeCode},</if>
+            <if test="requisitioningCode != null">requisitioning_code = #{requisitioningCode},</if>
+            <if test="warehouseOutType != null">warehouse_out_type = #{warehouseOutType},</if>
+            <if test="businessName != null">business_name = #{businessName},</if>
+            <if test="aftersalesName != null">aftersales_name = #{aftersalesName},</if>
+            <if test="warehouseName != null">warehouse_name = #{warehouseName},</if>
+            <if test="shippingDeviceId != null">shipping_device_id = #{shippingDeviceId},</if>
+            <if test="materialNo != null">material_no = #{materialNo},</if>
+            <if test="materialName != null">material_name = #{materialName},</if>
+            <if test="materialSum != null">material_sum = #{materialSum},</if>
+            <if test="enterpriseSum != null">enterprise_sum = #{enterpriseSum},</if>
+            <if test="outOrderSum != null">out_order_sum = #{outOrderSum},</if>
+            <if test="outOrderName != null">out_order_name = #{outOrderName},</if>
+            <if test="outOrderTime != null">out_order_time = #{outOrderTime},</if>
+            <if test="supplierCode != null">supplier_code = #{supplierCode},</if>
+            <if test="supplierName != null">supplier_name = #{supplierName},</if>
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="customerName != null">customer_name = #{customerName},</if>
+            <if test="planDeliveryTime != null">plan_delivery_time = #{planDeliveryTime},</if>
+            <if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
+            <if test="deliveryCondition != null">delivery_condition = #{deliveryCondition},</if>
+            <if test="applyName != null">apply_name = #{applyName},</if>
+            <if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
+            <if test="deliveryName != null">delivery_name = #{deliveryName},</if>
+            <if test="deliveryNumber != null">delivery_number = #{deliveryNumber},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where out_order_code = #{outOrderCode}
+    </update>
+
+
     <delete id="deleteAftersalesOutOrderById" parameterType="Long">
         delete from aftersales_out_order where out_order_id = #{outOrderId}
     </delete>
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
index a971423f..78d2b43c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
@@ -7,7 +7,7 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal" id="form-cancelShipping-edit" th:object="${sysSalesShippingInform}">
-        <input name="shippingInformId" th:field="*{shippingInformId}" type="hidden">
+        <input name="outOrderCode" th:field="*{outOrderCode}" type="hidden">
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">备注：</label>
             <div class="col-sm-8">