From 969fec76e570bc3b07a806c6da2e855c5229284e Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Thu, 31 Oct 2024 10:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/pgd/PgdSljhController.java     | 122 ++++++------------
 1 file changed, 38 insertions(+), 84 deletions(-)

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 de3abd2..ca46701 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
@@ -417,7 +417,7 @@ public class PgdSljhController {
                 ydupList.add(dmYdjh);
                // ckupList.add(imCkwpkwp);
 
-                slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl()));
+                slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(),dmYdjh.getTzbh()));
                 slKc.setZYCH(dmYdjh.getDcCh());
                 slKc.setZYPL(dmYdjh.getDcPl());
               //  slKc.setZYLX(dmYdjh.getZl());
@@ -504,7 +504,7 @@ public class PgdSljhController {
                     dmYdjh.setSlhth(slKc.getDcFd());
                     dmYdjh.setSlwlh(slKc.getWPH());
                     dmYdjh.setKcch(slKc.getDCCH());
-                    imCkwpkwp.setZylx(getLx(dmYdjh.getLqlb(), dmYdjh.getZl()));
+                    imCkwpkwp.setZylx(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(),dmYdjh.getTzbh()));
                     imCkwpkwp.setSldw(dmYdjh.getKw());
                     imCkwpkwp.setDhh(dmYdjh.getSljhrq());
                     //slKc.setPwwz(dmYdjh.getKw());
@@ -788,7 +788,7 @@ public class PgdSljhController {
 //    }
 
 
-    public  String getLx(String lqlb ,String zl){
+    public  String getLx(String lqlb ,String zl,String tzbh){
 //        1000	数中大
 //        1001	数小
 //        1002	数中
@@ -800,95 +800,49 @@ public class PgdSljhController {
 //        1007	手大
 //        1008	手中大
 //        1009	焊接机器人肘板 --
+        String mm="";
+        if(tzbh.substring(4, 5).equals("S")){
+            mm="手";
+        }else if(tzbh.substring(4, 5).equals("N")){
+            mm="数";
+        }
 
+//
 
-//        1010	手工
-//        1020	数控
-        if("1010".equals(lqlb)){
-                if("1110".equals(zl)){ //数中大
-                    return "1005";
+            String bh = tzbh.substring(6, 8);  // 72
+            if (tzbh.substring(4, 5).equals("X")) {   // 51
+//                if ("XX".equalsIgnoreCase(bh)) {
+//                    return "小组立";
+//                } else if ("XD".equalsIgnoreCase(bh)) {
+//                    return "中大组立";
+//                }
+                return "";
+            } else {
+                if ("XX".equalsIgnoreCase(bh)) {
+                    return "1009"; // todo 小组
                 }
-            if("1020".equals(zl)){ //数中
-                return "1006";
-            }
-            if("1060".equals(zl)){ //数大
-                return "1007";
-            }
-            if("1030".equals(zl)){ //数大
-                return "1008";
             }
+            String bh1 = tzbh.substring(7, 8);  // 81
+            if ("X".equalsIgnoreCase(bh1)) {
 
-            if("1110".equals(zl)){ //数小
-                return "1008";
+                if(mm.equals("手")){
+                    return "1005";
+                }else if (mm.equals("数")){
+                    return "1001";
+                }
             }
+            if ("D".equalsIgnoreCase(bh1)) {
+               // return "中大组立";
 
-
-
-
-        }
-        if("1020".equals(lqlb)){
-            if("1010".equals(zl)){ //手中大
-                return "1001";
-            }
-            if("1020".equals(zl)){ //数小
-                return "1002";
-            }
-            if("1060".equals(zl)){ //数中
-                return "1003";
-            }
-            if("1090".equals(zl)){ //数大
-                return "1004";
-            }
-            if("1030".equals(zl)){ //数大
-                return "1000";
-            }
-            if("1110".equals(zl)){ //数大
-                return "1000";
+                if(mm.equals("手")){
+                    return "1008";
+                }else if (mm.equals("数")){
+                    return "1000";
+                }
             }
-        }
+            return "";
+
 
-        if("4230".equals(zl)){ //焊接机器人肘板
-            return "1009";
-        }
-        return "";
-
-
-//        if ls_zl = '4230' then
-//        dw_1.object.zylx[ll_j] ='1009'			//焊接机器人肘板
-//        end if
-//        //手工
-//        if ls_lqlb = '1010' then
-//        choose case ls_zl
-//        case '1010'		//小组
-//        dw_1.object.zylx[ll_j] ='1005'			//流向手小
-//        case '1020'		//中组立
-//        dw_1.object.zylx[ll_j] ='1006'			//流向手中
-//        case '1060'		//大组立
-//        dw_1.object.zylx[ll_j] ='1007'			//流向手大
-//        case '1030'		//大中组立
-//        dw_1.object.zylx[ll_j] ='1008'			//流向手中大
-//        case '1110'		//中大组立
-//        dw_1.object.zylx[ll_j] ='1008'			//流向手中大
-//        end choose
-//
-//        elseif ls_lqlb = '1020' then
-//        //数控
-//        choose case ls_zl
-//        case '1010'		//小组
-//        dw_1.object.zylx[ll_j] ='1001'			//流向数小
-//        case '1020'		//中组立
-//        dw_1.object.zylx[ll_j] ='1002'			//流向数中
-//        case '1060'		//大组立
-//        dw_1.object.zylx[ll_j] ='1003'			//流向数大
-//        case '1090'		//外板曲加工
-//        dw_1.object.zylx[ll_j] ='1004'			//流向数曲
-//        case '1030'		//大中组立
-//        dw_1.object.zylx[ll_j] ='1000'			//流向数中大
-//        case '1110'		//中大组立
-//        dw_1.object.zylx[ll_j] ='1000'			//流向数中大
-//
-//        end choose
-//        end if
     }
 
     @PostMapping("kcAdnSlBd2")
@@ -956,7 +910,7 @@ public class PgdSljhController {
 
 
 
-                slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl()));
+                slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(),dmYdjh.getTzbh()));
                 slKc.setZYCH(dmYdjh.getDcCh());
                 slKc.setZYPL(dmYdjh.getDcPl());
                 slKc.setDCTH(dmYdjh.getTzbh());