新增-erp物料查询接口api

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/ErpExternalApi.java

@@ -1,6 +1,7 @@
 package com.zt.plat.module.erp.api;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
 import com.zt.plat.module.erp.api.dto.ErpProductiveVersionReqDTO;
 import com.zt.plat.module.erp.api.dto.ErpQueryReqDTO;
 import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
@@ -33,4 +34,8 @@ public interface ErpExternalApi {
     @GetMapping(PREFIX + "/queryProductiveVersion")
     @Operation(summary = "生产版本数据查询")
     CommonResult<String> getErpProductiveVersionByFM(@Valid @RequestBody ErpProductiveVersionReqDTO reqDTO);
+
+    @GetMapping(PREFIX + "/queryMaterial")
+    @Operation(summary = "物料数据查询")
+    CommonResult<ErpMaterialDTO> getErpMaterial(@Valid @RequestBody ErpMaterialDTO reqDTO);
 }

zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/ErpMaterialDTO.java

@@ -0,0 +1,75 @@
+package com.zt.plat.module.erp.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - ERP物料数据 Response VO")
+@Data
+public class ErpMaterialDTO {
+
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "中铜物料编码;系统使用时使用该编码")
+    private String downCenterNumber;
+
+    @Schema(description = "物料编码")
+    private String materialNumber;
+
+    @Schema(description = "中铝物料编码")
+    private String centerNumber;
+
+    @Schema(description = "创建日期")
+    private LocalDateTime createDate;
+
+    @Schema(description = "物料类型", example = "2")
+    private String materialType;
+
+    @Schema(description = "物料大类组")
+    private String materialGroupDate;
+
+    @Schema(description = "外部物料小类组")
+    private String externalMaterialGroupDate;
+
+    @Schema(description = "计量单位编码")
+    private String unit;
+
+    @Schema(description = "计量单位描述")
+    private String unitDescription;
+
+    @Schema(description = "物料类型描述")
+    private String materialTypeDescription;
+
+    @Schema(description = "物料组描述")
+    private String materialGroupDescription;
+
+    @Schema(description = "外部物料小类组描述")
+    private String externalMaterialGroupDescription;
+
+    @Schema(description = "物料名称", example = "李四")
+    private String materialName;
+
+    @Schema(description = "物料长描述")
+    private String materialLengthDescription;
+
+    @Schema(description = "类型")
+    private String type;
+
+    @Schema(description = "金属元素缩写")
+    private String abbreviation;
+
+    @Schema(description = "金属元素名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "金属元素编码")
+    private String coding;
+
+    @Schema(description = "品位单位")
+    private String gradeUnit;
+
+    @Schema(description = "小数位数")
+    private Long decimalValue;
+
+}

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/ErpExternalApiImpl.java

@@ -2,9 +2,12 @@ package com.zt.plat.module.erp.api;
 
 import com.zt.plat.framework.common.pojo.CommonResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
 import com.zt.plat.module.erp.api.dto.ErpProductiveVersionReqDTO;
 import com.zt.plat.module.erp.api.dto.ErpQueryReqDTO;
 import com.zt.plat.module.erp.api.dto.ErpSubmitReqDTO;
+import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialRespVO;
+import com.zt.plat.module.erp.service.erp.ErpMaterialService;
 import com.zt.plat.module.erp.service.erp.ErpProductiveVersionService;
 import com.zt.plat.module.erp.utils.ErpConfig;
 import jakarta.annotation.Resource;
