From dbda413e86859536082ab0713223629f728b34e0 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 17 Jul 2025 14:19:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=8D=95=E9=A2=86=E5=8F=96=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cowr/ssjygl/order/ordertemp/OrderTempService.java  | 10 +++++++---
 .../ssjygl/ticket/receive/TicketReceiveService.java    |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
index 15d3a19..239c3ba 100644
--- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
@@ -865,7 +865,7 @@ public class OrderTempService extends BaseService {
                 ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" +
                 ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" +
                 ", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" +
-                ", p.arrive_time, p.type, p.memo transport_memo, s.name supermarket_name \n" +
+                ", p.arrive_time, p.type, p.memo transport_memo, case when t.supermarket_id = 5 then '巴河' else s.name end as supermarket_name \n" +
                 ", ot.trans_price in_trans_price, ot.weight in_weight \n";
         String fromsql = "from order_temp t \n" +
                 " left join transport p on p.order_sn = t.sn \n" +
@@ -900,8 +900,12 @@ public class OrderTempService extends BaseService {
         }
 
         if (supermarket_id != null) {
-            fromsql += " and s.id = ? \n";
-            paraList.add(supermarket_id);
+            if(supermarket_id == 4){
+                fromsql += " and s.id in (4,5) \n";
+            }else{
+                fromsql += " and s.id = ? \n";
+                paraList.add(supermarket_id);
+            }
         }
 
         if (supermarket_type != null) {
diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java
index 4723234..4f1e7ed 100644
--- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java
@@ -144,8 +144,12 @@ public class TicketReceiveService extends BaseService {
         List<Object> paraList = new ArrayList<>();
 
         if (supermarket_id != null) {
-            fromsql += " and t.supermarket_id = ? \n";
-            paraList.add(supermarket_id);
+            if(supermarket_id == 4){
+                fromsql += " and t.supermarket_id in (4,5) \n";
+            }else{
+                fromsql += " and t.supermarket_id = ? \n";
+                paraList.add(supermarket_id);
+            }
         }
 
         if (supermarket_type != null) {