Merge branch 'master' of https://www.sanduolantoyoga.com/xiaoning/gj_erp

src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java

@@ -555,7 +555,7 @@ public class PgdSljhController {
             String cjs1=cjs;
             // 根据需求批量 船号 去 查询
             List<DmYdjh> ydjhs = dmYdjhService.list(new QueryWrapper<DmYdjh>().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;
+    }
 }
 
 

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -1265,7 +1265,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
 
     <update id="xzylbs"   parameterType="string" >
         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}
     </update>