@@ -34,6 +37,9 @@ public class ErpExternalApiImpl implements ErpExternalApi {
     private ErpConfig erpConfig;
     @Resource
     private ErpProductiveVersionService erpProductiveVersionService;
+    @Resource
+    private ErpMaterialService erpMaterialService;
+
 
     @Override
     public HashMap<String, String> submitDataToErp(ErpSubmitReqDTO reqDTO) {
@@ -52,4 +58,10 @@ public class ErpExternalApiImpl implements ErpExternalApi {
         String productiveVersionNumber = erpProductiveVersionService.getErpProductiveVersionByFM(reqDTO);
         return success(productiveVersionNumber);
     }
+
+    @Override
+    public CommonResult<ErpMaterialDTO> getErpMaterial(ErpMaterialDTO reqDTO) {
+        ErpMaterialDTO dto  = erpMaterialService.getErpMaterial(reqDTO);
+        return success(dto);
+    }
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpProductiveOrderPageReqVO.java

@@ -2,6 +2,7 @@ package com.zt.plat.module.erp.controller.admin.erp.vo;
 
 import com.zt.plat.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -14,9 +15,11 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 public class ErpProductiveOrderPageReqVO extends PageParam {
 
     @Schema(description = "公司编号")
+    @NotEmpty(message = "公司编号不能为空")
     private String companyNumber;
 
     @Schema(description = "工厂编码")
+    @NotEmpty(message = "公司编号不能为空")
     private String factoryNumber;
 
     @Schema(description = "工厂名称", example = "赵六")
@@ -27,10 +30,12 @@ public class ErpProductiveOrderPageReqVO extends PageParam {
 
     @Schema(description = "基本开始日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @NotEmpty(message = "公司编号不能为空")
     private LocalDateTime[] startDate;
 
     @Schema(description = "基本完成日期")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @NotEmpty(message = "公司编号不能为空")
     private LocalDateTime[] endDate;
 
     @Schema(description = "主产品物料编号")

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpMaterialMapper.java

@@ -3,6 +3,7 @@ package com.zt.plat.module.erp.dal.mysql.erp;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
 import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialPageReqVO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpMaterialDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -40,5 +41,11 @@ public interface ErpMaterialMapper extends BaseMapperX<ErpMaterialDO> {
 
     String selectMaxCode();
 
-    Integer selectByErpMNumbers(List<String> erpMNumber);
+    Integer countByErpMNumbers(List<String> erpMNumber);
+
+    default ErpMaterialDO selectOne(ErpMaterialDTO dto) {
+        return selectOne(new LambdaQueryWrapperX<ErpMaterialDO>()
+                .eq(ErpMaterialDO::getDownCenterNumber, dto.getDownCenterNumber())
+                .last("limit 1"));
+    }
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/job/ErpJob.java

@@ -30,6 +30,8 @@ public class ErpJob {
     @Resource
     private ErpProcessService erpProcessService;
     @Resource
+    private ErpProductiveOrderService erpProductiveOrderService;
+    @Resource
     private ErpProductiveVersionService erpProductiveVersionService;
     @Resource
     private ErpPurchaseOrganizationService erpPurchaseOrganizationService;
@@ -50,6 +52,7 @@ public class ErpJob {
         erpInternalOrderService.callErpRfcInterface();
         erpMaterialService.callErpRfcInterface();
         erpProcessService.callErpRfcInterface();
+        erpProductiveOrderService.callErpRfcInterface();
         erpProductiveVersionService.callErpRfcInterface();
         erpPurchaseOrganizationService.callErpRfcInterface();
         erpSalesOrganizationService.callErpRfcInterface();

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

@@ -1,6 +1,7 @@
 package com.zt.plat.module.erp.service.erp;
 
 import com.zt.plat.framework.common.pojo.PageResult;
+import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
 import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialPageReqVO;
 import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialRespVO;
 import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialSaveReqVO;
@@ -64,4 +65,12 @@ public interface ErpMaterialService {
     void callErpRfcInterface();
 
     PageResult<ErpMaterialRespVO> getErpMaterialPageAndOther(ErpMaterialPageReqVO pageReqVO);
+
+    /**
+     * 获得ERP物料数据
+     *
+     * @param DTO
+     * @return ERP物料数据
+     */
+    ErpMaterialDTO getErpMaterial(ErpMaterialDTO DTO);
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpMaterialServiceImpl.java

@@ -9,6 +9,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.api.BaseApi;
 import com.zt.plat.module.api.dto.MaterialOtherDTO;
+import com.zt.plat.module.erp.api.dto.ErpMaterialDTO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import com.zt.plat.module.erp.utils.ErpConfig;
 import com.zt.plat.module.erp.utils.MyRedisConfig;
@@ -124,7 +125,7 @@ public class ErpMaterialServiceImpl implements ErpMaterialService {
                 .collect(Collectors.toList());
 
         // 使用IN语句批量查询所有物料编码的数量
-        Integer countMap = erpMaterialMapper.selectByErpMNumbers(downCenterNumbers);
+        Integer countMap = erpMaterialMapper.countByErpMNumbers(downCenterNumbers);
         if (countMap > 1) {
             throw exception(ERP_MATERIAL_OTHER_NOT_ALLOW_DELETE);
         }
@@ -175,6 +176,12 @@ public class ErpMaterialServiceImpl implements ErpMaterialService {
         }
     }
 
+    @Override
+    public ErpMaterialDTO getErpMaterial(ErpMaterialDTO DTO) {
+        ErpMaterialDO erpMaterialDO = erpMaterialMapper.selectOne(DTO);
+        return BeanUtils.toBean(erpMaterialDO, ErpMaterialDTO.class);
+    }
+
     @Override
     @Transactional
     @XxlJob("getErpMaterialTask")

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpProductiveOrderServiceImpl.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.common.util.object.BeanUtils;
+import com.zt.plat.module.erp.controller.admin.erp.vo.ErpProductiveVersionPageReqVO;
+import com.zt.plat.module.erp.dal.dataobject.erp.ErpProductiveVersionDO;
 import com.zt.plat.module.erp.utils.ErpConfig;
 import com.zt.plat.module.erp.utils.MyRedisConfig;
 import com.zt.plat.module.erp.enums.OftenEnum;
@@ -102,82 +104,88 @@ public class ErpProductiveOrderServiceImpl implements ErpProductiveOrderService
 
     @Override
     public PageResult<ErpProductiveOrderDO> getErpProductiveOrderPage(ErpProductiveOrderPageReqVO pageReqVO) {
-        OftenEnum.FuncnrEnum funcnrEnum = OftenEnum.FuncnrEnum.生产订单;
+        return erpProductiveOrderMapper.selectPage(pageReqVO);
-        String funcnr = funcnrEnum.getFuncnr();
-        Map<String, Object> req = new HashMap<>();
-
-        // 构建查询参数
-        req.put("BUKRS", pageReqVO.getCompanyNumber());
-        req.put("WERKS", pageReqVO.getFactoryNumber());
-
-        // 处理日期参数
-        if (pageReqVO.getStartDate() != null) {
-            req.put("BEGDA", pageReqVO.getStartDate()[0].format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-        }
-        if (pageReqVO.getEndDate() != null) {
-            req.put("ENDDA", pageReqVO.getEndDate()[0].format(DateTimeFormatter.ofPattern("yyyyMMdd")));
     }
 
-        // 调用ERP接口获取数据
+    //直接从erp查询生产订单
-        HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
+//    @Override
-        JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
+//    public PageResult<ErpProductiveOrderDO> getErpProductiveOrderPage(ErpProductiveOrderPageReqVO pageReqVO) {
-        if (dataArray == null || dataArray.isEmpty()) {
+//        OftenEnum.FuncnrEnum funcnrEnum = OftenEnum.FuncnrEnum.生产订单;
-            // 返回空结果而不是抛出异常
+//        String funcnr = funcnrEnum.getFuncnr();
-            return new PageResult<>(new ArrayList<>(), 0L);
+//        Map<String, Object> req = new HashMap<>();
-        }
+//
-
+//        // 构建查询参数
-        List<ErpProductiveOrderDO> list = new ArrayList<>();
+//        req.put("BUKRS", pageReqVO.getCompanyNumber());
-        for (int i = 0; i < dataArray.size(); i++) {
+//        req.put("WERKS", pageReqVO.getFactoryNumber());
-            JSONObject dataJson = dataArray.getJSONObject(i);
+//
-            if (dataJson != null) {
+//        // 处理日期参数
-                ErpProductiveOrderDO orderDO = new ErpProductiveOrderDO();
+//        if (pageReqVO.getStartDate() != null) {
-
+//            req.put("BEGDA", pageReqVO.getStartDate()[0].format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-                // 基本信息
+//        }
-                orderDO.setCompanyNumber(dataJson.getString("BUKRS"));
+//        if (pageReqVO.getEndDate() != null) {
-                orderDO.setFactoryNumber(dataJson.getString("WERKS").trim());
+//            req.put("ENDDA", pageReqVO.getEndDate()[0].format(DateTimeFormatter.ofPattern("yyyyMMdd")));
-                orderDO.setFactoryName(dataJson.getString("NAME1"));
+//        }
-                orderDO.setOrderNumber(dataJson.getString("AUFNR"));
+//
-
+//        // 调用ERP接口获取数据
-                // 日期处理
+//        HashMap<String, Object> dataFromERP = erpConfig.fetchDataFromERP(funcnr, req);
-                String plannedStartDate = dataJson.getString("GLTRP");
+//        JSONArray dataArray = (JSONArray) dataFromERP.get("E_RESP");
-                String actualStartDate = dataJson.getString("GSTRP");
+//        if (dataArray == null || dataArray.isEmpty()) {
-
+//            // 返回空结果而不是抛出异常
-                if (plannedStartDate != null && !plannedStartDate.equals("0000-00-00")) {
+//            return new PageResult<>(new ArrayList<>(), 0L);
-                    try {
+//        }
-                        orderDO.setStartDate(LocalDateTime.parse(plannedStartDate));
+//
-                    } catch (Exception e) {
+//        List<ErpProductiveOrderDO> list = new ArrayList<>();
-                        // 忽略日期解析错误
+//        for (int i = 0; i < dataArray.size(); i++) {
-                    }
+//            JSONObject dataJson = dataArray.getJSONObject(i);
-                }
+//            if (dataJson != null) {
-
+//                ErpProductiveOrderDO orderDO = new ErpProductiveOrderDO();
-                if (actualStartDate != null && !actualStartDate.equals("0000-00-00")) {
+//
-                    try {
+//                // 基本信息
-                        orderDO.setEndDate(LocalDateTime.parse(actualStartDate));
+//                orderDO.setCompanyNumber(dataJson.getString("BUKRS"));
-                    } catch (Exception e) {
+//                orderDO.setFactoryNumber(dataJson.getString("WERKS").trim());
-                        // 忽略日期解析错误
+//                orderDO.setFactoryName(dataJson.getString("NAME1"));
-                    }
+//                orderDO.setOrderNumber(dataJson.getString("AUFNR"));
-                }
+//
-
+//                // 日期处理
-                // 物料和工艺信息
+//                String plannedStartDate = dataJson.getString("GLTRP");
-                orderDO.setMainMaterialNumber(dataJson.getString("STLBEZ"));
+//                String actualStartDate = dataJson.getString("GSTRP");
-                orderDO.setUnit(dataJson.getString("GMEIN"));
+//
-                orderDO.setMaterialDescription(dataJson.getString("MAKTX"));
+//                if (plannedStartDate != null && !plannedStartDate.equals("0000-00-00")) {
-                orderDO.setProcessingList(dataJson.getString("L_AFVC"));
+//                    try {
-                orderDO.setProcessingNumber(dataJson.getString("VORNR"));
+//                        orderDO.setStartDate(LocalDateTime.parse(plannedStartDate));
-                orderDO.setProcessingDescription(dataJson.getString("LTXA1"));
+//                    } catch (Exception e) {
-                orderDO.setObjectNumber(dataJson.getString("OBJID"));
+//                        // 忽略日期解析错误
-                orderDO.setWorkCenterNumber(dataJson.getString("ARBPL"));
+//                    }
-                orderDO.setWorkCenterDescription(dataJson.getString("KTEXT"));
+//                }
-                orderDO.setCostcenterNumber(dataJson.getString("KOSTL"));
+//
-                orderDO.setCostcenterName(dataJson.getString("TEXT_C"));
+//                if (actualStartDate != null && !actualStartDate.equals("0000-00-00")) {
-
+//                    try {
-                list.add(orderDO);
+//                        orderDO.setEndDate(LocalDateTime.parse(actualStartDate));
-            }
+//                    } catch (Exception e) {
-        }
+//                        // 忽略日期解析错误
-
+//                    }
-        // 返回分页结果
+//                }
-        return new PageResult<>(list, (long) list.size());
+//
-    }
+//                // 物料和工艺信息
+//                orderDO.setMainMaterialNumber(dataJson.getString("STLBEZ"));
+//                orderDO.setUnit(dataJson.getString("GMEIN"));
+//                orderDO.setMaterialDescription(dataJson.getString("MAKTX"));
+//                orderDO.setProcessingList(dataJson.getString("L_AFVC"));
+//                orderDO.setProcessingNumber(dataJson.getString("VORNR"));
+//                orderDO.setProcessingDescription(dataJson.getString("LTXA1"));
+//                orderDO.setObjectNumber(dataJson.getString("OBJID"));
+//                orderDO.setWorkCenterNumber(dataJson.getString("ARBPL"));
+//                orderDO.setWorkCenterDescription(dataJson.getString("KTEXT"));
+//                orderDO.setCostcenterNumber(dataJson.getString("KOSTL"));
+//                orderDO.setCostcenterName(dataJson.getString("TEXT_C"));
+//
+//                list.add(orderDO);
+//            }
+//        }
+//
+//        // 返回分页结果
+//        return new PageResult<>(list, (long) list.size());
+//    }
 
     @Override
     @Transactional

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

@@ -230,6 +230,7 @@ public class ErpWarehouseServiceImpl implements ErpWarehouseService {
                 DO.setName(dataJson.getString("LGOBE"));
                 DO.setNumber(dataJson.getString("LGORT").trim());
                 DO.setFactoryNumber(dataJson.getString("WERKS"));
+                DO.setType("ERP");
                 String number = dataJson.getString("WERKS").trim() + "-" + dataJson.getString("LGORT").trim();
                 if (numbers.get(number) != null) {
                     // 更新

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java

@@ -100,13 +100,16 @@ public class ErpConfig {
             String url = "http://" + erpAddress + "/api/rfc/post";
             // 构建请求参数
             JSONObject requestBody = new JSONObject();
-            requestBody.put("uuid", UUID.randomUUID().toString());
+            String uuid = UUID.randomUUID().toString();
+            requestBody.put("uuid", uuid);
             requestBody.put("sapsys", sapsys);
             requestBody.put("srcsys", "DSC");
             requestBody.put("funcnr", reqDTO.getFuncnr());
             requestBody.put("bskey", reqDTO.getBskey());
             requestBody.put("usrid", reqDTO.getUsrid());
             requestBody.put("usrnm", reqDTO.getUsrnm());
+            //todo 密码另行约定
+//            requestBody.put("sign", StrUtil.(uuid + sapsys + "密码另行约定"));
             if (reqDTO.getReq() != null) {
                 requestBody.put("req", reqDTO.getReq());
             }

zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpMaterialMapper.xml

@@ -33,6 +33,7 @@
             WHERE DOWN_CTR_NUM = #{item.downCenterNumber}
         </foreach>
     </update>
+
     <select id="selectMaxCode" resultType="java.lang.String">
         SELECT MAX(MTRL_CODE) FROM SPLY_ERP_MTRL
     </select>
@@ -41,7 +42,7 @@
         SELECT * FROM SPLY_ERP_MTRL WHERE MTRL_ID = #{erpMId}
     </select>
 
-    <select id="selectByErpMNumbers" resultType="java.lang.Integer">
+    <select id="countByErpMNumbers" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM sply_mtrl_oth
         WHERE ERP_MTRL_NUM IN