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

取土场砂站距离修改

dev
wany 2025-07-18 14:15:57 +08:00
parent b61d9bda2d
commit b3760efa1d
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,8 +120,8 @@ 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, case when t.supermarket_id = 5 then '巴河' else s.name end as supermarket_name \n" +
", s1.name customer_name \n" +
", p.arrive_time, p.type, p.memo transport_memo, s.name supermarket_name \n" +
", case when t.supermarket_id = 5 then '巴河' else s1.name end as customer_name \n" +
", t.trans_price in_trans_price, t.weight in_weight,ot.ticket_code as old_ticket_code \n";
fromsql = "from order_transfer t \n" +
" left join transport p on p.order_sn = t.sn \n" +

11
ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/ticket/invalidverify/TicketInvalidVerifyService.java
View File

@ -32,7 +32,7 @@ public class TicketInvalidVerifyService extends BaseService {
Integer supermarket_type,
Integer state
) {
String selectsql = "select t.*, s.name supermarket_name ";
String selectsql = "select t.*, case when t.supermarket_id = 5 then '巴河' else s.name end as supermarket_name ";
String fromsql = "from ticket_invalid_verify t \n" +
" left join supermarket s on s.id = t.supermarket_id \n" +
" where 1=1 ";
@ -64,8 +64,13 @@ public class TicketInvalidVerifyService extends BaseService {
}
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) {

2
ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceController.java
View File

@ -93,7 +93,7 @@ public class SupermarketSandfarmDistanceController extends Controller {
}
SupermarketSandfarmDistance model = getModel(SupermarketSandfarmDistance.class, "", true); // 忽略不在model中的字段
renderJson(SupermarketSandfarmDistanceService.me.update(model, tokenuser));
renderJson(SupermarketSandfarmDistanceSyncService.me.update(model, tokenuser));
}
/**

25
ssjygl-xsct-service/src/main/java/com/cowr/service/ssjygl/supermarket/sandfarmdistance/SupermarketSandfarmDistanceSyncService.java
View File

@ -9,7 +9,8 @@ public class SupermarketSandfarmDistanceSyncService extends BaseSyncService {
public static SupermarketSandfarmDistanceSyncService me = new SupermarketSandfarmDistanceSyncService();
public Result save(SupermarketSandfarmDistance model, Sysuser sysuser) {
Supermarket supermarket = SvrCacheData.SUP_CACHE.get(model.getSupermarketId());
Integer supermarket_id = model.getSupermarketId();
Supermarket supermarket = SvrCacheData.SUP_CACHE.get(supermarket_id);
if (supermarket == null) {
return Result.failed("未找到对应砂站信息");
@ -22,6 +23,26 @@ public class SupermarketSandfarmDistanceSyncService extends BaseSyncService {
return Result.failed("未找到对应砂场信息");
}
return super.save(model, sysuser);
Result result = super.save(model, sysuser);
if(supermarket_id == 4){
SupermarketSandfarmDistance newmodel = new SupermarketSandfarmDistance();
newmodel.setSupermarketId(5);
newmodel.setSandfarmId(model.getSandfarmId());
super.save(newmodel, sysuser);
}
return result;
}
public Result update(SupermarketSandfarmDistance model, Sysuser sysuser) {
Integer supermarket_id = model.getSupermarketId();
Result result = super.update(model, sysuser);
if(supermarket_id == 4){
SupermarketSandfarmDistance newmodel = new SupermarketSandfarmDistance();
newmodel.setSupermarketId(5);
newmodel.setSandfarmId(model.getSandfarmId());
super.update(newmodel, sysuser);
}
return result;
}
}