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

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
qianshijiang
2025-12-31 08:52:26 +08:00
parent 9c02a24642 69375988c2
commit be7bee1300
11 changed files with 408 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
base-server/src/main/resources/logback-spring.xml
View File

@@ -90,6 +90,12 @@
<logger name="com.zt.plat.module.base.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>
</springProfile>
<!-- 其它环境 -->

2
zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java
View File

@@ -55,4 +55,6 @@ public interface ErrorCodeConstants {
ErrorCode ERP_CONTRACT_NOT_EXISTS = new ErrorCode(1_016_000_001, "ERP合同数据不存在");
ErrorCode ERP_PRODUCTIVE_ORDER_NOT_EXISTS = new ErrorCode(1_017_000_001, "ERP生产订单数据不存在");
ErrorCode MATERIAL_ERROR = new ErrorCode( 1_017_000_009, "主物料信息错误");
}

22
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpMaterialController.java
View File

@@ -117,13 +117,15 @@ public class ErpMaterialController {
PageResult<ErpMaterialRespVO> pageResult = erpMaterialService.getErpMaterialPageAndOther(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpMaterialRespVO.class));
}
//创建物料拓展关系
@PostMapping("/createErpMaterialCorr")
@Operation(summary = "创建ERP物料关系")
@PreAuthorize("@ss.hasPermission('sply:erp-material:create')")
public CommonResult<List<ErpMaterialRespVO>> createErpMaterialCorr(@Valid @RequestBody List<ErpMaterialCorrSaveReqVO> erpMaterialCorrSaveReqVOS) {
return success(erpMaterialService.createErpMaterialCorr(erpMaterialCorrSaveReqVOS));
public CommonResult<List<ErpMaterialRespVO>> createErpMaterialCorr(@Valid @RequestBody ErpMaterialCorrSaveReqVO erpMaterialCorrSaveReqVO) {
return success(erpMaterialService.createErpMaterialCorr(erpMaterialCorrSaveReqVO));
}
//删除物料关系
@DeleteMapping("/deleteErpMaterialCorr")
@Operation(summary = "删除ERP物料关系")
@@ -133,4 +135,20 @@ public class ErpMaterialController {
return success(true);
}
//通过物料id查询物料详情
@GetMapping("/getErpMaterialById")
@Operation(summary = "通过物料id查询物料详情")
@PreAuthorize("@ss.hasPermission('sply:erp-material:query')")
public CommonResult<ErpMaterialRespVO> getErpMaterialById(@RequestParam("id") Long id) {
ErpMaterialDO erpMaterial = erpMaterialService.getErpMaterialById(id);
return success(BeanUtils.toBean(erpMaterial, ErpMaterialRespVO.class));
}
//通过主物料查询子物料信息
@GetMapping("/getErpMaterialByMainMaterialById")
@Operation(summary = "通过主物料查询子物料信息")
@PreAuthorize("@ss.hasPermission('sply:erp-material:query')")
public CommonResult<List<ErpMaterialRespVO>> getErpMaterialByMainMaterial(@RequestParam("id") Long mainMaterialId) {
List<ErpMaterialDO> erpMaterial = erpMaterialService.getErpMaterialByMainMaterial(mainMaterialId);
return success(BeanUtils.toBean(erpMaterial, ErpMaterialRespVO.class));
}
}

23
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpMaterialCorrSaveReqVO.java
View File

@@ -1,11 +1,12 @@
package com.zt.plat.module.erp.controller.admin.erp.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
@Schema(description = "管理后台 - 物料拓展关系 Request VO")
@Data
public class ErpMaterialCorrSaveReqVO {
@@ -22,19 +23,25 @@ public class ErpMaterialCorrSaveReqVO {
@NotNull(message = "拓展关系主物料不能为空")
private Long materialParentId;
/**
* 物料ID
*/
@Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED)
private Long materialId;
/**
* 拓展关系主物料编号
*/
@Schema(description = "拓展关系主物料编号")
private String materialParentCode;
/**
* 物料编码
* 拓展关系物料
*/
@Schema(description = "拓展关系物料编号")
@Schema(description = "拓展关系物料")
private List<Materials> materials;
@Data
@Schema(description = "拓展关系物料")
public static class Materials {
@Schema(description = "物料ID", requiredMode = Schema.RequiredMode.REQUIRED)
private Long materialId;
@Schema(description = "物料编码")
private String materialCode;
}
}

211
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/MaterialAttributeUtils.java Normal file
View File

File diff suppressed because it is too large Load Diff

