xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

发票管理，结算单领取查询接口修改

dev
wany 2025-07-17 14:19:13 +08:00
parent 138ea61881
commit dbda413e86
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.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_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.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"; ", ot.trans_price in_trans_price, ot.weight in_weight \n";
String fromsql = "from order_temp t \n" + String fromsql = "from order_temp t \n" +
" left join transport p on p.order_sn = t.sn \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) { if (supermarket_id != null) {
fromsql += " and s.id = ? \n"; if(supermarket_id == 4){
paraList.add(supermarket_id); fromsql += " and s.id in (4,5) \n";
}else{
fromsql += " and s.id = ? \n";
paraList.add(supermarket_id);
}
} }
if (supermarket_type != null) { if (supermarket_type != null) {

8
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/receive/TicketReceiveService.java
View File

@ -144,8 +144,12 @@ public class TicketReceiveService extends BaseService {
List<Object> paraList = new ArrayList<>(); List<Object> paraList = new ArrayList<>();
if (supermarket_id != null) { 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 (supermarket_type != null) { if (supermarket_type != null) {