2024-08-05 材料计划导入删除项目材料计划重复导入校验

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -1340,7 +1340,7 @@ public class HGSCTools {
     }
 
     public static class THGSC009{
-           /* public static void generatorOrder(List<HGSC005> hgsc005List, List<HGSC005A> hgsc005AList){
+        /* public static void generatorOrder(List<HGSC005> hgsc005List, List<HGSC005A> hgsc005AList){
                 Map<String, Optional<HGSC005>> hgsc005Map = hgsc005List.stream().collect(Collectors.groupingBy(HGSC005::getPlanCode,Collectors.maxBy(
                         Comparator.comparingLong(HGSC005::getId))));
                 Map<String,List<HGSC005A>> hgsc005aMap = hgsc005AList.stream().collect(Collectors.groupingBy(HGSC005A::getPlanCode));
@@ -1351,9 +1351,9 @@ public class HGSCTools {
                     DaoUtils.insert(HGSC006.INSERT,hgsc006);
                     DaoUtils.insert(HGSC006A.INSERT,hgsc006AList);
                 });
-            }*/
+        }*/
 
-            /*public static HGSC006 constructObj(HGSC005 hgsc005){
+        /*public static HGSC006 constructObj(HGSC005 hgsc005){
                 HGSC006 hgsc006 = new HGSC006();
                 hgsc006.setOrderCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.HGSC006_ORDER_CODE));
                 hgsc006.setMatId(hgsc005.getMatId());
@@ -1364,7 +1364,7 @@ public class HGSCTools {
                 hgsc006.setProjName(hgsc005.getProjName());
                 hgsc006.setAssignStatus(UNASSIGN.getCode());
                 return hgsc006;
-            }*/
+        }*/
         public static HGSC009 getById(Long taskId){
             AssertUtils.isTrue(Objects.isNull(taskId)||taskId<=0, "材料计划ID不能为空！");
             HGSC009 results = (HGSC009)DaoBase.getInstance().get(HGSC009.QUERY, HGSC009.FIELD_ID, taskId);
@@ -1411,13 +1411,14 @@ public class HGSCTools {
             for (HGSC009 hgsc009:hgsc009List) {
                 HGSC001 hgsc001 = Hgsc001.queryByCode(hgsc009.getProjCode());
                 AssertUtils.isNull(hgsc001,"项目不存在，添加失败！");
-                HGSC009 sc009 = queryByCode(hgsc009.getProjCode());
-                AssertUtils.isNotNull(sc009,"材料计划项目已添加，添加失败！");
+                //HGSC009 sc009 = queryByCode(hgsc009.getProjCode());
+                //AssertUtils.isNotNull(sc009,"材料计划项目已添加，添加失败！");
                 if (hgsc001.getCompanyCode() != null) {
                     hgsc009.setCompanyCode(hgsc001.getCompanyCode());
+                    hgsc009.setCompanyName(hgsc001.getCompanyName());
+                    hgsc009.setProjName(hgsc001.getProjName());
                 }
-                hgsc009.setCompanyName(hgsc001.getCompanyName());
-                hgsc009.setProjName(hgsc001.getProjName());
+
                 hgsc009.setPlanMaterialCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.PLAN_MATERIAL_CODE));
                 DaoUtils.insert(HGSC009.INSERT,hgsc009);
                 for (HGSC009A hgsc009a: hgsc009aList) {