first

src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java

@@ -197,4 +197,9 @@ public class DmBom implements Serializable {
     private String  idd;
 
 
+    private String yidd;
+
+
+
+
 }

src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java

@@ -40,14 +40,14 @@ public class DmBomController {
 
     @PostMapping("/getListBom")
         public ResultBean getListBom(HttpServletRequest req, @RequestBody Map map) throws CustomException {
-           // List<BomVO> listBom = dmBomService.getListBom(req,map);
+            List<BomVO> listBom = dmBomService.getListBom(req,map);
 
-        String id = syService.f_getpjh("DM", "SYSTEM", "BCHX");
+//        String id = syService.f_getpjh("DM", "SYSTEM", "BCHX");
-        String id1= syService.f_getpjh("DM", "SYSTEM", "CLDE");
+//        String id1= syService.f_getpjh("DM", "SYSTEM", "CLDE");
-        System.out.println("id = " + id);
+//        System.out.println("id = " + id);
-        System.out.println("id = " + id1);
+//        System.out.println("id = " + id1);
 //            return  new ResultBean(listBom);
-            return  new ResultBean(null);
+            return  new ResultBean(listBom);
         }
     @PostMapping("/getListBomRealy")
     public ResultBean getListBomRealy(HttpServletRequest req, @RequestBody Map map) throws CustomException {

src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java

@@ -576,7 +576,7 @@ public class BomUploadServiceImpl {
                 ls_jgdm = "1020";
             }
             if (fileName.contains("手工")) {
-                ls_jgdm = "1030";
+                ls_jgdm = "1010";
             }
         }
         int cs = 0;
@@ -619,7 +619,7 @@ public class BomUploadServiceImpl {
                 bchxylp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
                 if (cbbm.getXbz().equals("N")) {
                     if ("N".equals(splitLine[0].substring(0, 1))) {
-                        ls_jgdm = "1030";
+                        ls_jgdm = "1010";
                     } else {
                         ls_jgdm = "1020";
                     }
@@ -630,7 +630,7 @@ public class BomUploadServiceImpl {
                 String tzbh = splitLine[0];
                 String hxlx = "";
                 if (tzbh.substring(4, 5).equals("S")) {
-                    hxlx = "1030";
+                    hxlx = "1010";
                 } else if (tzbh.substring(4, 5).equals("N")) {
                     hxlx = "1020";
                 }
@@ -677,7 +677,7 @@ public class BomUploadServiceImpl {
                     bchxylp.setZdrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
                     if (cbbm.getXbz().equals("N")) {
                         if ("N".equals(splitLine[0].substring(0, 1))) {
-                            ls_jgdm = "1030";
+                            ls_jgdm = "1010";
                         } else {
                             ls_jgdm = "1020";
                         }
@@ -691,7 +691,7 @@ public class BomUploadServiceImpl {
                     String tzbh = splitLine[0];
                     String hxlx = "";
                     if (tzbh.substring(4, 5).equals("S")) {
-                        hxlx = "1030";
+                        hxlx = "1010";
                     } else if (tzbh.substring(4, 5).equals("N")) {
                         hxlx = "1020";
                     }
@@ -803,7 +803,7 @@ public class BomUploadServiceImpl {
             String tzbh = splitLine[0];
             String hxlx = "";
             if (tzbh.substring(4, 5).equals("S")) {
-                hxlx = "1030";
+                hxlx = "1010";
             } else if (tzbh.substring(4, 5).equals("N")) {
                 hxlx = "1020";
             }
@@ -871,13 +871,13 @@ public class BomUploadServiceImpl {
             String tzbh = tltLine[0];
             String hxlx = "";
             if (tzbh.substring(0, 1).equals("S")) {
-                hxlx = "1030";
+                hxlx = "1010";
             } else if (tzbh.substring(0, 1).equals("N")) {
                 hxlx = "1020";
             }
             // 根据图纸编号获取 手工，数控 跨位，组立，、
             if (tzbh.substring(4, 5).equals("S")) {
-                hxlx = "1030";
+                hxlx = "1010";
             } else if (tzbh.substring(4, 5).equals("N")) {
                 hxlx = "1020";
             }
@@ -1342,7 +1342,7 @@ public class BomUploadServiceImpl {
 //            String hxlx="";
 //            // 根据图纸编号获取 手工，数控 跨位，组立，、
 //            if(tzbh.substring(4,5).equals("S")){
-//                hxlx = "1030";
+//                hxlx = "1010";
 //            }else if(tzbh.substring(4,5).equals("N")){
 //                hxlx = "1020";
 //            }
@@ -1429,7 +1429,7 @@ public class BomUploadServiceImpl {
                     String hxlx = "";
                     // 根据图纸编号获取 手工，数控 跨位，组立，、
                     if (tzbh.substring(4, 5).equals("S")) {
-                        hxlx = "1030";
+                        hxlx = "1010";
                     } else if (tzbh.substring(4, 5).equals("N")) {
                         hxlx = "1020";
                     }
@@ -1486,7 +1486,7 @@ public class BomUploadServiceImpl {
                     String hxlx = "";
                     // 根据图纸编号获取 手工，数控 跨位，组立，、
                     if (tzbh.substring(4, 5).equals("S")) {
-                        hxlx = "1030";
+                        hxlx = "1010";
                     } else if (tzbh.substring(4, 5).equals("N")) {
                         hxlx = "1020";
                     }
@@ -1519,9 +1519,9 @@ public class BomUploadServiceImpl {
             }
         } else {
             if ("XX".equalsIgnoreCase(bh)) {
-                return "焊接机器人肘板";
+                return "焊接机器人肘板"; // todo 小组
             } else if ("GX".equalsIgnoreCase(bh)) {
-                return "光电";
+                return "光电";   // todo 
             }
         }
         String bh1 = tzbh.substring(7, 8);

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java

@@ -98,13 +98,15 @@ public class DmBomServiceImpl extends ServiceImpl<DmBomMapper, DmBom> implements
 
     @Override
     public void copyListBom(HttpServletRequest req, Map map) {
-        String czbh=(String) map.get("czbh");
+        String dcch=(String) map.get("dcch");
-        String sjch=(String) map.get("sjch");
+        String mbch=(String) map.get("mbch");
-        List<DmBom> list= this.list(new QueryWrapper<DmBom>().eq("dcch",sjch));
+        List<DmBom> list= this.list(new QueryWrapper<DmBom>().eq("dcch",dcch));
         list.forEach(e->{
             e.setMbch(e.getDcch());
-            e.setDcch(czbh);
+            e.setDcch(mbch);
             e.setSjch("");
+            e.setId(null);
+            e.setYidd(e.getIdd());
         });
         this.saveBatch(list,1000);
         //this.saveBatch()