上料

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

@@ -547,12 +547,35 @@ public class PgdSljhController {
 
 
     public  String extractNumber(String str) {
-        Pattern pattern = Pattern.compile("-(\\d+)");
+        int hyphenIndex = str.indexOf('-');
-        Matcher matcher = pattern.matcher(str);
+        if (hyphenIndex != -1) {
-        if (matcher.find()) {
+            String substring = str.substring(hyphenIndex + 1);
-            return matcher.group(1);
+
+            if(substring.equals("2N")){
+                return "11";
+            }
+            if(substring.equals("2S")){
+                return "5";
+            }
+
+            if(substring.equals("2")){
+                return "9";
+            }
+            if(substring.equals("3S")){
+                return "6";
+            }
+            if(substring.equals("3Q")){
+                return "13";
+            }
+            if(substring.equals("4")){
+                return "15";
+            }
+            if(substring.equals("7")){
+                return "7-8";
+            }
+
         }
-        return "";
+        return ""; // Return empty string if hyphen is not found
     }
     @PostMapping("kcAdnSlZx")
     @ResponseBody
@@ -716,7 +739,7 @@ public class PgdSljhController {
         String str= JSON.toJSONString(map.get("data1"));
         List<SlKc>  slKcs= JSONObject.parseArray(str, SlKc.class);
         
-   
+        boolean kwb= (boolean) map.get("flag");
         QueryWrapper<DmYdjh> qw =new QueryWrapper<>();
         qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"dc_ch",(String)map.get("dcch"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("dcpl")),"dc_pl",(String)map.get("dcpl"));
@@ -742,6 +765,9 @@ public class PgdSljhController {
             if(null!=dmCzjbb){
                 cjs=dmCzjbb.getCjs();
             }
+            if(StringUtils.isNotBlank(slKc.getZYCH())||StringUtils.isNotBlank(slKc.getZYPL()) ){
+                continue;
+            }
             String cjs1=cjs;
             DmYdjh dmYdjh = ydjhs.stream()
                 .filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getDCCH())
@@ -765,25 +791,32 @@ public class PgdSljhController {
                 dmYdjh.setSlycldw((Integer) map.get("dw"));
 
 
-//                ImCkwpkwp imCkwpkwp =new ImCkwpkwp();
-//                imCkwpkwp.setCkh(slKc.getCKH());
-//                imCkwpkwp.setWph(slKc.getWPH());
-//                imCkwpkwp.setKwh(slKc.getKWH());
-//                imCkwpkwp.setNbsbm(slKc.getNBSBM());
-//                imCkwpkwp.setYdid(dmYdjh.getId());
-//                imCkwpkwp.setZych(dmYdjh.getDcCh());
-//                imCkwpkwp.setZypl(dmYdjh.getDcPl());
-//                imCkwpkwp.setZylx(dmYdjh.getZl());
-//                imCkwpkwp.setSldw(dmYdjh.getKw());
                 ydupList.add(dmYdjh);
                 // ckupList.add(imCkwpkwp);
 
+
+
                 slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl()));
                 slKc.setZYCH(dmYdjh.getDcCh());
                 slKc.setZYPL(dmYdjh.getDcPl());
                 slKc.setDCTH(dmYdjh.getTzbh());
                 //  slKc.setZYLX(dmYdjh.getZl());
-                slKc.setSLDW(dmYdjh.getKw());
+                if(kwb){
+
+                    if(extractNumber(slKc.getDcFd()).equals("7-8")){
+                        if((extractNumber(slKc.getDcFd()).contains(dmYdjh.getKw()))){
+                            slKc.setSLDW(dmYdjh.getKw());
+                        }
+                    }else {
+                        if(dmYdjh.getKw().equals(extractNumber(slKc.getDcFd()))){
+                            slKc.setSLDW(dmYdjh.getKw());
+                        }
+                    }
+
+                }else{
+                    slKc.setSLDW(dmYdjh.getKw());
+                }
+
                 slKc.setDHH(dmYdjh.getSljhrq());
                 //slKc.setPwwz(dmYdjh.getKw());
                 slKc.setYdid(dmYdjh.getId());