From 5cfa75bfa093c0ff78dffc6517321f9c6992a860 Mon Sep 17 00:00:00 2001 From: xhj Date: Fri, 20 Dec 2024 11:26:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java | 1 + .../gj_erp/controller/pgd/PgdSljhController.java | 5 ++++- .../com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java | 1 + .../service/jcsj/impl/BomUploadServiceImpl.java | 12 ++++++++++-- src/main/resources/mappers/jhgk/DmYdjhMapper.xml | 15 ++++++++++----- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index 17a32a1..50fbe5c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -373,6 +373,7 @@ public class DmYdjh implements Serializable { private String zyq; private String zyq1; private String ykw; + private String kwmc; @TableField(exist = false) 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 23fe269..d51a478 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 @@ -1164,7 +1164,10 @@ public class PgdSljhController { if(StringUtils.isNotBlank(vo.getNbsbm())){ map.put("nbsbm",vo.getNbsbm()); List slKcs = imCkwpkwpMapper.slxxKcList(map); - slKcs1.add(slKcs.get(0)); + if(slKcs.size()>0){ + slKcs1.add(slKcs.get(0)); + } + } diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java index 56f35fa..115aa8a 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java @@ -69,4 +69,5 @@ public interface DmYdjhMapper extends BaseMapper { List> getYdjhByZt(String zyq,Integer zt,String wgzt,String wclzt,String from, String to); void xzylbs(String dcch,String dcpl); + void updatezyq(String dcch,String dcpl); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java index e612f73..61678d3 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java @@ -278,6 +278,7 @@ public class BomUploadServiceImpl { // 修正数据 dmYdjhMapper.xzylbs(czbh,pl); + dmYdjhMapper.updatezyq(czbh,pl); for (MultipartFile f : file) { String fname = f.getOriginalFilename(); fname = fname.substring(fname.lastIndexOf('/') + 1); @@ -947,6 +948,7 @@ public class BomUploadServiceImpl { List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); Map zllbMap = zllbs.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); Map kwxxMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map kwmcMap = kwxxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getZfbz)); Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBmsm, Dm_zhbmp::getBM)); int cs = 0; if (tltListOld.size() > 0 && "01".equals(zt) && tld == 1) { @@ -1114,7 +1116,7 @@ public class BomUploadServiceImpl { bchxmxpService.saveBatch(addmxs); bchxjbpService.saveBatch(adds); //List dmBchxjbps,Map kwxxMap,Map qgKwMap , HttpServletRequest req - Map bomxzjh = bomxzjh(adds, kwxxMap, qgKwMap, req,addmxs); + Map bomxzjh = bomxzjh(adds, kwxxMap, kwmcMap,qgKwMap, req,addmxs); List adds1 = (List) bomxzjh.get("adds"); List ups = (List) bomxzjh.get("ups"); List yds = (List) bomxzjh.get("ydjhs"); @@ -1819,7 +1821,7 @@ public class BomUploadServiceImpl { // 查询 船号 批量 修正作业计划 - public Map bomxzjh( List dmBchxjbps,Map kwxxMap,Map qgKwMap , HttpServletRequest req,Listmxs){ + public Map bomxzjh( List dmBchxjbps,Map kwxxMap, Map kwmcMap,Map qgKwMap , HttpServletRequest req,Listmxs){ String dcch=dmBchxjbps.get(0).getDcCh(); String dcpl=dmBchxjbps.get(0).getDcPl(); Map rMap = new HashMap(); @@ -1906,6 +1908,8 @@ public class BomUploadServiceImpl { dmYdjh.setLjsl(dmBchxjbp.getLjsl().doubleValue()); dmYdjh.setZl(dmBchxjbp.getDcZl()); String s = (String) kwxxMap.get(tzbh.substring(4, 7)); + String b = (String) kwmcMap.get(tzbh.substring(4, 7)); + dmYdjh.setKwmc(b); String zzcj = (String) qgKwMap.get(s); //xhj dmYdjh.setKw(zzcj); @@ -1991,6 +1995,8 @@ public class BomUploadServiceImpl { if(null!=bchxylp) { dmYdjh.setYlbs(null == bchxylp.getSfyl() ? "" : bchxylp.getSfyl()); } + String b = (String) kwmcMap.get(tzbh.substring(4, 7)); + dmYdjh.setKwmc(b); String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String zzcj = (String) qgKwMap.get(s); //xhj @@ -2067,6 +2073,8 @@ public class BomUploadServiceImpl { dmYdjhadd.setQgcd(dmBchxjbp.getYlzd4().doubleValue()); dmYdjhadd.setLjsl(dmBchxjbp.getLjsl().doubleValue()); dmYdjhadd.setZl(dmBchxjbp.getDcZl()); + String b = (String) kwmcMap.get(tzbh.substring(4, 7)); + dmYdjh.setKwmc(b); String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String zzcj = (String) qgKwMap.get(s); //xhj dmYdjhadd.setKw(zzcj); diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index a29f3a1..17b32d5 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml @@ -947,7 +947,15 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl} - UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl, + 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 + 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} + + + + + UPDATE dm_ydjh set dm_ydjh.zyq= (CASE substring(RTRIM(dm_ydjh.tzbh),6,1) WHEN '1' THEN 'FP2Q' WHEN '3' THEN 'FP2Q' @@ -965,10 +973,7 @@ END), dm_ydjh.zyq1= (CASE substring(RTRIM(dm_ydjh.tzbh),6,1) WHEN '6' THEN '四区' ELSE '' END) - 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 - 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} +where dm_ydjh.DC_CH=#{dcch} and dm_ydjh.dc_pl=#{dcpl} -