From deb3fd075536721b3e59d9f25472f23395c2654a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 08 八月 2022 15:57:42 +0800
Subject: [PATCH] 散装件更新
---
src/main/java/com/whyc/service/WorksheetMainService.java | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index e6aefe2..1850062 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -5,14 +5,11 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
+import com.whyc.dto.WorksheetMainDTO;
import com.whyc.mapper.DocUserMapper;
import com.whyc.mapper.WorksheetLinkMapper;
import com.whyc.mapper.WorksheetMainMapper;
-import com.whyc.pojo.DocUser;
-import com.whyc.pojo.ProductBomApproving;
-import com.whyc.pojo.WorksheetLink;
-import com.whyc.pojo.WorksheetMain;
-import io.swagger.models.auth.In;
+import com.whyc.pojo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -41,6 +38,9 @@
@Autowired
@Lazy
private ProductBomApprovingService approvingService;
+
+ @Autowired
+ private ComponentProductApprovingService cpApprovingService;
@Transactional
public boolean submit(WorksheetMain main, DocUser user) {
@@ -121,6 +121,83 @@
}
});
approvingService.insert(bomList);
+ return true;
+ }
+
+ public boolean componentProductSubmit(WorksheetMainDTO mainDTO, DocUser user) {
+ List<ComponentProductApproving> approvingList = new LinkedList<>();
+ WorksheetMain main = mainDTO.getMain();
+ List<ComponentProductApproving> addedList = mainDTO.getAddedList();
+ List<ComponentProductApproving> replacedList = mainDTO.getReplacedList();
+ List<ComponentProductApproving> removedList = mainDTO.getRemovedList();
+
+ //鎻愪氦涓昏〃
+ main.setCreateUserId(user.getId());
+ //鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
+ if(user.getRoleId().equals("1001")){
+ if(main.getId()==null) {
+ main.setLevel(2);
+ main.setStatus(1);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(1);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(0);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1002")){
+ if(main.getId()==null) {
+ main.setLevel(1);
+ main.setStatus(2);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(2);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(1);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1003")){
+ main.setLevel(0);
+ main.setStatus(5);
+ mainMapper.insert(main);
+ }else{
+ return false;
+ }
+ //鏁ｈ浠�-浜у搧瀹℃壒鎻愪氦
+ if(addedList!=null && addedList.size()!=0){
+ addedList.forEach(item->{
+ item.setMainId(main.getId());
+ item.setLinkType(1);
+ });
+ approvingList.addAll(addedList);
+ }
+ if(replacedList!=null && replacedList.size()!=0){
+ replacedList.forEach(item->{
+ item.setMainId(main.getId());
+ item.setLinkType(2);
+ });
+ approvingList.addAll(replacedList);
+ }
+ if(removedList!=null && removedList.size()!=0){
+ removedList.forEach(item->{
+ item.setMainId(main.getId());
+ item.setLinkType(-1);
+ });
+ approvingList.addAll(removedList);
+ }
+ cpApprovingService.insert(approvingList);
return true;
}
@@ -344,8 +421,4 @@
}
- public boolean componentProductSubmit(int type, WorksheetMain main, DocUser user) {
-
- return false;
- }
}
--
Gitblit v1.9.1