16
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/framework/rpc/config/RpcConfiguration.java Normal file
View File

@@ -0,0 +1,16 @@
package com.zt.plat.module.erp.framework.rpc.config;
import com.zt.plat.module.base.api.materialinfomation.MaterialInfomationApi;
import com.zt.plat.module.infra.api.businessfile.BusinessFileApi;
import com.zt.plat.module.infra.api.file.FileApi;
import com.zt.plat.module.system.api.dept.DeptApi;
import com.zt.plat.module.system.api.sequence.SequenceApi;
import com.zt.plat.module.system.api.user.AdminUserApi;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.Configuration;
@Configuration(value = "erpRpcConfiguration", proxyBeanMethods = false)
@EnableFeignClients(clients = {DeptApi.class, SequenceApi.class, AdminUserApi.class, BusinessFileApi.class, FileApi.class, MaterialInfomationApi.class})
public class RpcConfiguration {
}

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrService.java
View File

@@ -13,6 +13,8 @@ import java.util.List;
* @author 后台管理
*/
public interface ErpErpMaterialCorrService {
List<ErpMaterialCorrRspVO> create(@Valid List<ErpMaterialCorrSaveReqVO> reqVO);
List<ErpMaterialCorrRspVO> create(@Valid ErpMaterialCorrSaveReqVO reqVO);
void deleteBatch(BatchDeleteReqVO reqVO);
List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterial(Long mainMaterialId);
}

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

@@ -10,6 +10,7 @@ import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
import java.util.List;
@Service
@@ -19,14 +20,27 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{
private ErpErpMaterialCorrMapper erpErpMaterialCorrMapper;
@Override
public List<ErpMaterialCorrRspVO> create(List<ErpMaterialCorrSaveReqVO> reqVO) {
List<ErpMaterialCorrDO> bean = BeanUtils.toBean(reqVO, ErpMaterialCorrDO.class);
erpErpMaterialCorrMapper.insertBatch(bean);
return BeanUtils.toBean(bean, ErpMaterialCorrRspVO.class);
public List<ErpMaterialCorrRspVO> create(ErpMaterialCorrSaveReqVO reqVO) {
List<ErpMaterialCorrDO> erpMaterialCorrDOS=new ArrayList<>();
reqVO.getMaterials().forEach(materials -> {
erpMaterialCorrDOS.add(ErpMaterialCorrDO.builder()
.materialParentId(reqVO.getMaterialParentId())
.materialParentCode(reqVO.getMaterialParentCode())
.materialId(materials.getMaterialId())
.materialCode(materials.getMaterialCode())
.build());
});
erpErpMaterialCorrMapper.insertBatch(erpMaterialCorrDOS);
return BeanUtils.toBean(erpMaterialCorrDOS, ErpMaterialCorrRspVO.class);
}
@Override
public void deleteBatch(BatchDeleteReqVO reqVO) {
erpErpMaterialCorrMapper.deleteByIds(reqVO.getIds());
}
@Override
public List<ErpMaterialCorrRspVO> getErpMaterialByMainMaterial(Long mainMaterialId) {
return BeanUtils.toBean( erpErpMaterialCorrMapper.selectList(ErpMaterialCorrDO::getMaterialParentId, mainMaterialId), ErpMaterialCorrRspVO.class);
}
}

5
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java
View File

@@ -269,6 +269,11 @@ public class ErpFactoryServiceImpl implements ErpFactoryService {
private void saveData(ProcessingResult result) {
// 批量新增和更新
if (!result.toInsert.isEmpty()) {
//自动绑定工厂
result.toInsert.forEach(r->{
r.setRelName(r.getName());
r.setRelnumber(r.getNumber());
});
erpFactoryMapper.insertBatch(result.toInsert);
// 批量查询刚插入数据的id，提升效率
List<String> insertedNumbers = result.toInsert.stream()

6
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialService.java
View File

@@ -70,7 +70,11 @@ public interface ErpMaterialService {
String getMaterialUnit(String materialNumber);
List<ErpMaterialRespVO> createErpMaterialCorr(List<ErpMaterialCorrSaveReqVO> erpMaterialCorrSaveReqVOS);
List<ErpMaterialRespVO> createErpMaterialCorr(ErpMaterialCorrSaveReqVO erpMaterialCorrSaveReqVO);
void deleteErpMaterialCorr(BatchDeleteReqVO reqVO);
ErpMaterialDO getErpMaterialById(Long id);
List<ErpMaterialDO> getErpMaterialByMainMaterial(Long mainMaterialId);
}

Some files were not shown because too many files have changed in this diff Show More