diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java index 3c2c3d99..5b04b4c8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java @@ -67,9 +67,17 @@ public class PrchOrdDtlServiceImpl implements PrchOrdDtlService { } private void setElemInfo(PrchOrdDtlDO prchOrdDtl) { + if (prchOrdDtl.getElemAbbr() == null){ + return; + } ElementDO elementBySymbol = elementService.getElementBySymbol(prchOrdDtl.getElemAbbr()); - prchOrdDtl.setElemName(elementBySymbol.getName()); - prchOrdDtl.setElemCdg(elementBySymbol.getCoding()); + if (elementBySymbol != null){ + prchOrdDtl.setElemName(elementBySymbol.getName()); + prchOrdDtl.setElemCdg(elementBySymbol.getCoding()); + }else { + log.warn("元素【{}】不存在,订单ID【{}】", prchOrdDtl.getElemAbbr(), prchOrdDtl.getOrdId()); + } + } @Override diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java index fb405743..e1b8a789 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java @@ -14,6 +14,7 @@ import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlD import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDetailDO; import com.zt.plat.module.contractorder.dal.mysql.salesorder.SalesOrderDetailMapper; import com.zt.plat.module.receivedeliver.api.bill.BillMainApi; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -38,6 +39,7 @@ import static com.zt.plat.module.contractorder.enums.salesorder.ErrorCodeConstan */ @Service @Validated +@Slf4j public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { @Resource @@ -61,10 +63,16 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { } private void setElemInfo(SalesOrderDetailDO salesOrderDetail) { + if (salesOrderDetail.getElementAbbreviation() == null) { + return; + } ElementDO elementBySymbol = elementService.getElementBySymbol(salesOrderDetail.getElementAbbreviation()); - salesOrderDetail.setElementName(elementBySymbol.getName()); - salesOrderDetail.setElementNumber(elementBySymbol.getCoding()); - + if (elementBySymbol!=null){ + salesOrderDetail.setElementName(elementBySymbol.getName()); + salesOrderDetail.setElementNumber(elementBySymbol.getCoding()); + }else { + log.warn("元素编号【{}】不存在,订单号【{}】", salesOrderDetail.getElementAbbreviation(), salesOrderDetail.getOrderId()); + } }