修正

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

@@ -96,7 +96,8 @@ public class DmYdjhController {
             .eq(StrUtil.isNotEmpty(map.get("dcch")),"dc_ch",map.get("dcch"))
             .eq(StrUtil.isNotEmpty(map.get("dcpl")),"dc_pl",map.get("dcpl"))
             .eq("lx","B")
-            .and(wp->wp.ne("zt", "-1").or().ne("zt","99"))
+            .ne("zt","-1")
+//            .and(wp->wp.ne("zt", "-1").or().ne("zt","99"))
 
             .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb")
         );

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

@@ -154,6 +154,40 @@ public class PgdSljhController {
                     ydjh.setSllsh(id);
                     ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm"));
                     ydjh.setSldrry((String) req.getAttribute("yhms"));
+
+
+                    if("1".equals(slKc.getSLDW()) ||  "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW())
+                        || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW())
+                    ){
+                        ydjh.setZyq("FP2Q");
+                        ydjh.setZyq1("二区");
+
+                        ydjh.setKw(slKc.getSLDW());
+                    }
+                    if("10".equals(slKc.getSLDW()) ||  "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW())
+                        || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW())
+                    ){
+                        ydjh.setZyq("FP3Q");
+                        ydjh.setZyq1("三区");
+
+                        ydjh.setKw(slKc.getSLDW());
+
+                        //作业区默认值修正
+                        //二跨T型材腹板对应四区
+                        //二跨T型材面板对应三区 上面已处理 这里只做记录
+                        if("11".equals(slKc.getSLDW())){
+                            ydjh.setZyq("FP4Q");
+                            ydjh.setZyq1("四区");
+                        }
+                    }
+
+                    if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW())
+                    ){
+                        ydjh.setZyq("FP4Q");
+                        ydjh.setZyq1("四区");
+
+                        ydjh.setKw(slKc.getSLDW());
+                    }
                     if("11".equals(slKc.getSLDW())) {
                         ydjh.setZyq("FP4Q");
                         ydjh.setZyq1("四区");