车辆进出日志，车牌分配记录等查询接口修改

ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/OrderclusterService.java

@@ -76,8 +76,13 @@ public class OrderclusterService extends BaseService {
         List<Object> paraList = new ArrayList<>();
 
         if (supermarket_id != null) {
-            fromsql += " and t.supermarket_id = ? \n";
+            if(supermarket_id == 4){
-            paraList.add(supermarket_id);
+                fromsql += " and t.supermarket_id in (4,5) \n";
+            } else{
+                fromsql += " and t.supermarket_id = ? \n";
+                paraList.add(supermarket_id);
+            }
+
         }
 
         if (state != null) {
@@ -244,8 +249,13 @@ public class OrderclusterService extends BaseService {
         List<Object> paraList = new ArrayList<>();
 
         if (supermarket_id != null) {
-            fromsql += " and t.supermarket_id = ? \n";
+            if(supermarket_id == 4){
-            paraList.add(supermarket_id);
+                fromsql += " and t.supermarket_id in (4,5) \n";
+            } else{
+                fromsql += " and t.supermarket_id = ? \n";
+                paraList.add(supermarket_id);
+            }
+
         }
 
         if (trans_co_id != null) {

ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordercluster/truck/OrderclusterTruckService.java

@@ -36,7 +36,7 @@ public class OrderclusterTruckService extends BaseService {
                 ", c.customer_receiver_lttd, c.trans_co_id, c.trans_co_name, c.trans_co_texpayer_name" +
                 ", c.trans_co_texpayer_num, c.trans_co_address, c.trans_co_phone, c.trans_co_bank_name" +
                 ", c.trans_co_bank_account, c.time_interval, c.mini_truck" +
-                ", s.name supermarket_name ";
+                ", case when c.supermarket_id = 5 then '巴河' else s.name end as supermarket_name ";
         String fromsql = "from ordercluster_truck t \n" +
                 " left join ordercluster c on c.id = t.ordercluster_id \n" +
                 " left join supermarket s on s.id = c.supermarket_id \n" +

ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java

@@ -105,7 +105,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" +

ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java

@@ -3196,6 +3196,8 @@ public class OrderStatService {
                     total_price += DataUtil.getDefaultByRecord(r, "total_price");
                     xsl_1 += DataUtil.getDefaultByRecord(r, "xsl_1");
                     xse_1 += DataUtil.getDefaultByRecord(r, "xse_1");
+                    xsl_4 += DataUtil.getDefaultByRecord(r, "xsl_4");
+                    xse_4 += DataUtil.getDefaultByRecord(r, "xse_4");
 
                     all_prepay_total_amount += DataUtil.getDefaultByRecord(r, "prepay_total_amount");
                     all_refund_total_amount += DataUtil.getDefaultByRecord(r, "refund_total_amount");

ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/transport/TransportService.java

@@ -55,15 +55,20 @@ public class TransportService extends BaseService {
      * @return
      */
     public Page<Record> find(PageParam pp, String order_sn, String stm, String etm, String truck_license, Integer supermarket_id, Integer trans_co_id, Integer state, Integer supermarket_type) {
-        String selectsql = "select t.*, s.name supermarket_name ";
+        String selectsql = "select t.*, case when t.supermarket_id = 4 then '巴河' else s.name end as supermarket_name ";
         String fromsql = "from transport t \n" +
                 " left join supermarket s on s.id = t.supermarket_id \n" +
                 " where 1=1 "; // 只显示未删除的
         List<Object> paraList = new ArrayList<>();
 
         if (supermarket_id != null && supermarket_id > 0) {
-            fromsql += " and t.supermarket_id = ? \n";
+            if(supermarket_id == 4){
-            paraList.add(supermarket_id);
+                fromsql += " and t.supermarket_id in (4,5) \n";
+            } else{
+                fromsql += " and t.supermarket_id = ? \n";
+                paraList.add(supermarket_id);
+            }
+
         }
         if (supermarket_type != null) {
             fromsql += " and s.type = ? \n";

ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/supermarket/SupermarketController.java

@@ -61,4 +61,8 @@ public class SupermarketController extends Controller {
     public void list() {
         renderJson(Result.object(SupermarketService.me.list()));
     }
+
+    public void newlist() {
+        renderJson(Result.object(SupermarketService.me.newlist()));
+    }
 }