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