diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java index 9449fe0..b9f1f52 100644 --- a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/enums/ErrorCodeConstants.java @@ -27,6 +27,7 @@ public interface ErrorCodeConstants { ErrorCode ERP_FACTORY_NOT_EXISTS = new ErrorCode(1_008_000_001, "ERP工厂数据不存在"); ErrorCode ERP_FACTORY_REDIS_NOT_EXISTS = new ErrorCode(1_008_000_002, "ERP工厂redis数据不存在"); + ErrorCode ERP_FACTORY_NOT_ALLOW_UPDATE = new ErrorCode(1_008_000_003, "类型为ERP的数据或启用的数据不允许编辑"); ErrorCode ERP_COSTCENTER_NOT_EXISTS = new ErrorCode(1_009_000_001, "ERP成本中心数据不存在"); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java index cd0d51f..5878582 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/ErpFactoryController.java @@ -88,6 +88,14 @@ public class ErpFactoryController { return success(BeanUtils.toBean(pageResult, ErpFactoryRespVO.class)); } + @GetMapping("/pageByCpn") + @Operation(summary = "获得ERP工厂分页") + @PreAuthorize("@ss.hasPermission('base:erp-factory:query')") + public CommonResult> getErpFactoryPageByCpn(@Valid ErpFactoryPageReqVO pageReqVO) { + PageResult pageResult = erpFactoryService.getErpFactoryPageByCpn(pageReqVO); + return success(BeanUtils.toBean(pageResult, ErpFactoryRespVO.class)); + } + @GetMapping("/export-excel") @Operation(summary = "导出ERP工厂 Excel") @PreAuthorize("@ss.hasPermission('base:erp-factory:export')") @@ -101,6 +109,14 @@ public class ErpFactoryController { BeanUtils.toBean(list, ErpFactoryRespVO.class)); } + @PutMapping("/enable-list") + @Operation(summary = "批量更新") + @PreAuthorize("@ss.hasPermission('base:erp-factory:update')") + public CommonResult enableFactoryList(@RequestBody List saveReqVOS) { + erpFactoryService.enableFactoryList(saveReqVOS); + return success(true); + } + @PostMapping("/getErpFactoryTask") @Operation(summary = "定时获得erp工厂数据") @PreAuthorize("@ss.hasPermission('base:erp-factory:create')") diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java index ea7375e..bf71059 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryPageReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.erp.controller.admin.erp.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.zt.plat.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -14,4 +15,13 @@ public class ErpFactoryPageReqVO extends PageParam { @Schema(description = "工厂编码") private String number; + @Schema(description = "公司编号") + private String companyNumber; + + @Schema(description = "公司名称") + private String companyName; + + @Schema(description = "类型") + private String type; + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java index 8c0d4d4..9700347 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactoryRespVO.java @@ -22,4 +22,18 @@ public class ErpFactoryRespVO { @ExcelProperty("工厂编码") private String number; + @Schema(description = "公司编号") + private String companyNumber; + + @Schema(description = "类型") + private String type; + + @Schema(description = "绑定工厂名") + private String relName; + + @Schema(description = "绑定工厂编码") + private String relnumber; + + @Schema(description = "是否启用") + private String isEnable; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java index 3cb6f25..f93795f 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpFactorySaveReqVO.java @@ -19,4 +19,21 @@ public class ErpFactorySaveReqVO { @NotEmpty(message = "工厂编码不能为空") private String number; + @Schema(description = "公司编号") + private String companyNumber; + + @Schema(description = "公司编号") + private String companyName; + + @Schema(description = "类型") + private String type; + + @Schema(description = "绑定工厂名") + private String relName; + + @Schema(description = "绑定工厂编码") + private String relnumber; + + @Schema(description = "是否启用") + private String isEnable; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java index 491b6e9..61a613b 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpFactoryDO.java @@ -1,12 +1,14 @@ package com.zt.plat.module.erp.dal.dataobject.erp; import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; + /** -* ERP工厂 DO -* -* @author 后台管理 -*/ + * ERP工厂 DO + * + * @author 后台管理 + */ @TableName("sply_erp_fact") @KeySequence("sply_erp_fact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 @Data @@ -16,31 +18,58 @@ import lombok.*; @NoArgsConstructor @AllArgsConstructor /** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class ErpFactoryDO { - - + * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO + */ +public class ErpFactoryDO extends BusinessBaseDO { /** - * 主键 - */ + * 主键 + */ @TableId(type = IdType.ASSIGN_ID) private Long id; /** - * 工厂名称 - */ + * 工厂名称 + */ @TableField("NAME") private String name; /** - * 工厂编码 - */ + * 工厂编码 + */ @TableField("NUM") private String number; /** - * 公司编号 - */ + * 公司编号 + */ @TableField("CPN_ID") - private String companyId; + private String companyNumber; + /** + * 公司名称 + */ + @TableField(exist = false) + private String companyName; + + /** + * 类型 + */ + @TableField("TP") + private String type; + + /** + * 绑定工厂名 + */ + @TableField("REL_NAME") + private String relName; + + /** + * 绑定工厂编码 + */ + @TableField("REL_NUM") + private String relnumber; + + /** + * 类型 + */ + @TableField("IS_ENB") + private String isEnable; } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java index 54b1577..95a54c2 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java @@ -41,4 +41,10 @@ public class ErpWarehouseDO { @TableField("NUM") private String number; + /** + * 类别 + */ + @TableField("TP") + private String type; + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java index a00e6c7..167de8b 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpBomMapper.java @@ -25,6 +25,4 @@ public interface ErpBomMapper extends BaseMapperX { .eqIfPresent(ErpBomDO::getUnit, reqVO.getUnit()) .orderByDesc(ErpBomDO::getId)); } - - Long insertGetId(ErpBomDO aDo); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java index 5365316..de7d71e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpCostcenterMapper.java @@ -29,6 +29,4 @@ public interface ErpCostcenterMapper extends BaseMapperX { .betweenIfPresent(ErpCostcenterDO::getEndDate, reqVO.getEndDate()) .orderByDesc(ErpCostcenterDO::getId)); } - - void updateBatchByNumber(@Param("list") List toUpdate); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java index a4a22a7..4661051 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpFactoryMapper.java @@ -22,9 +22,11 @@ public interface ErpFactoryMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ErpFactoryDO::getName, reqVO.getName()) .eqIfPresent(ErpFactoryDO::getNumber, reqVO.getNumber()) + .eqIfPresent(ErpFactoryDO::getType, reqVO.getType()) .orderByDesc(ErpFactoryDO::getId)); } - void updateBatch(@Param("toUpdate") List toUpdate); + String selectMaxCode(); + List getPageByReq(ErpFactoryPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java index c55748b..ce09950 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java @@ -77,12 +77,12 @@ public class ErpContractServiceImpl implements ErpContractService { } @Override - public void deleteErpContractListByIds(List ids) { + public void deleteErpContractListByIds(List ids) { // 校验存在 validateErpContractExists(ids); // 删除 erpContractMapper.deleteByIds(ids); - } + } private void validateErpContractExists(List ids) { List list = erpContractMapper.selectByIds(ids); @@ -177,17 +177,44 @@ public class ErpContractServiceImpl implements ErpContractService { @XxlJob("getErpContractTask") public void callErpRfcInterface() { try { - OftenEnum.FuncnrEnum funcnrEnum =OftenEnum.FuncnrEnum.合同信息; + OftenEnum.FuncnrEnum funcnrEnum = OftenEnum.FuncnrEnum.合同信息; String funcnr = funcnrEnum.getFuncnr(); + + Map req = new HashMap<>(); + JSONArray dataArrayALL = new JSONArray(); + String commanyKey = "erpMap" + OftenEnum.FuncnrEnum.公司代码.getFuncnr(); + Map redisCache = myRedisConfig.getRedisCacheMap(commanyKey); + if (CollUtil.isEmpty(redisCache)) { + return; + } + String cstmKey = "erpMap" + OftenEnum.FuncnrEnum.客商信息.getFuncnr(); + Map redisCachecstmKey = myRedisConfig.getRedisCacheMap(cstmKey); + if (CollUtil.isEmpty(redisCachecstmKey)) { + return; + } // 1. 调用ERP接口获取数据 - HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); - JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); - if (CollUtil.isEmpty(dataArray)) { + for (String INEDR : new String[]{"1", "2"}) { + req.put("INEDR", INEDR); + for (String number : redisCache.keySet()) { + req.put("BUKRS", number); + for (String partner : redisCachecstmKey.keySet()) { + req.put("PARTNER", partner); + + // 1. 调用ERP接口获取数据 + HashMap dataFromERP = erpConfig.fetchDataFromERP(funcnr, null); + JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP"); + if (dataArray!= null) { + dataArrayALL.addAll(dataArray); + } + } + } + } + if (CollUtil.isEmpty(dataArrayALL)) { throw exception(ERP_CONTRACT_NOT_EXISTS); } // 2. 处理公司数据，区分新增和更新 - ProcessingResult result = processData(dataArray,funcnrEnum); + ProcessingResult result = processData(dataArrayALL, funcnrEnum); // 3. 批量保存数据 saveData(result); @@ -203,7 +230,7 @@ public class ErpContractServiceImpl implements ErpContractService { */ private ProcessingResult processData(JSONArray dataArray, OftenEnum.FuncnrEnum funcnr) { String key = "erp" + funcnr.getFuncnr(); - Map> numbers = myRedisConfig.numbers(dataArray, key,funcnr.getDatakey()); + Map> numbers = myRedisConfig.numbers(dataArray, key, funcnr.getDatakey()); List allnumbers = numbers.get("all"); List comnumbers = numbers.get("com"); List toUpdate = new ArrayList<>(); @@ -229,7 +256,7 @@ public class ErpContractServiceImpl implements ErpContractService { } } - return new ProcessingResult(toUpdate, toInsert,key,allnumbers); + return new ProcessingResult(toUpdate, toInsert, key, allnumbers); } /** @@ -243,7 +270,7 @@ public class ErpContractServiceImpl implements ErpContractService { if (!result.toUpdate.isEmpty()) { erpContractMapper.updateBatch(result.toUpdate); } - myRedisConfig.updateRedisCache(result.key,result.allnumbers); + myRedisConfig.updateRedisCache(result.key, result.allnumbers); } /** @@ -255,7 +282,7 @@ public class ErpContractServiceImpl implements ErpContractService { private final String key; private final List allnumbers; - public ProcessingResult(List toUpdate, List toInsert,String key,List allnumbers) { + public ProcessingResult(List toUpdate, List toInsert, String key, List allnumbers) { this.toUpdate = toUpdate; this.toInsert = toInsert; this.key = key; diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java index 3583dda..29f36f0 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryService.java @@ -62,4 +62,8 @@ public interface ErpFactoryService { PageResult getErpFactoryPage(ErpFactoryPageReqVO pageReqVO); void callErpRfcInterface(); + + void enableFactoryList(List saveReqVOS); + + PageResult getErpFactoryPageByCpn(ErpFactoryPageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java index e4d09c6..06c32fa 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java @@ -16,6 +16,7 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpFactorySaveReqVO; import com.zt.plat.module.erp.dal.dataobject.erp.ErpFactoryDO; import com.zt.plat.module.erp.dal.mysql.erp.ErpFactoryMapper; import jakarta.annotation.Resource; +import org.apache.ibatis.executor.BatchResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -51,6 +52,21 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { public ErpFactoryRespVO createErpFactory(ErpFactorySaveReqVO createReqVO) { // 插入 ErpFactoryDO erpFactory = BeanUtils.toBean(createReqVO, ErpFactoryDO.class); + // 工厂编码自动生成，格式 GC-0001,依次新增 + if (erpFactory.getNumber() == null){ + String maxCode = erpFactoryMapper.selectMaxCode(); + if (maxCode == null) { + erpFactory.setNumber("GC-0001"); + } else { + String prefix = "GC-"; + String numberPart = maxCode.substring(prefix.length()); + int nextNumber = Integer.parseInt(numberPart) + 1; + String nextCode = prefix + String.format("%04d", nextNumber); + erpFactory.setNumber(nextCode); + } + } + erpFactory.setType("供应链"); + erpFactory.setIsEnable("1"); erpFactoryMapper.insert(erpFactory); // 返回 return BeanUtils.toBean(erpFactory, ErpFactoryRespVO.class); @@ -62,6 +78,9 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { validateErpFactoryExists(updateReqVO.getId()); // 更新 ErpFactoryDO updateObj = BeanUtils.toBean(updateReqVO, ErpFactoryDO.class); + if (updateObj.getType().equals("ERP")||updateObj.getIsEnable().equals("1")){ + throw exception(ERP_FACTORY_NOT_ALLOW_UPDATE); + } erpFactoryMapper.updateById(updateObj); } @@ -103,6 +122,39 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { public PageResult getErpFactoryPage(ErpFactoryPageReqVO pageReqVO) { return erpFactoryMapper.selectPage(pageReqVO); } + + @Override + public void enableFactoryList(List saveReqVOS) { + List updateObj = BeanUtils.toBean(saveReqVOS, ErpFactoryDO.class); + List count = erpFactoryMapper.updateById(updateObj); + if (CollUtil.isEmpty(count)) { + throw exception(ERP_FACTORY_NOT_EXISTS); + } + } + + @Override + public PageResult getErpFactoryPageByCpn(ErpFactoryPageReqVO pageReqVO) { + // 获取分页数据 + List list = erpFactoryMapper.getPageByReq(pageReqVO); + if (list == null) { + list = CollUtil.newArrayList(); + } + // 分页处理 + int pageNo = pageReqVO.getPageNo(); + int pageSize = pageReqVO.getPageSize(); + int total = list.size(); + // 计算分页起始和结束位置 + int fromIndex = (pageNo - 1) * pageSize; + int toIndex = Math.min(fromIndex + pageSize, total); + // 如果起始位置超出范围，则返回空列表 + if (fromIndex >= total) { + return new PageResult<>(new ArrayList<>(), (long) total); + } + // 截取当前页数据 + List pageList = list.subList(fromIndex, toIndex); + return new PageResult<>(pageList, (long) total); + } + @Override @Transactional @XxlJob("getErpFactoryTask") @@ -173,7 +225,8 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { ErpFactoryDO DO = new ErpFactoryDO(); DO.setName(dataJson.getString("NAME1")); DO.setNumber(number); - DO.setCompanyId(dataJson.getString("BUKRS")); + DO.setCompanyNumber(dataJson.getString("BUKRS")); + DO.setType("ERP"); if (numbers.get(number)!=null) { // 更新 DO.setId(numbers.get(number)); @@ -244,7 +297,7 @@ public class ErpFactoryServiceImpl implements ErpFactoryService { private void initializeMap(String key) { Map existingNumbers = erpFactoryMapper.selectList(new LambdaQueryWrapperX()) - .stream() + .stream().filter(erpFactoryDO -> erpFactoryDO.getType().equals("ERP")) .collect(Collectors.toMap(ErpFactoryDO::getNumber, ErpFactoryDO::getId)); myRedisConfig.addRedisCacheMap(key, existingNumbers); } 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 6cfec6e..224ed84 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 @@ -228,7 +228,8 @@ public class ErpMaterialServiceImpl implements ErpMaterialService { private void initialize(String key) { List existingNumbers = erpMaterialMapper.selectList(new LambdaQueryWrapperX()) - .stream() + .stream( ) + .filter(ErpMaterialDO -> ErpMaterialDO.getType().equals("ERP")) .map(ErpMaterialDO::getDownCenterNumber) .collect(Collectors.toList()); myRedisConfig.updateRedisCache(key, existingNumbers); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java index 27c07a4..f7028bf 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java @@ -244,7 +244,8 @@ public class ErpWarehouseServiceImpl implements ErpWarehouseService { } private void initializeMap(String key) { - List assets = erpWarehouseMapper.selectList(new LambdaQueryWrapperX()); + List assets = erpWarehouseMapper.selectList(new LambdaQueryWrapperX() + .eq(ErpWarehouseDO::getType, "ERP")); Map existingNumbers = new HashMap<>(); for (ErpWarehouseDO asset : assets) { String mapKey = asset.getFactoryNumber() + "-" + asset.getNumber(); diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml index 12a0566..fb84721 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpAssetMapper.xml @@ -8,23 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - UPDATE sply_erp_ast - - NAME = CASE - - WHEN CPN_NUM = #{item.companyNumber} AND MAIN_AST_NUM = #{item.mainAssetNumber} THEN #{item.name} - - END, - CPN_ID = CASE - - WHEN CPN_NUM = #{item.companyNumber} AND MAIN_AST_NUM = #{item.mainAssetNumber} THEN #{item.companyId} - - END - - WHERE (CPN_NUM, MAIN_AST_NUM) IN - - #{item.companyNumber}, #{item.mainAssetNumber} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml index 85d4dfb..632e44e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpBomMapper.xml @@ -9,18 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml index f9f4620..0122889 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCompanyMapper.xml @@ -8,15 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml index 688d9d4..e7dacd8 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpContractMapper.xml @@ -8,15 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml index 498c4e0..54e0e40 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCostcenterMapper.xml @@ -9,61 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - UPDATE sply_erp_cctr - SET - NAME = CASE NUM - - - WHEN #{item.number} THEN #{item.name} - - - ELSE NAME - END, - IS_USE = CASE NUM - - - WHEN #{item.number} THEN #{item.isUse} - - - ELSE IS_USE - END, - SCO_NUM = CASE NUM - - - WHEN #{item.number} THEN #{item.scopeNumber} - - - ELSE SCO_NUM - END, - STRT_DT = CASE NUM - - - WHEN #{item.number} THEN #{item.startDate} - - - ELSE STRT_DT - END, - END_DT = CASE NUM - - - WHEN #{item.number} THEN #{item.endDate} - - - ELSE END_DT - END, - SCO_NAME = CASE NUM - - - WHEN #{item.number} THEN #{item.scopeName} - - - ELSE SCO_NAME - END - WHERE NUM IN - - #{item.number} - - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml index 31f5228..8e76ec1 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpCustomerMapper.xml @@ -8,15 +8,4 @@ 代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml index 4a23831..baadafd 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpFactoryMapper.xml @@ -9,14 +9,28 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - + + + \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml index b59832f..4a1460c 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpInternalOrderMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml index f487c8d..b58d773 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessDetailMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml index 433aa98..e7b766e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProcessMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml index 84cc4c6..e39974f 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveOrderMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml index 9cdaf4c..c64aa8e 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpProductiveVersionMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml index 2a28feb..eac0416 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpPurchaseOrganizationMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml index 09c59b5..616ebb0 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpSalesOrganizationMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml index a78b3ab..533eb39 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml @@ -9,14 +9,4 @@ 文档可见：https://www.iocoder.cn/MyBatis/x-plugins/ --> - - - UPDATE sply_erp_fact - - NAME = #{item.name}, - CPN_ID = #{item.companyId}, - - WHERE NUM = #{item.number} - - \ No newline at end of file