Merge branch 'dev' into test

base-server/src/main/resources/logback-spring.xml

@@ -79,7 +79,7 @@
 
     <!--logback的日志级别 FATAL > ERROR > WARN > INFO > DEBUG-->
     <!-- 本地环境 -->
-    <springProfile name="local,dev">
+    <springProfile name="local,dev,fupf">
         <root level="WARN">
             <appender-ref ref="STDOUT"/>
             <appender-ref ref="ERROR"/>
@@ -96,13 +96,20 @@
         <logger name="com.zt.plat.module.contractorder.dal.mysql" level="DEBUG" additivity="false">
             <appender-ref ref="STDOUT"/>
         </logger>
+        <logger name="com.zt.plat.module.contractorder.dal.mysql" level="DEBUG" additivity="false">
+            <appender-ref ref="STDOUT"/>
+        </logger>
         <logger name="com.zt.plat.module.erp.dal.mysql" level="DEBUG" additivity="false">
             <appender-ref ref="STDOUT"/>
         </logger>
+
+        <logger name="com.zt.plat.module.base.dal.dao" level="DEBUG" additivity="false">
+            <appender-ref ref="STDOUT"/>
+        </logger>
     </springProfile>
 
     <!-- 其它环境 -->
-    <springProfile name="test,stage,prod,default">
+    <springProfile name="test,stage,prod,default,fupf">
         <root level="INFO">
             <appender-ref ref="STDOUT"/>
             <appender-ref ref="ERROR"/>

pom.xml

@@ -175,6 +175,19 @@
     </distributionManagement>
 
     <profiles>
+        <profile>
+            <id>env-fupf</id>
+            <properties>
+                <env.name>fupf</env.name>
+                <!--Nacos 配置-->
+                <config.server-addr>172.16.46.63:30848</config.server-addr>
+                <config.namespace>fupf</config.namespace>
+                <config.group>DEFAULT_GROUP</config.group>
+                <config.username>nacos</config.username>
+                <config.password>P@ssword25</config.password>
+                <config.version>1.0.0</config.version>
+            </properties>
+        </profile>
         <profile>
             <id>env-dev</id>
             <properties>

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<ElementDO> getElementNoPage();
 
     PageResult<ElementDO> getElementPageByEnable(ElementPageReqVO pageReqVO);
+    /**
+     * 根据元素符号获得元素
+     *
+     * @param symbol 元素符号
+     * @return 元素
+     */
+    ElementDO getElementBySymbol(String symbol);
 }

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);
+    }
+
 }

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) {
         // 校验存在

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<SalesOrderDetailRespVO> createSalesOrderDetail(List<SalesOrderDetailSaveReqVO> createReqVOS) {

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<ErpMaterialCorrRspVO> getErpMaterialByMainMaterialByCode(String code, String companyCode) {
         LambdaQueryWrapperX<ErpMaterialCorrDO> 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);
     }

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<ErpMaterialDO> getErpMaterialByApi(MaterialInfomationApiVO vo) {
         //通过部门编码查询数据库，获取到部门ID
-        List<ErpMaterialCorrRspVO> erpMaterialByCompanyCode = erpMaterialCorrService.getErpMaterialByMainMaterialByCode(vo.getDeptId(), vo.getDeptId());
+        List<ErpMaterialCorrRspVO> erpMaterialByCompanyCode = erpMaterialCorrService.getErpMaterialByMainMaterialByCode(vo.getMaterialNumber(), vo.getDeptId());
         if (erpMaterialByCompanyCode.isEmpty()) {
             return new PageResult<>();
         }