From 150649ed65e5dbc61c0d21640de13408e9afec76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 26 Apr 2024 10:30:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=AF=BC=E5=85=A5sap?= =?UTF-8?q?=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nflg/product/bomnew/api/user/TestApi.java | 53 +++++++++++++++++++ .../dto/sap/impart2/ImportSapParamDTO.java | 4 +- .../service/BomNewEbomParentService.java | 12 +---- .../product/bomnew/service/DQBomService.java | 3 +- 4 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java new file mode 100644 index 00000000..3d90fa6a --- /dev/null +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/TestApi.java @@ -0,0 +1,53 @@ +package com.nflg.product.bomnew.api.user; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.RandomUtil; +import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; +import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO; +import com.nflg.product.bomnew.service.SapOpUtilService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import nflg.product.common.vo.ResultVO; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author 曹鹏飞 + * @date 2024/4/26 09:54:06 + */ +@Api(tags = "测试功能用的接口") +@RestController +@RequestMapping("test") +public class TestApi { + + @Resource + SapOpUtilService sapOpUtilService; + + @GetMapping("sap") + @ApiOperation("sap接口测试") + public ResultVO workDetailsListByPage() { + String dateYMD = DateUtil.format(new Date(), "yyyyMMdd"); + ImportSapParamDTO sapDto = new ImportSapParamDTO(); + sapDto.setZID(RandomUtil.randomNumbers(5)); + sapDto.setI_WERKS("1"); + sapDto.setI_STLAN("1"); + List t1s = new ArrayList<>(); + T1DTO t1 = new T1DTO(); + t1.setID(RandomUtil.randomNumbers(5)); + t1.setMATNR("2200022146"); + t1.setIDNRK("2100724596"); + t1.setMEINS("PC"); + t1.setMENGE("1.00"); + t1.setPOSTP("L"); + t1.setDATUM(dateYMD); + t1s.add(t1); + sapDto.setT1(t1s); + return sapOpUtilService.importToSapV2(sapDto, null); + } +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/ImportSapParamDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/ImportSapParamDTO.java index 1e9a95a2..ddfb7144 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/ImportSapParamDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/sap/impart2/ImportSapParamDTO.java @@ -13,10 +13,10 @@ import java.util.List; public class ImportSapParamDTO { @ApiModelProperty("流程标题，默认“主数据平台") - private String I_LCBT="主数据平台"; + private String I_LCBT = "主数据"; @ApiModelProperty("默认X") - private String I_ACT="X"; + private String I_ACT = "x"; private String ZID=""; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 8d57df1c..9d089bf7 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -934,19 +934,9 @@ public class BomNewEbomParentService extends ServiceImpl t1s = new ArrayList<>(); - T1DTO troot = new T1DTO(); - troot.setID(RandomUtil.randomNumbers(5)); - troot.setMATNR(""); - troot.setIDNRK(root.getMaterialNo()); - troot.setMEINS(root.getMaterialUnit()); - troot.setMENGE("1"); - troot.setPOSTP(""); - troot.setDATUM(dateYMD); - t1s.add(troot); buildChildrenForSap(root, t1s); sapDto.setT1(t1s); ResultVO resultVO = SpringUtil.getBean(SapOpUtilService.class).importToSapV2(sapDto, null); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java index 71fcd35d..4859629c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java @@ -365,9 +365,10 @@ public class DQBomService { VUtils.isTure(root.getSapState() == 3).throwMessage("已导入过了，请勿重复操作"); List datas = getAll(rootBomRowId); + datas.remove(0); ImportSapParamDTO sapDto = new ImportSapParamDTO(); sapDto.setZID(RandomUtil.randomNumbers(5)); - sapDto.setI_WERKS(FactoryCodeEnum.FACTORY_1010.getValue()); + sapDto.setI_WERKS("1"); sapDto.setI_STLAN("2"); List t1s = new ArrayList<>(); String dateYMD = DateUtil.format(new Date(), "yyyyMMdd");