diff --git a/base-server/src/main/resources/logback-spring.xml b/base-server/src/main/resources/logback-spring.xml index c932c0af..3cb66500 100644 --- a/base-server/src/main/resources/logback-spring.xml +++ b/base-server/src/main/resources/logback-spring.xml @@ -79,7 +79,7 @@ - + @@ -96,13 +96,20 @@ + + + + + + + - + diff --git a/pom.xml b/pom.xml index 271252ce..f3125aeb 100644 --- a/pom.xml +++ b/pom.xml @@ -175,6 +175,19 @@ + + env-fupf + + fupf + + 172.16.46.63:30848 + fupf + DEFAULT_GROUP + nacos + P@ssword25 + 1.0.0 + + env-dev diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java index 6d13099a..56fb3a01 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementService.java @@ -67,4 +67,11 @@ public interface ElementService { List getElementNoPage(); PageResult getElementPageByEnable(ElementPageReqVO pageReqVO); + /** + * 根据元素符号获得元素 + * + * @param symbol 元素符号 + * @return 元素 + */ + ElementDO getElementBySymbol(String symbol); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java index 81f266ef..c01361c8 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/base/ElementServiceImpl.java @@ -135,4 +135,9 @@ public class ElementServiceImpl implements ElementService { return elementMapper.selectPage(pageReqVO); } + @Override + public ElementDO getElementBySymbol(String symbol) { + return elementMapper.selectFirstOne(ElementDO::getAbbreviation, symbol); + } + } \ No newline at end of file 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 bab2a959..3c2c3d99 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 @@ -5,6 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zt.plat.framework.common.exception.ErrorCode; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.module.base.api.materialclasses.MaterialClassesApi; +import com.zt.plat.module.base.api.materialinfomation.MaterialInfomationApi; +import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO; +import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationRespDTO; +import com.zt.plat.module.base.dal.dataobject.base.ElementDO; +import com.zt.plat.module.base.service.base.ElementService; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PrchOrdDtlPageReqVO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PrchOrdDtlRespVO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PrchOrdDtlSaveReqVO; @@ -44,11 +50,15 @@ public class PrchOrdDtlServiceImpl implements PrchOrdDtlService { private PrchOrdDtlMapper prchOrdDtlMapper; @Resource private BillMainApi billMainApi; + @Resource + private ElementService elementService; @Override public PrchOrdDtlRespVO createPrchOrdDtl(PrchOrdDtlSaveReqVO createReqVO) { // 插入 PrchOrdDtlDO prchOrdDtl = BeanUtils.toBean(createReqVO, PrchOrdDtlDO.class); + //填充金属元素相关的信息 + setElemInfo(prchOrdDtl); log.info("创建采购订单明细,创建数据【{}】", prchOrdDtl); prchOrdDtl.setTrfQty(BigDecimal.ZERO); prchOrdDtlMapper.insert(prchOrdDtl); @@ -56,6 +66,12 @@ public class PrchOrdDtlServiceImpl implements PrchOrdDtlService { return BeanUtils.toBean(prchOrdDtl, PrchOrdDtlRespVO.class); } + private void setElemInfo(PrchOrdDtlDO prchOrdDtl) { + ElementDO elementBySymbol = elementService.getElementBySymbol(prchOrdDtl.getElemAbbr()); + prchOrdDtl.setElemName(elementBySymbol.getName()); + prchOrdDtl.setElemCdg(elementBySymbol.getCoding()); + } + @Override public void updatePrchOrdDtl(PrchOrdDtlSaveReqVO updateReqVO) { // 校验存在 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 777f6d2d..fb405743 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 @@ -3,9 +3,14 @@ package com.zt.plat.module.contractorder.service.salesorder; import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.exception.ErrorCode; import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationPageReqDTO; +import com.zt.plat.module.base.api.materialinfomation.dto.MaterialInfomationRespDTO; +import com.zt.plat.module.base.dal.dataobject.base.ElementDO; +import com.zt.plat.module.base.service.base.ElementService; import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderDetailPageReqVO; import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderDetailRespVO; import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderDetailSaveReqVO; +import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlDO; 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; @@ -39,7 +44,8 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { private SalesOrderDetailMapper salesOrderDetailMapper; @Resource private BillMainApi billMainApi; - + @Resource + private ElementService elementService; @Override @Transactional public SalesOrderDetailRespVO createSalesOrderDetail(SalesOrderDetailSaveReqVO createReqVO) { @@ -47,11 +53,21 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { SalesOrderDetailDO salesOrderDetail = BeanUtils.toBean(createReqVO, SalesOrderDetailDO.class); salesOrderDetail.setTrfQty(BigDecimal.ZERO); salesOrderDetail.setOrderId(Long.valueOf(createReqVO.getOrderId())); + // 设置物料信息 + setElemInfo(salesOrderDetail); salesOrderDetailMapper.insert(salesOrderDetail); // 返回 return BeanUtils.toBean(salesOrderDetail, SalesOrderDetailRespVO.class); } + private void setElemInfo(SalesOrderDetailDO salesOrderDetail) { + ElementDO elementBySymbol = elementService.getElementBySymbol(salesOrderDetail.getElementAbbreviation()); + salesOrderDetail.setElementName(elementBySymbol.getName()); + salesOrderDetail.setElementNumber(elementBySymbol.getCoding()); + + } + + @Override @Transactional public List createSalesOrderDetail(List createReqVOS) { diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java index 37a2c23a..a94835e3 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java @@ -58,7 +58,7 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{ @Override public List getErpMaterialByMainMaterialByCode(String code, String companyCode) { LambdaQueryWrapperX erpMaterialCorrDOLambdaQueryWrapperX = new LambdaQueryWrapperX<>(); - erpMaterialCorrDOLambdaQueryWrapperX.eq(ErpMaterialCorrDO::getMaterialParentCode, code); + erpMaterialCorrDOLambdaQueryWrapperX.eqIfPresent(ErpMaterialCorrDO::getMaterialParentCode, code); erpMaterialCorrDOLambdaQueryWrapperX.eqIfPresent(ErpMaterialCorrDO::getCompanyCode, companyCode); return BeanUtils.toBean(erpErpMaterialCorrMapper.selectList(erpMaterialCorrDOLambdaQueryWrapperX), ErpMaterialCorrRspVO.class); } diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java index 5798ca43..cc50b45d 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java @@ -301,7 +301,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { @Override public PageResult getErpMaterialByApi(MaterialInfomationApiVO vo) { //通过部门编码查询数据库，获取到部门ID - List erpMaterialByCompanyCode = erpMaterialCorrService.getErpMaterialByMainMaterialByCode(vo.getDeptId(), vo.getDeptId()); + List erpMaterialByCompanyCode = erpMaterialCorrService.getErpMaterialByMainMaterialByCode(vo.getMaterialNumber(), vo.getDeptId()); if (erpMaterialByCompanyCode.isEmpty()) { return new PageResult<>(); }