From 2d6c861a22598c792c77b36ac08c68b05763d0cf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 3 Jun 2024 10:34:21 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/mapper/EmisWaybillMapper.java |  4 ++--
 .../com/xdadan/erp/emis/service/EmisBaseService.java  |  8 ++++----
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 +++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
index d866cda2f..a523af310 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java
@@ -102,7 +102,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
     // 更新问题件状态
     public int updateProblemStatus(EmisWaybill emisWaybill);
 
-
-    public int updateEmisWaybillByBillCode(EmisWaybill emisWaybill);
+   // 更新上一站，下一站
+    public int updatePreOrNextSiteByBillCode(EmisWaybill emisWaybill);
 
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 35a7cad82..46b2123f9 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -720,7 +720,7 @@ public class EmisBaseService {
          EmisWaybill emisWaybill = new EmisWaybill();
          emisWaybill.setBillCode(billCode);
          emisWaybill.setLastSiteCode(siteCode);
-         return emisWaybillMapper.updateEmisWaybillByBillCode(emisWaybill);
+         return emisWaybillMapper.updatePreOrNextSiteByBillCode(emisWaybill);
      }
 
      /**
@@ -733,7 +733,7 @@ public class EmisBaseService {
          EmisWaybill emisWaybill = new EmisWaybill();
          emisWaybill.setBillCode(billCode);
          emisWaybill.setNextSiteCode(siteCode);
-         return emisWaybillMapper.updateEmisWaybillByBillCode(emisWaybill);
+         return emisWaybillMapper.updatePreOrNextSiteByBillCode(emisWaybill);
      }
 
      /**
@@ -746,7 +746,7 @@ public class EmisBaseService {
          EmisWaybill emisWaybill = new EmisWaybill();
          emisWaybill.setBillCode(billCode);
          emisWaybill.setCurrentSiteCode(siteCode);
-         return emisWaybillMapper.updateEmisWaybillByBillCode(emisWaybill);
+         return emisWaybillMapper.updatePreOrNextSiteByBillCode(emisWaybill);
      }
 
      /**
@@ -777,7 +777,7 @@ public class EmisBaseService {
 
          emisWaybill.setProblemDelayDays(problemDelayDays);
 
-         return emisWaybillMapper.updateEmisWaybillByBillCode(emisWaybill);
+         return emisWaybillMapper.updateProblemStatus(emisWaybill);
      }
 
      /**
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 6f7ec23e5..670a300a8 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1047,6 +1047,17 @@
         where bill_code=#{billCode}
     </update>
 
+    <update id="updatePreOrNextSiteByBillCode" parameterType="EmisWaybill">
+
+        update emis_waybill set
+        <if test="currentSiteCode != null and currentSiteCode != ''">current_site_code = #{currentSiteCode},</if>
+        <if test="nextSiteCode != null and nextSiteCode != ''">next_site_code = #{nextSiteCode},</if>
+        <if test="lastSiteCode != null and lastSiteCode != ''">last_site_code = #{lastSiteCode},</if>
+        <if test="updateBy != null and updateBy != ''">,update_by = #{updateBy}</if>
+        <if test="updateSite != null and updateSite != ''">,update_site = #{updateSite}</if>
+
+        where bill_code=#{billCode}
+    </update>
 
     <update id="changeWaybillStatusByBillCode" parameterType="EmisWaybill">
         update emis_waybill set waybill_status=#{waybillStatus} where bill_code=#{billCode}