From 95437c43634c0611a4e8d48ca695dcc4da4e7c75 Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Thu, 19 May 2022 11:52:33 +0800
Subject: [PATCH] 只有销售出库单和分布式调出单需要客户信息
---
src/main/java/com/huaheng/api/general/service/ShipmentApiService.java | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java b/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
index df4c517..ba992cc 100644
--- a/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
+++ b/src/main/java/com/huaheng/api/general/service/ShipmentApiService.java
@@ -7,6 +7,7 @@ import com.huaheng.common.constant.QuantityConstant;
import com.huaheng.common.exception.service.ServiceException;
import com.huaheng.common.utils.StringUtils;
import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.common.utils.spring.SpringUtils;
import com.huaheng.framework.web.domain.AjaxResult;
import com.huaheng.pc.config.company.domain.Company;
import com.huaheng.pc.config.company.service.CompanyService;
@@ -95,7 +96,6 @@ public class ShipmentApiService {
return AjaxResult.error("出库子单为空");
}
-
List<ShipmentHeader> shipmentHeaders = shipmentHeaderService.list(new LambdaQueryWrapper<ShipmentHeader>().eq(ShipmentHeader::getReferCode,shipmentHeader.getReferCode()));
if(shipmentHeaders.size()>0){
for (ShipmentHeader header : shipmentHeaders) {
@@ -137,20 +137,27 @@ public class ShipmentApiService {
shipmentHeader.setFirstStatus(QuantityConstant.SHIPMENT_HEADER_BUILD);
shipmentHeader.setLastStatus(QuantityConstant.SHIPMENT_HEADER_BUILD);
shipmentHeader.setCompanyCode("BHF");
+ String saleArea="";
+ Customer customer=null;
+ if (shipmentHeader.getShipmentType()=="XSCKD" &&shipmentHeader.getShipmentType()=="FBSTCK") {
+ customer = customerService.getOne(new LambdaQueryWrapper<Customer>().eq(Customer::getCode,shipmentHeader.getCustomerCode()));
+ if(StringUtils.isNull(customer)){
+ return AjaxResult.error("wms此客户不存在"+shipmentHeader.getCustomerCode());
+ }
+ saleArea= customer.getProvince() + "-" + customer.getCity() + "-" + customer.getAddress1() + "-" + customer.getAddress2();
+ }
if(!shipmentHeaderService.save(shipmentHeader)){
throw new ServiceException("保存出库主表失败");
}
- Customer customer = customerService.getOne(new LambdaQueryWrapper<Customer>().eq(Customer::getCode,shipmentHeader.getCustomerCode()));
- if (customer==null){
- return AjaxResult.error("客户不存在");
- }
- String saleArea = customer.getProvince() + "-" + customer.getCity() + "-" + customer.getAddress1() + "-" + customer.getAddress2();
+
//5、保存出库子表
for(ShipmentDetail shipmentDetail : shipmentDetails){
// shipmentDetail.setCompanyCode(customer.getAllCreditCode());
// shipmentDetail.setCompanyName(customer.getName());
- shipmentDetail.setAllCreditCode(customer.getAllCreditCode());
+ if(customer!=null){
+ shipmentDetail.setAllCreditCode(customer.getAllCreditCode());
+ }
shipmentDetail.setSaleArea(saleArea);
shipmentDetail.setFentity(shipmentDetail.getFentity());
shipmentDetail.setInventorySts(QuantityConstant.GOOD);
@@ -166,7 +173,6 @@ public class ShipmentApiService {
shipmentDetail.setWarehouseCode("CS0001");
// shipmentDetail.setUserDef3("0");
}
-
int num = 0;
List<ShipmentDetail> shipmentDetailList = new ArrayList<>();
if(shipmentDetails.size() >500 ){
@@ -272,7 +278,6 @@ public class ShipmentApiService {
if(material == null){
return AjaxResult.error("wms没有此物料,"+shipmentDetail.getMaterialCode());
}
-
// if (new BigDecimal(0).compareTo(shipmentDetail.getUnitId2Qty() != null ?
// shipmentDetail.getUnitId2Qty() : new BigDecimal(0)) == 0) {
// return AjaxResult.error("数量为空");
--
libgit2 0.22.2