|
|
|
|
@ -18,9 +18,12 @@ import com.glxp.api.admin.service.basic.CustomService;
|
|
|
|
|
import com.glxp.api.admin.service.basic.UdiInfoService;
|
|
|
|
|
import com.glxp.api.admin.service.basic.UdiRelevanceService;
|
|
|
|
|
import com.glxp.api.admin.service.info.SystemParamConfigService;
|
|
|
|
|
import com.glxp.api.admin.service.inout.CodesService;
|
|
|
|
|
import com.glxp.api.admin.service.inout.OrderDetailService;
|
|
|
|
|
import com.glxp.api.admin.service.inout.OrderService;
|
|
|
|
|
import com.glxp.api.admin.thread.InvProductsTrService;
|
|
|
|
|
import com.glxp.api.admin.thread.IoTransInoutService;
|
|
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
@ -33,7 +36,6 @@ import java.util.Map;
|
|
|
|
|
public class ContrastErpUtil {
|
|
|
|
|
|
|
|
|
|
int erpTotalCount;
|
|
|
|
|
List<ErpOrderEntity> mErpOrderEntities;
|
|
|
|
|
String udiUrl = "";
|
|
|
|
|
@Resource
|
|
|
|
|
InvProductsTrService invProductsTrService;
|
|
|
|
|
@ -41,6 +43,16 @@ public class ContrastErpUtil {
|
|
|
|
|
CustomService customService;
|
|
|
|
|
@Resource
|
|
|
|
|
InoutUtils inoutUtils;
|
|
|
|
|
@Resource
|
|
|
|
|
UdiRelevanceService udiRelevanceService;
|
|
|
|
|
@Resource
|
|
|
|
|
private OrderDetailService myErpOrderService;
|
|
|
|
|
@Resource
|
|
|
|
|
private CodesService codesService;
|
|
|
|
|
@Resource
|
|
|
|
|
private OrderService orderService;
|
|
|
|
|
@Resource
|
|
|
|
|
IoTransInoutService ioTransInoutService;
|
|
|
|
|
|
|
|
|
|
public ContrastErpUtil() {
|
|
|
|
|
|
|
|
|
|
@ -53,60 +65,103 @@ public class ContrastErpUtil {
|
|
|
|
|
public void contrastErp(UdiInfoService udiInfoService, UdiRelevanceService udiRelevanceService,
|
|
|
|
|
OrderDetailService myErpOrderService,
|
|
|
|
|
OrderService orderService,
|
|
|
|
|
List<WarehouseEntity> warehouseEntityList, SystemParamConfigService setupService, BussinessTypeEntity bussinessTypeEntity) {
|
|
|
|
|
List<WarehouseEntity> warehouseEntityList,
|
|
|
|
|
SystemParamConfigService setupService, List<ErpOrderEntity> vailErpOrders) {
|
|
|
|
|
|
|
|
|
|
//获取订单
|
|
|
|
|
String orderIdFk = warehouseEntityList.get(0).getOrderId();
|
|
|
|
|
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
|
|
|
|
|
orderFilterRequest.setId(orderIdFk);
|
|
|
|
|
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
|
|
|
|
|
|
|
|
|
|
//获取生成的本地单据详情，未校验
|
|
|
|
|
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
|
|
|
|
|
filterErpOrderRequest.setOrderId(orderIdFk);
|
|
|
|
|
mErpOrderEntities = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
|
|
|
|
|
if (mErpOrderEntities != null && mErpOrderEntities.size() > 0)
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
|
|
|
|
|
List<ErpOrderEntity> orderDetails = myErpOrderService.filterAllMyErpOrder(filterErpOrderRequest);
|
|
|
|
|
|
|
|
|
|
//校验本地单据详情是否有包含一个di多个绑定
|
|
|
|
|
String errMsg = null;
|
|
|
|
|
errMsg = vailMutiDi(orderDetails);
|
|
|
|
|
if (errMsg != null) {
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
|
|
|
|
|
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
|
|
|
|
|
orderEntity.setRemark(errMsg);
|
|
|
|
|
orderService.updateOrder(orderEntity);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//为每个条码赋值：基础信息表主键
|
|
|
|
|
// for (WarehouseEntity warehouseEntity : warehouseEntityList) {
|
|
|
|
|
// for (ErpOrderEntity erpOrderEntity : orderDetails) {
|
|
|
|
|
// if ((erpOrderEntity.getNameCode() != null && erpOrderEntity.getNameCode().equals(warehouseEntity.getNameCode()))
|
|
|
|
|
// && (erpOrderEntity.getBatchNo() != null && erpOrderEntity.getBatchNo().equals(warehouseEntity.getBatchNo()))
|
|
|
|
|
// && (erpOrderEntity.getWarehouseCode() != null && erpOrderEntity.getWarehouseCode().equals(warehouseEntity.getWarehouseCode()))) {
|
|
|
|
|
// if (erpOrderEntity.getBindRlFk() != null) {
|
|
|
|
|
// warehouseEntity.setRelId(erpOrderEntity.getBindRlFk());
|
|
|
|
|
// } else {
|
|
|
|
|
// warehouseEntity.setRelId(erpOrderEntity.getRelIdFk());
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
//初始化，并计算扫码总数
|
|
|
|
|
if (vailErpOrders != null && vailErpOrders.size() > 0) {
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : vailErpOrders) {
|
|
|
|
|
if (erpOrderEntity.getErpCount() == null) {
|
|
|
|
|
erpOrderEntity.setErpCount(0);
|
|
|
|
|
}
|
|
|
|
|
erpTotalCount = erpTotalCount + erpOrderEntity.getErpCount();
|
|
|
|
|
erpOrderEntity.setCount(0);
|
|
|
|
|
}
|
|
|
|
|
String errMsg = null;
|
|
|
|
|
String resultMsg = null;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//校验单据是否已被校验
|
|
|
|
|
ErpOrderEntity vailExitMsg = vailErpExit(myErpOrderService, vailErpOrders, orderIdFk);
|
|
|
|
|
SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey("erp_forbidSameErp");
|
|
|
|
|
if (vailExitMsg != null && systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) {
|
|
|
|
|
errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！";
|
|
|
|
|
returnData(errMsg, orderEntity);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<WarehouseEntity> errorData = new ArrayList<>();
|
|
|
|
|
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
|
|
|
|
|
UdiInfoEntity udiInfoEntity = inoutUtils.getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
|
|
|
|
|
// if (warehouseEntity.getCount() > 1) {
|
|
|
|
|
// udiInfoEntity.setCount(warehouseEntity.getCount());
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
//根据条码获取产品详情，数量等
|
|
|
|
|
UdiInfoEntity udiInfoEntity = inoutUtils.getUdiInfoByRlId(udiInfoService, udiRelevanceService, warehouseEntity.getCode());
|
|
|
|
|
udiInfoEntity.setCount(customService.getActCount(warehouseEntity));
|
|
|
|
|
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiInfoEntity.getUuid());
|
|
|
|
|
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) {
|
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity = checkGoodsId(udiRelevanceEntities, bussinessTypeEntity);
|
|
|
|
|
if (udiRelevanceEntity != null) {
|
|
|
|
|
udiInfoEntity.setThirdId(udiRelevanceEntity.getThirdId());
|
|
|
|
|
udiInfoEntity.setThirdName(udiRelevanceEntity.getThirdName());
|
|
|
|
|
udiInfoEntity.setWarehouseCode(warehouseEntity.getWarehouseCode());
|
|
|
|
|
errMsg = vaildErpOrder(warehouseEntityList, udiInfoEntity);
|
|
|
|
|
if (errMsg != null && (errMsg.equals("产品信息不匹配") || errMsg.equals("非此单产品批次号"))) {
|
|
|
|
|
errorData.add(warehouseEntity);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
errMsg = "产品信息不匹配";
|
|
|
|
|
|
|
|
|
|
if (warehouseEntity.getRelId() == null) {
|
|
|
|
|
errMsg = warehouseEntity.getCode() + "产品信息未维护";
|
|
|
|
|
returnData(errMsg, orderEntity);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
UdiRelevanceResponse udiRelevanceEntity = udiRelevanceService.selectGroupById(warehouseEntity.getRelId());
|
|
|
|
|
if (udiRelevanceEntity != null) {
|
|
|
|
|
udiInfoEntity.setThirdId(udiRelevanceEntity.getThirdId());
|
|
|
|
|
udiInfoEntity.setThirdName(udiRelevanceEntity.getThirdName());
|
|
|
|
|
udiInfoEntity.setWarehouseCode(warehouseEntity.getWarehouseCode());
|
|
|
|
|
udiInfoEntity.setRelId(udiRelevanceEntity.getId() + "");
|
|
|
|
|
errMsg = vaildErpOrder(vailErpOrders, warehouseEntityList, udiInfoEntity);
|
|
|
|
|
if (errMsg != null && (errMsg.equals("产品信息不匹配") || errMsg.equals("非此单产品批次号"))) {
|
|
|
|
|
errorData.add(warehouseEntity);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
errMsg = "产品信息未维护";
|
|
|
|
|
errorData.add(warehouseEntity);
|
|
|
|
|
}
|
|
|
|
|
if (resultMsg == null && errMsg != null) {
|
|
|
|
|
resultMsg = errMsg;
|
|
|
|
|
if (errMsg != null) {
|
|
|
|
|
returnData(errMsg, orderEntity);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
myErpOrderService.insertErpOrders(mErpOrderEntities);
|
|
|
|
|
OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
|
|
|
|
|
orderFilterRequest.setId(orderIdFk);
|
|
|
|
|
OrderEntity orderEntity = orderService.findOne(orderFilterRequest);
|
|
|
|
|
ErpOrderEntity vailExitMsg = vailErpExit(myErpOrderService, mErpOrderEntities, orderIdFk);
|
|
|
|
|
SystemParamConfigEntity systemParamConfigEntity = setupService.selectByParamKey("erp_forbidSameErp");
|
|
|
|
|
if (vailExitMsg != null && systemParamConfigEntity != null && systemParamConfigEntity.getParamValue().equals("1")) {
|
|
|
|
|
errMsg = "所选ERP单" + vailExitMsg.getErpOrderId() + "已被其他出入库单" + vailExitMsg.getOrderIdFk() + "绑定！";
|
|
|
|
|
}
|
|
|
|
|
if (mErpOrderEntities != null && mErpOrderEntities.size() > 0)
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
|
|
|
|
|
myErpOrderService.deleteByOrderId(orderIdFk);
|
|
|
|
|
myErpOrderService.insertErpOrders(vailErpOrders);
|
|
|
|
|
if (vailErpOrders != null && vailErpOrders.size() > 0)
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : vailErpOrders) {
|
|
|
|
|
if (erpOrderEntity.getErpCount() != erpOrderEntity.getCount()) {
|
|
|
|
|
errMsg = "所选ERP单" + erpOrderEntity.getErpOrderId() + "下" + erpOrderEntity.getGoodsname() + "数量不匹配";
|
|
|
|
|
}
|
|
|
|
|
@ -115,61 +170,59 @@ public class ContrastErpUtil {
|
|
|
|
|
if (errMsg != null) {
|
|
|
|
|
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
|
|
|
|
|
orderEntity.setRemark(errMsg);
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
|
|
|
|
|
orderService.updateOrder(orderEntity);
|
|
|
|
|
} else {
|
|
|
|
|
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS);
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
|
|
|
|
|
orderService.updateOrder(orderEntity);
|
|
|
|
|
ioTransInoutService.printOrder(orderEntity.getId());
|
|
|
|
|
invProductsTrService.genInvProducts(orderEntity.getId());
|
|
|
|
|
}
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
|
|
|
|
|
orderService.updateOrder(orderEntity);
|
|
|
|
|
|
|
|
|
|
if (errorData.size() > 0) {
|
|
|
|
|
inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, errorData);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public UdiRelevanceEntity checkGoodsId(List<UdiRelevanceEntity> udiRelevanceEntities, BussinessTypeEntity bussinessTypeEntity) {
|
|
|
|
|
if (mErpOrderEntities.size() > 0) {
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
|
|
|
|
|
for (UdiRelevanceEntity udiRelevanceEntity : udiRelevanceEntities) {
|
|
|
|
|
if (bussinessTypeEntity.getThirdSysFk() == null) {
|
|
|
|
|
if (erpOrderEntity.getGoodsid().equals(udiRelevanceEntity.getThirdId())) {
|
|
|
|
|
return udiRelevanceEntity;
|
|
|
|
|
}
|
|
|
|
|
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId")) {
|
|
|
|
|
if (erpOrderEntity.getGoodsid().equals(udiRelevanceEntity.getThirdId())) {
|
|
|
|
|
return udiRelevanceEntity;
|
|
|
|
|
}
|
|
|
|
|
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId1")) {
|
|
|
|
|
if (erpOrderEntity.getGoodsid().equals(udiRelevanceEntity.getThirdId1())) {
|
|
|
|
|
udiRelevanceEntity.setThirdId(udiRelevanceEntity.getThirdId1());
|
|
|
|
|
udiRelevanceEntity.setThirdName(udiRelevanceEntity.getThirdName1());
|
|
|
|
|
return udiRelevanceEntity;
|
|
|
|
|
}
|
|
|
|
|
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId2")) {
|
|
|
|
|
if (erpOrderEntity.getGoodsid().equals(udiRelevanceEntity.getThirdId2())) {
|
|
|
|
|
udiRelevanceEntity.setThirdId(udiRelevanceEntity.getThirdId2());
|
|
|
|
|
udiRelevanceEntity.setThirdName(udiRelevanceEntity.getThirdName2());
|
|
|
|
|
return udiRelevanceEntity;
|
|
|
|
|
}
|
|
|
|
|
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId3")) {
|
|
|
|
|
if (erpOrderEntity.getGoodsid().equals(udiRelevanceEntity.getThirdId3())) {
|
|
|
|
|
udiRelevanceEntity.setThirdId(udiRelevanceEntity.getThirdId3());
|
|
|
|
|
udiRelevanceEntity.setThirdName(udiRelevanceEntity.getThirdName3());
|
|
|
|
|
return udiRelevanceEntity;
|
|
|
|
|
}
|
|
|
|
|
} else if (bussinessTypeEntity.getThirdSysFk().equals("thirdId4")) {
|
|
|
|
|
if (erpOrderEntity.getGoodsid().equals(udiRelevanceEntity.getThirdId4())) {
|
|
|
|
|
udiRelevanceEntity.setThirdId(udiRelevanceEntity.getThirdId4());
|
|
|
|
|
udiRelevanceEntity.setThirdName(udiRelevanceEntity.getThirdName4());
|
|
|
|
|
return udiRelevanceEntity;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
public void returnData(String errMsg, OrderEntity orderEntity) {
|
|
|
|
|
if (errMsg != null) {
|
|
|
|
|
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS);
|
|
|
|
|
orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL);
|
|
|
|
|
orderEntity.setRemark(errMsg);
|
|
|
|
|
orderService.updateOrder(orderEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public String vailMutiDi(List<ErpOrderEntity> mErpOrderEntities) {
|
|
|
|
|
String errMsg = null;
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
|
|
|
|
|
|
|
|
|
|
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
|
|
|
|
// filterUdiInfoRequest.setNameCode(erpOrderEntity.getNameCode());
|
|
|
|
|
// List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
|
|
|
|
|
WarehouseEntity warehouseEntity = codesService.findOneByNameCode(erpOrderEntity.getOrderIdFk(), erpOrderEntity.getNameCode());
|
|
|
|
|
|
|
|
|
|
if (warehouseEntity != null && warehouseEntity.getStatus() == ConstantStatus.ORDER_DETAIL_DI_MUTI) {
|
|
|
|
|
// erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
|
|
|
|
|
// myErpOrderService.updateErpOrder(erpOrderEntity);
|
|
|
|
|
if (warehouseEntity.getRelId() == null) {
|
|
|
|
|
errMsg = "该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && warehouseEntity.getRelId() == null) {
|
|
|
|
|
// erpOrderEntity.setBindStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
|
|
|
|
|
// myErpOrderService.updateErpOrder(erpOrderEntity);
|
|
|
|
|
// errMsg = "该产品DI绑定多个产品ID，请在扫码单据详情绑定对应产品ID";
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
return errMsg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public int getSelectedCount(List<WarehouseEntity> warehouseEntityList) {
|
|
|
|
|
int total = 0;
|
|
|
|
|
for (WarehouseEntity warehouseEntity : warehouseEntityList) {
|
|
|
|
|
@ -179,7 +232,7 @@ public class ContrastErpUtil {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//验证产品ID,批次号，仓位号
|
|
|
|
|
public String vaildErpOrder(List<WarehouseEntity> warehouseEntityList, UdiInfoEntity udiInfoEntity) {
|
|
|
|
|
public String vaildErpOrder(List<ErpOrderEntity> mErpOrderEntities, List<WarehouseEntity> warehouseEntityList, UdiInfoEntity udiInfoEntity) {
|
|
|
|
|
String errMsg = "产品信息不匹配";
|
|
|
|
|
if (mErpOrderEntities.size() > 0) {
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : mErpOrderEntities) {
|
|
|
|
|
@ -205,7 +258,7 @@ public class ContrastErpUtil {
|
|
|
|
|
public String isPass(ErpOrderEntity erpOrderEntity, UdiInfoEntity udiInfoEntity) {
|
|
|
|
|
String errMsg = null;
|
|
|
|
|
if (erpOrderEntity.getBatchNo().equals(udiInfoEntity.getBatchNo())) {
|
|
|
|
|
if (erpOrderEntity.getGoodsid().equals(udiInfoEntity.getThirdId())) {
|
|
|
|
|
if (erpOrderEntity.getRelIdFk().equals(udiInfoEntity.getRelId())) {
|
|
|
|
|
if (erpOrderEntity.getWarehouseCode() != null && udiInfoEntity.getWarehouseCode() != null) {
|
|
|
|
|
if (erpOrderEntity.getWarehouseCode().equals(udiInfoEntity.getWarehouseCode())) {
|
|
|
|
|
return null;
|
|
|
|
|
@ -221,32 +274,37 @@ public class ContrastErpUtil {
|
|
|
|
|
return errMsg;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<ErpOrderEntity> transErp(List<ErpOrderEntity> erpOrderEntities, UdiRelevanceService udiRelevanceService, String orderFk) {
|
|
|
|
|
//把第三方单据加工转换，新增属性
|
|
|
|
|
public List<ErpOrderEntity> transErp(List<ErpOrderEntity> erpOrderEntities, UdiRelevanceService udiRelevanceService, String orderFk, BussinessTypeEntity bussinessTypeEntity) {
|
|
|
|
|
List<ErpOrderEntity> returnOrders = new ArrayList<>();
|
|
|
|
|
Map<String, ErpOrderEntity> filterMap = new HashMap<>();
|
|
|
|
|
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
|
|
|
|
|
for (ErpOrderEntity erpOrderEntity : erpOrderEntities) {
|
|
|
|
|
UdiRelevanceResponse udiRelevanceResponse = null;
|
|
|
|
|
if (erpOrderEntity.getRelIdFk() != null) {
|
|
|
|
|
udiRelevanceResponse = udiRelevanceService.selectGroupById(erpOrderEntity.getRelIdFk());
|
|
|
|
|
} else {
|
|
|
|
|
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(erpOrderEntity.getGoodsid(), bussinessTypeEntity.getThirdSys());
|
|
|
|
|
if (udiRelevanceEntity != null) {
|
|
|
|
|
udiRelevanceResponse = udiRelevanceService.selectGroupById(udiRelevanceEntity.getId());
|
|
|
|
|
erpOrderEntity.setRelIdFk(udiRelevanceEntity.getId());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
|
|
|
|
filterUdiInfoRequest.setThirdId(erpOrderEntity.getGoodsid());
|
|
|
|
|
filterUdiInfoRequest.setPage(1);
|
|
|
|
|
filterUdiInfoRequest.setLimit(100);
|
|
|
|
|
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
|
|
|
|
|
|
|
|
|
|
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) {
|
|
|
|
|
UdiRelevanceResponse temp = udiRelevanceResponses.get(0);
|
|
|
|
|
erpOrderEntity.setCoName(temp.getCpmctymc());
|
|
|
|
|
erpOrderEntity.setAuthCode(temp.getZczbhhzbapzbh());
|
|
|
|
|
erpOrderEntity.setPackSpec(temp.getGgxh());
|
|
|
|
|
erpOrderEntity.setPackRatio(temp.getPackRatio());
|
|
|
|
|
erpOrderEntity.setProductCompany(temp.getYlqxzcrbarmc());
|
|
|
|
|
}
|
|
|
|
|
if (udiRelevanceResponse != null) {
|
|
|
|
|
erpOrderEntity.setNameCode(udiRelevanceResponse.getNameCode());
|
|
|
|
|
erpOrderEntity.setCoName(udiRelevanceResponse.getCpmctymc());
|
|
|
|
|
erpOrderEntity.setAuthCode(udiRelevanceResponse.getZczbhhzbapzbh());
|
|
|
|
|
erpOrderEntity.setPackSpec(udiRelevanceResponse.getGgxh());
|
|
|
|
|
erpOrderEntity.setPackRatio(udiRelevanceResponse.getPackRatio());
|
|
|
|
|
erpOrderEntity.setProductCompany(udiRelevanceResponse.getYlqxzcrbarmc());
|
|
|
|
|
erpOrderEntity.setOrderIdFk(orderFk);
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
erpOrderEntity.setCoName(erpOrderEntity.getGoodsname());
|
|
|
|
|
erpOrderEntity.setPackSpec(erpOrderEntity.getGoodsunit());
|
|
|
|
|
}
|
|
|
|
|
erpOrderEntity.setOrderIdFk(orderFk);
|
|
|
|
|
String key = erpOrderEntity.getBatchNo() + erpOrderEntity.getGoodsid() + erpOrderEntity.getWarehouseCode();
|
|
|
|
|
String key = erpOrderEntity.getBatchNo() + erpOrderEntity.getRelIdFk() + erpOrderEntity.getWarehouseCode();
|
|
|
|
|
ErpOrderEntity filterTemp = filterMap.get(key);
|
|
|
|
|
if (filterTemp != null) {
|
|
|
|
|
filterTemp.setErpCount(filterTemp.getErpCount() + erpOrderEntity.getErpCount());
|
|
|
|
|
@ -294,8 +352,8 @@ public class ContrastErpUtil {
|
|
|
|
|
FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest();
|
|
|
|
|
filterErpOrderRequest.setOrderId(orderId);
|
|
|
|
|
List<ErpOrderEntity> docids = myErpOrderService.filterAllDocidE(filterErpOrderRequest);
|
|
|
|
|
List<String> bDocids = getDocids(erpOrderEntities);
|
|
|
|
|
if (docids != null && docids.size() > 0) {
|
|
|
|
|
List<String> bDocids = getDocids(erpOrderEntities);
|
|
|
|
|
for (ErpOrderEntity docid : docids) {
|
|
|
|
|
for (String temp : bDocids) {
|
|
|
|
|
if (docid.getErpOrderId() != null && docid.getErpOrderId().contains(temp)) {
|
|
|
|
|
|
