|
|
@@ -5,6 +5,7 @@ import java.util.List;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import com.uas.platform.b2b.dao.EnterpriseDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseAcceptDao;
|
|
|
@@ -70,7 +71,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService{
|
|
|
long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
PurchaseAccept accept = prodInOut.convent();
|
|
|
- List<PurchaseAccept> accepts2 = purchaseAcceptDao.findPurchaseAcceptByEnUUAndCode(enUU, accept.getCode());
|
|
|
+ List<PurchaseAccept> accepts2 = purchaseAcceptDao.findByEnUUAndCode(enUU, accept.getCode());
|
|
|
Enterprise vendor = enterpriseDao.findEnterpriseByUu(accept.getVendUU());
|
|
|
//采购验收单不存在,供应商UU号存在对应供应商
|
|
|
if(accepts2.size() == 0 && vendor != null) {
|
|
|
@@ -96,7 +97,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService{
|
|
|
long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
PurchaseReturn returnn = prodInOut.conventToReturn();
|
|
|
- List<PurchaseReturn> returns2 = purchaseReturnDao.findPurchaseReturnByEnUUAndCode(enUU, returnn.getCode());
|
|
|
+ List<PurchaseReturn> returns2 = purchaseReturnDao.findByEnUUAndCode(enUU, returnn.getCode());
|
|
|
Enterprise vendor = enterpriseDao.findEnterpriseByUu(returnn.getVendUU());
|
|
|
//采购验收单不存在,供应商UU号存在对应供应商
|
|
|
if(returns2.size() == 0 && vendor != null) {
|
|
|
@@ -122,7 +123,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService{
|
|
|
long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
PurchaseBadIn badIn = prodInOut.conventToBadIn();
|
|
|
- List<PurchaseBadIn> badIns = purchaseBadInDao.findPurchaseBadInByEnUUAndCode(enUU, badIn.getCode());
|
|
|
+ List<PurchaseBadIn> badIns = purchaseBadInDao.findByEnUUAndCode(enUU, badIn.getCode());
|
|
|
Enterprise vendor = enterpriseDao.findEnterpriseByUu(badIn.getVendUU());
|
|
|
//采购验收单不存在,供应商UU号存在对应供应商
|
|
|
if(badIns.size() == 0 && vendor != null) {
|
|
|
@@ -148,7 +149,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService{
|
|
|
long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
PurchaseBadOut badOut = prodInOut.conventToBadOut();
|
|
|
- List<PurchaseBadOut> badOuts = purchaseBadOutDao.findPurchaseBadOutByEnUUAndCode(enUU, badOut.getCode());
|
|
|
+ List<PurchaseBadOut> badOuts = purchaseBadOutDao.findByEnUUAndCode(enUU, badOut.getCode());
|
|
|
Enterprise vendor = enterpriseDao.findEnterpriseByUu(badOut.getVendUU());
|
|
|
//不良品出库单不存在,供应商UU号存在对应供应商
|
|
|
if(badOuts.size() == 0 && vendor != null) {
|
|
|
@@ -167,4 +168,72 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService{
|
|
|
return badOutItems;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<PurchaseAcceptItem> convertNonPostingProdInOuts(
|
|
|
+ List<PurchaseProdInOut> prodInOuts) {
|
|
|
+ if( ! CollectionUtils.isEmpty(prodInOuts)) {
|
|
|
+ List<PurchaseAcceptItem> acceptItems = new ArrayList<PurchaseAcceptItem>();
|
|
|
+ Long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
+ for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
+ List<PurchaseAccept> accepts = purchaseAcceptDao.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
|
|
|
+ if(accepts.size() > 0) {
|
|
|
+ acceptItems.addAll(accepts.get(0).getAcceptItems());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return acceptItems;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<PurchaseReturnItem> convertNonPostingReturns(
|
|
|
+ List<PurchaseProdInOut> prodInOuts) {
|
|
|
+ if( ! CollectionUtils.isEmpty(prodInOuts)) {
|
|
|
+ List<PurchaseReturnItem> returnItems = new ArrayList<PurchaseReturnItem>();
|
|
|
+ Long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
+ for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
+ List<PurchaseReturn> returns = purchaseReturnDao.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
|
|
|
+ if(returns.size() > 0) {
|
|
|
+ returnItems.addAll(returns.get(0).getReturnItems());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return returnItems;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<PurchaseBadInItem> convertNonPostingBadIns(
|
|
|
+ List<PurchaseProdInOut> prodInOuts) {
|
|
|
+ if( ! CollectionUtils.isEmpty(prodInOuts)) {
|
|
|
+ List<PurchaseBadInItem> badInItems = new ArrayList<PurchaseBadInItem>();
|
|
|
+ Long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
+ for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
+ List<PurchaseBadIn> badIns = purchaseBadInDao.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
|
|
|
+ if(badIns.size() > 0) {
|
|
|
+ badInItems.addAll(badIns.get(0).getBadInItems());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return badInItems;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<PurchaseBadOutItem> convertNonPostingBadOuts(
|
|
|
+ List<PurchaseProdInOut> prodInOuts) {
|
|
|
+ if( ! CollectionUtils.isEmpty(prodInOuts)) {
|
|
|
+ List<PurchaseBadOutItem> badOutItems = new ArrayList<PurchaseBadOutItem>();
|
|
|
+ Long enUU = SystemSession.getUser().getEnterprise().getUu();
|
|
|
+ for(PurchaseProdInOut prodInOut : prodInOuts) {
|
|
|
+ List<PurchaseBadOut> badOuts = purchaseBadOutDao.findByEnUUAndCode(enUU, prodInOut.getPi_inoutno());
|
|
|
+ if(badOuts.size() > 0) {
|
|
|
+ badOutItems.addAll(badOuts.get(0).getBadOutItems());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return badOutItems;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
}
|