Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java

@@ -65,6 +65,7 @@ public class SlKc {
     private String dyrq;
     private String ydid;
     private Integer xh;
+    private String cz;
 
     private List<SlKc> list;
 }

src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java

@@ -75,9 +75,13 @@ public class DmYdjhController {
 //            .ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
 //            .le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"))
 //            .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
+            if(StringUtils.isBlank(map.get("yf"))){
+
+            }else{
+                map.put("yf",DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"));
+                map.put("yf1",DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"));
+            }
 
-            map.put("yf",DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"));
-            map.put("yf1",DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf"))).toString("yyyy/MM/dd"));
         List<DmYdjh> getydjhhz = dmYdjhMapper.getydjhhz(map);
         return new ResultBean(getydjhhz);
     }

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

@@ -871,6 +871,32 @@ public class PgdSljhController {
 
     }
 
+    public String getwpcz(String wpcz){
+        if(wpcz.contains("ABS")){
+            return wpcz.replace("ABS","");
+        }else if (wpcz.contains("ABS/CCS")){
+            return wpcz.replace("ABS/CCS","");
+        }else if (wpcz.contains("BV/CCS")){
+            return wpcz.replace("BV/CCS","");
+        }else if (wpcz.contains("CCS")){
+            return wpcz.replace("CCS","");
+        }else if (wpcz.contains("DNV")){
+            return wpcz.replace("DNV","");
+        }else if (wpcz.contains("DNV/CCS")){
+            return wpcz.replace("DNV/CCS","");
+        }else if (wpcz.contains("DNV/GL")){
+            return wpcz.replace("DNV/GL","");
+        }else if (wpcz.contains("LR")){
+            return wpcz.replace("LR","");
+        }else if (wpcz.contains("LR/CCS")){
+            return wpcz.replace("LR/CCS","");
+        }else {
+            return wpcz;
+        }
+
+        //return wpcz;
+    }
+
     @PostMapping("kcAdnSlBd2")
     @ResponseBody
     public ResultBean kcAdnSlBd2(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
@@ -886,9 +912,17 @@ public class PgdSljhController {
         qw.orderBy(true,true,"sljhrq");
         List<DmYdjh> ydjhs = dmYdjhService.list(qw);
          //库存标识 不等于 01 没有匹配上
-
-
-
+        /***
+         * ABS
+         * ABS/CCS
+         * BV/CCS
+         * CCS
+         * DNV
+         * DNV/CCS
+         * DNV/GL
+         * LR
+         * LR/CCS
+         */
 
 
 
@@ -898,6 +932,8 @@ public class PgdSljhController {
         List<SlKc>ckupList=new ArrayList<>();
         // 进行比对
         for(SlKc slKc :slKcs){
+
+
             // 获取船级社
             String cjs="";
             DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null);
@@ -915,7 +951,8 @@ public class PgdSljhController {
                     &&  StringUtils.isNotBlank(fst.getWpxh())
                     && fst.getWpgg().equalsIgnoreCase(slKc.getWPGG())
                     && (fst.getWpxh().equalsIgnoreCase(slKc.getWPXH())
-                    || (cjs1 + fst.getWpxh()).equalsIgnoreCase(slKc.getWPXH()))
+                    || (cjs1 + fst.getWpxh()).equalsIgnoreCase(slKc.getWPXH())
+                    || ("DY".equalsIgnoreCase(slKc.getWPZT()) && getwpcz(slKc.getWPXH()).equalsIgnoreCase(fst.getWpxh())))
                 )
                 .findFirst()
                 .orElse(null);