zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

委托加工和回收率管理优化

Browse Source
This commit is contained in:
潘荣晟
2026-02-03 17:40:22 +08:00
parent 6e72c30207
commit 0ecdb01a0b
12 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java
View File

@@ -1,5 +1,7 @@
package com.zt.plat.module.erp.service.erp;
import com.zt.plat.framework.common.exception.ErrorCode;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -8,6 +10,8 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrRspVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO;
import com.zt.plat.module.erp.dal.dataobject.erp.ErpMaterialCorrDO;
import com.zt.plat.module.erp.dal.mysql.erp.ErpErpMaterialCorrMapper;
import com.zt.plat.module.system.api.dept.DeptApi;
import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -15,11 +19,15 @@ import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
@Service
@Validated
public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{
@Resource
private ErpErpMaterialCorrMapper erpErpMaterialCorrMapper;
@Resource
private DeptApi deptApi;
@Override
public List<ErpMaterialCorrRspVO> create(ErpMaterialCorrSaveReqVO reqVO) {
@@ -29,12 +37,17 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{
if (erpErpMaterialCorrMapper.selectOne(ErpMaterialCorrDO::getMaterialParentId,reqVO.getMaterialParentId(), ErpMaterialCorrDO::getMaterialId,materials.getMaterialId()) != null) {
return;
}
CommonResult<DeptRespDTO> dept = deptApi.getDept(reqVO.getDeptId());
DeptRespDTO data = dept.getData();
if (data==null) {
throw exception(new ErrorCode(1027004000, "部门不存在"));
}
erpMaterialCorrDOS.add(ErpMaterialCorrDO.builder()
.materialParentId(reqVO.getMaterialParentId())
.materialParentCode(reqVO.getMaterialParentCode())
.materialId(materials.getMaterialId())
.deptId(reqVO.getDeptId())
.companyCode(reqVO.getCompanyCode())
.companyCode(data.getCode())
.materialCode(materials.getMaterialCode())
.build());
});

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java
View File

@@ -192,7 +192,7 @@ public PageResult<ErpWarehouseDO> getErpWarehousePageDistinctByFactory(ErpWareho
@Override
public PageResult<ErpWarehouseDO> getErpWarehousePage(ErpWarehousePageReqVO pageReqVO) {
return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo(), pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO));
return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo()-1, pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO));
// PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
// if (erpWarehouseRespVOPageResult.getList() == null) {
// return erpWarehouseRespVOPageResult;

20
zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml
View File

@@ -90,19 +90,19 @@
AND sef.DELETED = 0
AND sew.DELETED = 0
<if test="paramReqVO.companyIdCustom != null and paramReqVO.companyIdCustom != ''">
AND sef.CPN_ID = #{paramReqVO.companyIdCustom}
AND sef.CPN_ID LIKE CONCAT('%', #{paramReqVO.companyIdCustom}, '%')
</if>
<if test="paramReqVO.type != null and paramReqVO.type != ''">
AND sef.TP = #{paramReqVO.type}
AND sef.TP LIKE CONCAT('%', #{paramReqVO.type}, '%')
</if>
<if test="paramReqVO.number != null and paramReqVO.number != ''">
AND sew.NUM = #{paramReqVO.number}
AND sew.NUM LIKE CONCAT('%', #{paramReqVO.number}, '%')
</if>
<if test="paramReqVO.factoryNumber != null and paramReqVO.factoryNumber != ''">
AND sef.NUM = #{paramReqVO.factoryNumber}
AND sef.NUM LIKE CONCAT('%', #{paramReqVO.factoryNumber}, '%')
</if>
<if test="paramReqVO.factoryName != null and paramReqVO.factoryName != ''">
AND sef.NAME = #{paramReqVO.factoryName}
AND sef.NAME LIKE CONCAT('%', #{paramReqVO.factoryName}, '%')
</if>
ORDER BY sew.CREATE_TIME DESC
<!-- 分页参数直接引用 @Param 指定的 pageNum/pageSize -->
@@ -120,19 +120,19 @@
AND sef.DELETED = 0
AND sew.DELETED = 0
<if test="paramReqVO.companyIdCustom != null and paramReqVO.companyIdCustom != ''">
AND sef.CPN_ID = #{paramReqVO.companyIdCustom}
AND sef.CPN_ID LIKE CONCAT('%', #{paramReqVO.companyIdCustom}, '%')
</if>
<if test="paramReqVO.type != null and paramReqVO.type != ''">
AND sef.TP = #{paramReqVO.type}
AND sef.TP LIKE CONCAT('%', #{paramReqVO.type}, '%')
</if>
<if test="paramReqVO.number != null and paramReqVO.number != ''">
AND sew.NUM = #{paramReqVO.number}
AND sew.NUM LIKE CONCAT('%', #{paramReqVO.number}, '%')
</if>
<if test="paramReqVO.factoryNumber != null and paramReqVO.factoryNumber != ''">
AND sef.NUM = #{paramReqVO.factoryNumber}
AND sef.NUM LIKE CONCAT('%', #{paramReqVO.factoryNumber}, '%')
</if>
<if test="paramReqVO.factoryName != null and paramReqVO.factoryName != ''">
AND sef.NAME = #{paramReqVO.factoryName}
AND sef.NAME LIKE CONCAT('%', #{paramReqVO.factoryName}, '%')
</if>
</select>