From f1708ffb3cf1656cc89fe146b9d104ee4dd98264 Mon Sep 17 00:00:00 2001 From: xhj Date: Tue, 3 Jun 2025 17:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9C=88=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=B8=8A=E6=96=99=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gj_erp/controller/pgd/PgdSljhController.java | 14 +++++++++++++- src/main/resources/mappers/jhgk/DmYdjhMapper.xml | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index 0d39535..8652d30 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java @@ -555,7 +555,7 @@ public class PgdSljhController { String cjs1=cjs; // 根据需求批量 船号 去 查询 List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", slKc.getZYCH() ).eq("isnull(ZT,'')","2") - .eq("dc_pl",slKc.getZYPL()) + .eq("dc_pl",slKc.getZYPL()).eq("ifnull(slkcdw,'')","") ); DmYdjh dmYdjh = ydjhs.stream() .filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getZYCH()) @@ -1220,6 +1220,18 @@ public class PgdSljhController { // 使用 EasyExcel 进行导出 EasyExcel.write(response.getOutputStream(), PwExportExcel.class).sheet("Sheet1").doWrite(excels); } + + + // 订单跨道 + public Map ddkd (String cgkw){ + Map map= new HashMap(); + if(StringUtils.isBlank(cgkw)){ + return null; + } + // if(cgkw.contains()) + + return map; + } } diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index cc49ed1..69076e7 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -1265,7 +1265,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl - from dm_ydjh LEFT JOIN dm_bchxylp ON dm_ydjh.dc_ch=dm_bchxylp.dc_ch AND dm_ydjh.dc_pl=dm_bchxylp.dc_pl AND + from dm_ydjh inner JOIN dm_bchxylp ON dm_ydjh.dc_ch=dm_bchxylp.dc_ch AND dm_ydjh.dc_pl=dm_bchxylp.dc_pl AND dm_ydjh.tzbh=dm_bchxylp.tzbh AND dm_ydjh.wpgg=dm_bchxylp.wpgg and dm_ydjh.wpxh=dm_bchxylp.wpxh where isnull(dm_ydjh.ylbs,'')='' and dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl}