11

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderServiceImpl.java

@@ -301,9 +301,9 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                     //不存在则添加新工艺
 //                    if (fbsTechnologicalProcessList == null || fbsTechnologicalProcessList.size() <= 0) {
                         //先把旧的工艺进行删除 这种方式不行会影响到扫码记录的工艺关联
-//                        FbsTechnologicalProcess fbsTechnologicalProcessUpdate=new FbsTechnologicalProcess();
+                        FbsTechnologicalProcess fbsTechnologicalProcessUpdate=new FbsTechnologicalProcess();
-//                        fbsTechnologicalProcessUpdate.setDelFlag("1");
+                        fbsTechnologicalProcessUpdate.setDelFlag("1");
-//                        iFbsTechnologicalProcessService.update(fbsTechnologicalProcessUpdate,fbsTechnologicalProcessQueryWrapper);
+                        iFbsTechnologicalProcessService.update(fbsTechnologicalProcessUpdate,fbsTechnologicalProcessQueryWrapper);
 
                         FbsTechnologicalProcess fbsTechnologicalProcess = new FbsTechnologicalProcess();
                         fbsTechnologicalProcess.setName(invcode);
@@ -311,20 +311,21 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                         fbsTechnologicalProcess.setDef1(def1);//
                         fbsTechnologicalProcess.setCreateBy("adminSAP");
                         fbsTechnologicalProcess.setPullDate(end + "");
-                    List<FbsTechnologicalProcessItem> itemList=new ArrayList<>();
+                    iFbsTechnologicalProcessService.save(fbsTechnologicalProcess);//插入数据库
-                    //判断是否存在工艺
+//                    List<FbsTechnologicalProcessItem> itemList=new ArrayList<>();
-                    if (fbsTechnologicalProcessList == null || fbsTechnologicalProcessList.size() <= 0) {
+//                    //判断是否存在工艺
-                        //不存在则进行修改
+//                    if (fbsTechnologicalProcessList == null || fbsTechnologicalProcessList.size() <= 0) {
-                        iFbsTechnologicalProcessService.save(fbsTechnologicalProcess);//插入数据库
+//                        //不存在则进行修改
-                    }else{
+//                        iFbsTechnologicalProcessService.save(fbsTechnologicalProcess);//插入数据库
-                        //存在则进行修改
+//                    }else{
-                        fbsTechnologicalProcess.setId(fbsTechnologicalProcessList.get(0).getId());
+//                        //存在则进行修改
-                        iFbsTechnologicalProcessService.updateById(fbsTechnologicalProcess);
+//                        fbsTechnologicalProcess.setId(fbsTechnologicalProcessList.get(0).getId());
-                        //获取工艺的工序
+//                        iFbsTechnologicalProcessService.updateById(fbsTechnologicalProcess);
-                        QueryWrapper<FbsTechnologicalProcessItem>  fbsTechnologicalProcessItemQueryWrapper=new QueryWrapper<>();
+//                        //获取工艺的工序
-                        fbsTechnologicalProcessItemQueryWrapper.lambda().eq(FbsTechnologicalProcessItem::getFbsTechnologicalProcessId,fbsTechnologicalProcess.getId());
+//                        QueryWrapper<FbsTechnologicalProcessItem>  fbsTechnologicalProcessItemQueryWrapper=new QueryWrapper<>();
-                        itemList=iFbsTechnologicalProcessItemService.list(fbsTechnologicalProcessItemQueryWrapper);
+//                        fbsTechnologicalProcessItemQueryWrapper.lambda().eq(FbsTechnologicalProcessItem::getFbsTechnologicalProcessId,fbsTechnologicalProcess.getId());
-                    }
+//                        itemList=iFbsTechnologicalProcessItemService.list(fbsTechnologicalProcessItemQueryWrapper);
+//                    }
                         //获取工艺明细数据
                         List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemList = new ArrayList<>();
                         for (int i = 0; i < PROCS.size(); i++) {
@@ -346,30 +347,31 @@ public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMo
                             }
                             fbsTechnologicalProcessItem.setStandardWorkingHours(STANDARDWORKINGHOURS);//标准工时
                             fbsTechnologicalProcessItem.setSort(i);//排序
-                            //判断是否存在的工艺
+                            fbsTechnologicalProcessItemList.add(fbsTechnologicalProcessItem);
-                            if (fbsTechnologicalProcessList == null || fbsTechnologicalProcessList.size() <= 0) {
+//                            //判断是否存在的工艺
-                                //不存在则都进行新增
+//                            if (fbsTechnologicalProcessList == null || fbsTechnologicalProcessList.size() <= 0) {
-                                fbsTechnologicalProcessItemList.add(fbsTechnologicalProcessItem);
+//                                //不存在则都进行新增
-                            }else{
+//                                fbsTechnologicalProcessItemList.add(fbsTechnologicalProcessItem);
-                                boolean isitem=false;
+//                            }else{
-                                //循环存在的工序进行绑定存在的id
+//                                boolean isitem=false;
-                                if(itemList!=null&&itemList.size()>0){
+//                                //循环存在的工序进行绑定存在的id
-                                    for(FbsTechnologicalProcessItem item:itemList){
+//                                if(itemList!=null&&itemList.size()>0){
-                                        if(item.getName().equals(fbsTechnologicalProcessItem.getName())){
+//                                    for(FbsTechnologicalProcessItem item:itemList){
-                                            isitem=true;
+//                                        if(item.getName().equals(fbsTechnologicalProcessItem.getName())){
-                                            fbsTechnologicalProcessItem.setId(item.getId());
+//                                            isitem=true;
-                                        }
+//                                            fbsTechnologicalProcessItem.setId(item.getId());
-                                    }
+//                                        }
-                                }
+//                                    }
-                                //判断工序是否存在
+//                                }
-                                if(isitem){
+//                                //判断工序是否存在
-                                    //存在的进行修改
+//                                if(isitem){
-                                    iFbsTechnologicalProcessItemService.updateById(fbsTechnologicalProcessItem);
+//                                    //存在的进行修改
-                                }else{
+//                                    iFbsTechnologicalProcessItemService.updateById(fbsTechnologicalProcessItem);
-                                    //不存在进行新增
+//                                }else{
-                                    fbsTechnologicalProcessItemList.add(fbsTechnologicalProcessItem);
+//                                    //不存在进行新增
-                                }
+//                                    fbsTechnologicalProcessItemList.add(fbsTechnologicalProcessItem);
-                            }
+//                                }
+//                            }
                         }
                         if(fbsTechnologicalProcessItemList!=null&&fbsTechnologicalProcessItemList.size()>0){
                             iFbsTechnologicalProcessItemService.saveBatch(fbsTechnologicalProcessItemList);//插入数据库