From fb06e27167f575a241e3c0b21e5f768f6c88bbe1 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 22 八月 2022 14:14:15 +0800
Subject: [PATCH] 物料审批
---
src/main/java/com/whyc/service/WorksheetLinkService.java | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetLinkService.java b/src/main/java/com/whyc/service/WorksheetLinkService.java
index 43e8aaf..5810588 100644
--- a/src/main/java/com/whyc/service/WorksheetLinkService.java
+++ b/src/main/java/com/whyc/service/WorksheetLinkService.java
@@ -43,10 +43,10 @@
private MaterialProductApprovingService cpAService;
@Autowired
- private MaterialApprovingService cAService;
+ private MaterialApprovingService mAService;
@Autowired
- private MaterialService cService;
+ private MaterialService mService;
@Autowired
private ProductSoftwareApprovingService productSoftwareApprovingService;
@@ -60,9 +60,9 @@
//鏇存柊鑺傜偣淇℃伅
linkMapper.updateById(link);
if(link.getLinkStatus() == 2){ //椹冲洖
- //鏌ョ湅鏄惁涓烘暎瑁呬欢瀹℃壒,鏄垯闇�瑕佹洿鏂版暎瑁呬欢瀹℃壒琛ㄤ腑鐨勭姸鎬佷负瀹岀粨
+ //鏌ョ湅鏄惁涓虹墿鏂欏鎵�,鏄垯闇�瑕佹洿鏂扮墿鏂欏鎵硅〃涓殑鐘舵�佷负瀹岀粨
if(mainService.getInfoById(link.getMainId()).getType().equals(EnumWorksheetType.Material.getType())){
- cAService.endStatus(link.getMainId());
+ mAService.endStatus(link.getMainId());
}
//椤圭洰缁忕悊椹冲洖,椹冲洖鍗崇粓姝�
mainService.updateEndStatusById(link.getMainId(),"缁忕悊椹冲洖,椹冲洖鍘熷洜:"+link.getDealReason(),0);
@@ -250,37 +250,37 @@
//鏇存柊姝ｅ紡bom鐨勫搴攗rl
bomService.updateUrl(fileBomApprovingList);
}
- else if(type.intValue() == EnumWorksheetType.Material.getType()){ //鏁ｈ浠�
- List<MaterialApproving> approvingList = cAService.getListByMainId(link.getMainId());
+ else if(type.intValue() == EnumWorksheetType.Material.getType()){ //鐗╂枡
+ List<MaterialApproving> approvingList = mAService.getListByMainId(link.getMainId());
List<Material> MaterialList = new LinkedList<>();
//鍖哄垎鏄柊澧炶繕鏄垹闄�
Integer MaterialId = approvingList.get(0).getMaterialId();
if(MaterialId==null) { //鏂板
- //灏嗘暎瑁呬欢浠庡鎵硅〃涓浆绉诲埌姝ｅ紡琛�
+ //灏嗙墿鏂欎粠瀹℃壒琛ㄤ腑杞Щ鍒版寮忚〃
approvingList.forEach(approve -> {
- Material Material = new Material();
- Material.setCategory(approve.getCategory());
- Material.setSubCode(approve.getSubCode());
- Material.setSubName(approve.getSubName());
- Material.setSubModel(approve.getSubModel());
- Material.setUnit(approve.getUnit());
- Material.setQuantity(approve.getQuantity());
- Material.setProducer(approve.getProducer());
- Material.setNotes(approve.getNotes());
- Material.setCreateDate(new Date());
- Material.setStatus(1);
- MaterialList.add(Material);
+ Material material = new Material();
+ material.setCategory(approve.getCategory());
+ material.setSubCode(approve.getSubCode());
+ material.setSubName(approve.getSubName());
+ material.setSubModel(approve.getSubModel());
+ material.setUnit(approve.getUnit());
+ material.setQuantity(approve.getQuantity());
+ material.setProducer(approve.getProducer());
+ material.setNotes(approve.getNotes());
+ material.setCreateDate(new Date());
+ material.setStatus(1);
+ MaterialList.add(material);
});
- cService.insertBatch(MaterialList);
+ mService.insertBatch(MaterialList);
}else{ //鍒犻櫎
List<Integer> MaterialIdList = approvingList.stream().map(MaterialApproving::getMaterialId).collect(Collectors.toList());
- cService.deleteBatch(MaterialIdList);
+ mService.deleteBatch(MaterialIdList);
}
- //鏇存柊鏁ｈ浠跺鎵瑰瓙琛ㄤ腑type涓哄畬缁�
- cAService.endStatus(link.getMainId());
+ //鏇存柊鐗╂枡瀹℃壒瀛愯〃涓璽ype涓哄畬缁�
+ mAService.endStatus(link.getMainId());
}
- else if(type.intValue() == EnumWorksheetType.MaterialProduct.getType()){ //鏇存柊鏁ｈ浠�-浜у搧鍏崇郴
- //鏌ユ壘鍒板搴旂殑鏁ｈ浠�-浜у搧鍏崇郴鏁版嵁
+ else if(type.intValue() == EnumWorksheetType.MaterialProduct.getType()){ //鏇存柊鐗╂枡-浜у搧鍏崇郴
+ //鏌ユ壘鍒板搴旂殑鐗╂枡-浜у搧鍏崇郴鏁版嵁
List<MaterialProductApproving> cpAList = cpAService.getListByMainId(link.getMainId());
//鏌ヨ閮ㄤ欢鏈�鏂扮殑鐗堟湰鍙�
//lxw淇敼
@@ -307,7 +307,7 @@
}
});
List<MaterialProductHistory> newHistoryList = new LinkedList<>();
- //鏌ヨ鏈�鏂扮増鏈敓鏁堢殑鐩稿叧鏁ｈ浠�
+ //鏌ヨ鏈�鏂扮増鏈敓鏁堢殑鐩稿叧鐗╂枡
//lxw娉ㄩ噴
//List<MaterialProductHistory> nowHistoryList = cphService.getListByParentModel(cpAList.get(0).getParentModel(), currentVersion);
List<MaterialProductHistory> nowHistoryList =new ArrayList<>();
@@ -316,16 +316,16 @@
List<ProductBomHistory> nowBomHistoryList = new ArrayList<>();
/*
瀵逛簬鍏宠仈鐨�,鍒ゆ柇褰撳墠鐗堟湰涓槸鍚﹀瓨鍦ㄦ浛鎹㈠叧绯�,瀛樺湪,鍒欑洿鎺ヤ笅涓増鏈彃鍏ュ叧鑱�;
- 鍚屾椂,鍏朵粬褰撳墠鐗堟湰鐨勭浉鍏虫暎瑁呬欢-浜у搧璁板綍鏇存柊鐗堟湰,鎺掗櫎瀛樺湪鐨勬浛鎹㈠叧绯�
+ 鍚屾椂,鍏朵粬褰撳墠鐗堟湰鐨勭浉鍏崇墿鏂�-浜у搧璁板綍鏇存柊鐗堟湰,鎺掗櫎瀛樺湪鐨勬浛鎹㈠叧绯�
*/
/*
瀵逛簬鏇挎崲鐨�,鍒ゆ柇褰撳墠鐗堟湰涓槸鍚﹀瓨鍦ㄥ叧鑱斿叧绯�,瀛樺湪,鐩存帴涓嬩釜鐗堟湰鏇挎崲,璁板綍鎻掑叆;
- 鍚屾椂,褰撳墠鐗堟湰鐨勭浉鍏虫暎瑁呬欢-浜у搧璁板綍鏇存柊鐗堟湰,鎺掗櫎瀛樺湪鐨勫叧鑱斿叧绯�;
+ 鍚屾椂,褰撳墠鐗堟湰鐨勭浉鍏崇墿鏂�-浜у搧璁板綍鏇存柊鐗堟湰,鎺掗櫎瀛樺湪鐨勫叧鑱斿叧绯�;
鍚屾椂,bom琛ㄦ洿鏂板埌涓嬩釜鐗堟湰鏃�,鎺掗櫎琚浛鎹欢
*/
- //瀵逛簬瑙ｉ櫎鍏宠仈鐨�,褰撳墠鐗堟湰鐨勭浉鍏虫暎瑁呬欢-浜у搧璁板綍鏇存柊鐗堟湰,鎺掗櫎瑙ｉ櫎鍏宠仈鐨勮褰�
+ //瀵逛簬瑙ｉ櫎鍏宠仈鐨�,褰撳墠鐗堟湰鐨勭浉鍏崇墿鏂�-浜у搧璁板綍鏇存柊鐗堟湰,鎺掗櫎瑙ｉ櫎鍏宠仈鐨勮褰�
//澶勭悊鎬濊矾:鍏堣В闄ゅ叧鑱�,鍐嶆浛鎹�,鍐嶅叧鑱�
if(removedList.size()!=0){
removedList.forEach(remove -> {
@@ -351,7 +351,7 @@
//澶勭悊鏇挎崲
if(replacedList.size()!=0){
replacedList.forEach(replace -> {
- //褰撳墠鐢熸晥鐨勬暎瑁呬欢-浜у搧鍒楄〃
+ //褰撳墠鐢熸晥鐨勭墿鏂�-浜у搧鍒楄〃
/*nowHistoryList.forEach(nowHistory -> {
if (replace.getMaterialId().intValue() == nowHistory.getMaterialId()) {
nowHistoryList.remove(nowHistory);
@@ -370,7 +370,7 @@
}*/
}
}
- //涓嬩釜鐗堟湰鏂板鏇挎崲鐨勬暎瑁呬欢-浜у搧鍒楄〃
+ //涓嬩釜鐗堟湰鏂板鏇挎崲鐨勭墿鏂�-浜у搧鍒楄〃
MaterialProductHistory newHistory = new MaterialProductHistory();
newHistory.setMaterialId(replace.getMaterialId());
//lxw娉ㄩ噴
--
Gitblit v1.9.1