|
|
@@ -15,21 +15,29 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.ui.ModelMap;
|
|
|
|
|
|
+import com.uas.account.entity.PartnershipRecord;
|
|
|
+import com.uas.account.util.AccountUtils;
|
|
|
import com.uas.platform.b2b.dao.ComponentDao;
|
|
|
import com.uas.platform.b2b.dao.EnterpriseDao;
|
|
|
import com.uas.platform.b2b.dao.ProductDao;
|
|
|
-import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderAllItemDao;
|
|
|
+import com.uas.platform.b2b.dao.UserBaseInfoDao;
|
|
|
+import com.uas.platform.b2b.dao.VendorDao;
|
|
|
import com.uas.platform.b2b.model.Component;
|
|
|
+import com.uas.platform.b2b.model.Enterprise;
|
|
|
import com.uas.platform.b2b.model.EnterpriseInfo;
|
|
|
import com.uas.platform.b2b.model.Product;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrderAll;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrderAllItem;
|
|
|
+import com.uas.platform.b2b.model.UserBaseInfo;
|
|
|
+import com.uas.platform.b2b.model.Vendor;
|
|
|
import com.uas.platform.b2b.service.BaseInfoService;
|
|
|
import com.uas.platform.b2b.support.SystemSession;
|
|
|
import com.uas.platform.b2b.support.UsageBufferedLogger;
|
|
|
+import com.uas.platform.b2b.temporary.model.BasePartnersInfo;
|
|
|
import com.uas.platform.b2b.temporary.model.NewPurcOrder;
|
|
|
import com.uas.platform.b2b.temporary.model.OrderItems;
|
|
|
+import com.uas.platform.core.exception.IllegalOperatorException;
|
|
|
import com.uas.platform.core.logging.BufferedLoggerManager;
|
|
|
import com.uas.platform.core.model.Constant;
|
|
|
import com.uas.platform.core.model.Status;
|
|
|
@@ -49,10 +57,13 @@ public class BaseInfoServiceImpl implements BaseInfoService {
|
|
|
private EnterpriseDao enterpriseDao;
|
|
|
|
|
|
@Autowired
|
|
|
- private PurchaseOrderAllDao purchaseOrderAllDao;
|
|
|
+ private PurchaseOrderAllItemDao purchaseOrderAllItemDao;
|
|
|
|
|
|
@Autowired
|
|
|
- private PurchaseOrderAllItemDao purchaseOrderAllItemDao;
|
|
|
+ private VendorDao vendorDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private UserBaseInfoDao userBaseInfoDao;
|
|
|
|
|
|
/**
|
|
|
* 批量导入物料资料
|
|
|
@@ -235,10 +246,99 @@ public class BaseInfoServiceImpl implements BaseInfoService {
|
|
|
i++;
|
|
|
}
|
|
|
}
|
|
|
- logger.log("平台新增采购单", "[" + SystemSession.getUser().getEnterprise() + "]的["
|
|
|
- + SystemSession.getUser().getUserName() + "]向["
|
|
|
+ logger.log("平台新增采购单",
|
|
|
+ "[" + SystemSession.getUser().getEnterprise() + "]的[" + SystemSession.getUser().getUserName() + "]向["
|
|
|
+ neworder.getCust().getEnName() + "]下了一张采购单,时间:" + new Date());
|
|
|
return purchaseOrderAllItemDao.save(orderItems);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Vendor addCust(BasePartnersInfo partner) {
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByEnBussinessCode(partner.getVendUID());
|
|
|
+ UserBaseInfo user = userBaseInfoDao.findByUserUU(Long.valueOf(partner.getVendUserCode()));
|
|
|
+ List<Vendor> vendor = vendorDao.findByMyEnUUAndVendUU(enter.getUu(),
|
|
|
+ SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ if (!CollectionUtils.isEmpty(vendor)) {
|
|
|
+ throw new IllegalOperatorException("该企业已经是您的客户,请勿重复添加");
|
|
|
+ }
|
|
|
+ Vendor cust = new Vendor();
|
|
|
+ cust.setMyEnterprise(enter);
|
|
|
+ cust.setMyEnUU(enter.getUu());
|
|
|
+ cust.setMyUser(user);
|
|
|
+ cust.setMyUserUU(user.getUserUU());
|
|
|
+ cust.setVendorEnterprise(SystemSession.getUser().getEnterprise());
|
|
|
+ cust.setVendEnUU(SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ cust.setVendorUser(userBaseInfoDao.findByUserUU(SystemSession.getUser().getUserUU()));
|
|
|
+ cust.setVendUserUU(SystemSession.getUser().getUserUU());
|
|
|
+ logger.log("添加客户", cust.getVendorUser() + "(" + cust.getVendorEnterprise().getEnName() + ")添加"
|
|
|
+ + cust.getMyEnterprise().getEnName() + "为客户");
|
|
|
+ return vendorDao.save(cust);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Vendor addSupplier(BasePartnersInfo partner) {
|
|
|
+ Enterprise enter = enterpriseDao.findEnterpriseByEnBussinessCode(partner.getVendUID());
|
|
|
+ UserBaseInfo user = userBaseInfoDao.findByUserUU(Long.valueOf(partner.getVendUserCode()));
|
|
|
+ List<Vendor> vendor = vendorDao.findByMyEnUUAndVendUU(SystemSession.getUser().getEnterprise().getUu(),
|
|
|
+ enter.getUu());
|
|
|
+ if (!CollectionUtils.isEmpty(vendor)) {
|
|
|
+ throw new IllegalOperatorException("该企业已经是您的供应商,请勿重复添加");
|
|
|
+ }
|
|
|
+ Vendor cust = new Vendor();
|
|
|
+ cust.setMyEnterprise(SystemSession.getUser().getEnterprise());
|
|
|
+ cust.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
|
|
|
+ cust.setMyUser(userBaseInfoDao.findByUserUU(SystemSession.getUser().getUserUU()));
|
|
|
+ cust.setMyUserUU(SystemSession.getUser().getUserUU());
|
|
|
+ cust.setVendorEnterprise(enter);
|
|
|
+ cust.setVendEnUU(enter.getUu());
|
|
|
+ cust.setVendorUser(user);
|
|
|
+ cust.setVendUserUU(user.getUserUU());
|
|
|
+ logger.log("添加供应商", cust.getMyUser() + "(" + cust.getMyEnterprise().getEnName() + ")添加"
|
|
|
+ + cust.getVendorEnterprise().getEnName() + "为供应商");
|
|
|
+ return vendorDao.save(cust);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public List<BasePartnersInfo> getPartnersInfosByBusinessCode(String businessCode) throws Exception {
|
|
|
+ List<BasePartnersInfo> partners = new ArrayList<BasePartnersInfo>();
|
|
|
+
|
|
|
+ List<PartnershipRecord> records = AccountUtils
|
|
|
+ .getAllPartnerInfos(SystemSession.getUser().getEnterprise().getEnBussinessCode());
|
|
|
+ System.out.println("records " + records);
|
|
|
+ if (!CollectionUtils.isEmpty(records)) {
|
|
|
+ for (PartnershipRecord record : records) {
|
|
|
+ BasePartnersInfo partner = new BasePartnersInfo();
|
|
|
+ // cust为当前企业
|
|
|
+ if (record.getCustUID().equals(businessCode)) {
|
|
|
+ partner.setRequestDate(record.getRequestDate());
|
|
|
+ partner.setAppId(record.getAppId());
|
|
|
+ partner.setId(record.getId());
|
|
|
+ partner.setOperateDate(record.getOperateDate());
|
|
|
+ partner.setVendName(record.getVendName());
|
|
|
+ partner.setVendUID(record.getVendUID());
|
|
|
+ partner.setVendUserCode(record.getVendUserCode());
|
|
|
+ partner.setVendUserName(record.getVendUserName());
|
|
|
+ partner.setVendUserTel(record.getVendUserTel());
|
|
|
+ partner.setVendUserEmail(record.getVendUserEmail());
|
|
|
+ partners.add(partner);
|
|
|
+ }
|
|
|
+ // vend为当前企业
|
|
|
+ if (record.getVendUID().equals(businessCode)) {
|
|
|
+ partner.setRequestDate(record.getRequestDate());
|
|
|
+ partner.setAppId(record.getAppId());
|
|
|
+ partner.setOperateDate(record.getOperateDate());
|
|
|
+ partner.setId(record.getId());
|
|
|
+ partner.setVendName(record.getCustName());
|
|
|
+ partner.setVendUID(record.getCustUID());
|
|
|
+ partner.setVendUserCode(record.getCustUserCode());
|
|
|
+ partner.setVendUserName(record.getCustUserName());
|
|
|
+ partner.setVendUserTel(record.getCustUserTel());
|
|
|
+ partner.setVendUserEmail(record.getCustUserEmail());
|
|
|
+ partners.add(partner);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return partners;
|
|
|
+ }
|
|
|
+
|
|
|
}
|