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

运输日志，砂站取土场距离，消费明细等查询接口修改

dev
wany 2025-07-16 10:06:06 +08:00
parent 5d4c1cec7d
commit d4a9c53ed8
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ public class OrderTempService extends BaseService {
", 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 \n" +
", s.name supermarket_name \n" +
", case when s.id = 5 then '巴河' else s.name end as supermarket_name \n" +
", case when v.state is not null then 1 end invoice_invalid_verify_state \n" + // 只需要标记是 1，不需要反映 state = 2
", case when ov.state is not null then 1 end order_invalid_verify_state \n" + // 只需要标记是 1，不需要反映 state = 2
" from order_temp t \n" +
@ -140,9 +140,13 @@ public class OrderTempService extends BaseService {
}
if (supermarket_id != null) {
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) {
fromsql += " and s.type = ? \n";

2
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/prepay/PrepayService.java
View File

@ -212,7 +212,7 @@ public class PrepayService {
" ,p.type \n" +
" ,p.second_weight - p.first_weight net_weight\n" +
" ,a.supermarket_id \n" +
" ,s.`name` supermarket_name \n" +
" ,case when a.supermarket_id = 5 then '巴河' else s.`name` end as supermarket_name \n" +
" ,a.truck_license \n" +
" ,a.weight \n" +
" ,a.total_price \n" +

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

@ -2980,7 +2980,7 @@ public class OrderStatService {
" ifnull( sum( g.weight ), 0 ) weight,\n" +
" ifnull( sum( g.total_price ), 0 ) total_price,\n" +
" ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.weight END ), 0 ) xsl_1,\n" +
" ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.total_price END ), 0 ) xse_1\n" +
" ifnull( sum( CASE WHEN g.supermarket_id = 1 THEN g.total_price END ), 0 ) xse_1,\n" +
" ifnull( sum( CASE WHEN g.supermarket_id in (4,5) THEN g.weight END ), 0 ) xsl_4,\n" +
" ifnull( sum( CASE WHEN g.supermarket_id in (4,5) THEN g.total_price END ), 0 ) xse_4\n" +
"FROM\n" +

2
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceService.java
View File

@ -85,7 +85,7 @@ public class SupermarketSandfarmDistanceService extends BaseService {
* @return
*/
public Record findAllSupermarket(PageParam pp, Integer customer_id, String customer_name) {
List<Supermarket> cols = Supermarket.dao.find("select id, name, name2 from supermarket where del = 0 AND TYPE = 0 ");
List<Supermarket> cols = Supermarket.dao.find("select id, name, name2 from supermarket where del = 0 AND TYPE = 0 and id != 5");
String selectsql = "select t.*, sr.supermarket_id, sr.distance ";
String fromsql = " from supermarket t\n" +
" left join (\n" +