From 07e18c2c5434530a9979f1eb00de6bc780520907 Mon Sep 17 00:00:00 2001 From: jing's Date: Fri, 8 Dec 2023 23:06:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bomnew/api/user/OptionalEbomApi.java | 6 ++ .../query/OptionalEbomConfigListQuery.java | 4 +- .../query/OptionalEbomImportChildQuery.java | 4 +- .../pojo/query/OptionalEbomMainListQuery.java | 4 +- .../query/OptionalMbomMaterialListQuery.java | 4 +- .../bomnew/service/MaterialService.java | 19 ++++-- .../service/OptionalEbomConfigService.java | 2 +- .../aggreg/PublishMaterialService.java | 59 +++++++++---------- .../master/OptionalEbomConfigMapper.xml | 4 +- .../master/OptionalEbomImportChildMapper.xml | 4 +- .../mapper/master/OptionalEbomMainMapper.xml | 4 +- .../master/OptionalMbomMaterialMapper.xml | 4 +- .../service/test/MaterialServiceTest.java | 16 ++--- 13 files changed, 72 insertions(+), 62 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java index 30472e4e..f69f90a0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java @@ -324,11 +324,17 @@ public class OptionalEbomApi extends BaseApi { } if(StrUtil.isEmpty(dto.getMachineDesc())){ return ResultVO.error("输入机械部分信息"); + }else{ + if(!dto.getMachineDesc().contains(" ")){ + return ResultVO.error("机械部分格式错误"); + } } if(StrUtil.isEmpty(dto.getElectricDesc())){ return ResultVO.error("输入电控制作/发货信息"); } + + return publishMaterialService.publishWork(dto); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java index b3d1f719..642a901b 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java @@ -23,11 +23,11 @@ public class OptionalEbomConfigListQuery extends BasePageQuery implements Ser @ApiModelProperty(value = "开始时间") - private Date startTime; + private Date startDate; @ApiModelProperty(value = "结束时间") - private Date endTime; + private Date endDate; //状态 private Integer editStatus; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomImportChildQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomImportChildQuery.java index bc22c613..d3aa9b5c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomImportChildQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomImportChildQuery.java @@ -42,12 +42,12 @@ public class OptionalEbomImportChildQuery implements Serializable { * 创建时间 */ @ApiModelProperty(value = "开始时间") - private String startTime; + private String startDate; /** * 变更时间 */ @ApiModelProperty(value = "结束时间") - private String endTime; + private String endDate; @ApiModelProperty(value = "0查询隐藏 1 查询显示 空全部") diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomMainListQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomMainListQuery.java index c3d9219f..157f4576 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomMainListQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomMainListQuery.java @@ -32,12 +32,12 @@ public class OptionalEbomMainListQuery extends BasePageQuery implements Serializ * 创建时间 */ @ApiModelProperty(value = "开始时间") - private String startTime; + private String startDate; /** * 变更时间 */ @ApiModelProperty(value = "结束时间") - private String endTime; + private String endDate; diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalMbomMaterialListQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalMbomMaterialListQuery.java index bf9865f0..b54e674a 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalMbomMaterialListQuery.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalMbomMaterialListQuery.java @@ -17,11 +17,11 @@ public class OptionalMbomMaterialListQuery extends BasePageQuery implements S @ApiModelProperty(value = "开始时间") - private Date startTime; + private Date startDate; @ApiModelProperty(value = "结束时间") - private Date endTime; + private Date endDate; /** * 物料编码 diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java index 0d0d1812..93edb7d5 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java @@ -2,6 +2,7 @@ package com.nflg.product.bomnew.service; import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -43,8 +44,9 @@ public class MaterialService { materialMainDTO.setMaterialDesc(StrUtil.join(" ", drawingNo, materialName)); materialMainDTO.setMaterialCategoryCode(materialCategoryCode); materialMainDTO.setOpEnum(1); - materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); - String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuS_oeaBr-a1geeoi-S4reW_gy9JVOaUr-aMgVwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk2OTc4NDEzNjk0OTc4LFwiZnVsbERlcHROYW1lXCI6XCJPVT1JVOaUr-aMgSxPVT3kv6Hmga_mtYHnqIvkuK3lv4MsT1U956aP5bu65Y2X5pa56Lev6Z2i5py65qKw5pyJ6ZmQ5YWs5Y-4LERDPW5mbGdcIixcInF1ZXJ5RGF0YVwiOjMsXCJyZWFsTmFtZVwiOlwi6YOR5Yab5qaVXCIsXCJyb3dJZFwiOjE1ODUxNjQ2NjgzMzU0Mzk4ODEsXCJ1c2VyQ29kZVwiOlwiUUhJMTcwNjIxMDBcIixcInVzZXJOYW1lXCI6XCJRSEkxNzA2MjEwMFwifSIsImV4cCI6MTcwMjAzMTg2MiwianRpIjoiMjdmMjg2MDUtNzgxZi00MDQwLWJkZDMtMzcwNGI2MWU1YzJiIn0.hpzLa9-ZYEqclA5iT-Jv62Ow3PduuP7Gqyvb7uYJcRE"; + materialMainDTO.setApplyDeptName("信息流程中心/IT支持"); + // materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); + String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI"; // String token=SessionUtil.getSessionKey(); HttpUtils httpUtils = new HttpUtils(); @@ -70,15 +72,22 @@ public class MaterialService { // materialMainDTO.setRowId(IdWorker.getId()); materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); - - // String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI"; - String token = SessionUtil.getSessionKey(); + // materialMainDTO.setApplyDeptName("福建南方路面机械有限公司"); + // String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI"; + String token = SessionUtil.getSessionKey(); HttpUtils httpUtils = new HttpUtils(); String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(), JSON.toJSONString(materialMainDTO), token); return s; + +// ResultVO r= ResultVO.success(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS")); +// return JSON.toJSONString(r); + + + + } } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java index 98d3bd2d..5ad44c48 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java @@ -99,7 +99,7 @@ public class OptionalEbomConfigService extends ServiceImpl resultVO = JSON.parseObject(data, new TypeReference>() { - }); + ResultVO resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference>(){}); if (resultVO == null) { throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败,联系管理员," + data); } @@ -173,8 +172,7 @@ public class PublishMaterialService { try { String data = materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory()); - ResultVO resultVO = JSON.parseObject(data, new TypeReference>() { - }); + ResultVO resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference>(){}); if (resultVO == null) { throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败,联系管理员," + data); } @@ -191,7 +189,7 @@ public class PublishMaterialService { throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败"); } - if (CollectionUtil.isNotEmpty(materialList)) { + if ( materialList!=null) { materialList.add(sendPack); materialList.add(makePack); } @@ -225,7 +223,7 @@ public class PublishMaterialService { String signMd5 = MD5.create().digestHex(result); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(OptionalMbomCompareEntity::getSignMd5, signMd5); - OptionalMbomCompareEntity optionalMbomCompareEntity = optionalMbomCompareService.getOne(queryWrapper); + OptionalMbomCompareEntity optionalMbomCompareEntity=null ;//= optionalMbomCompareService.getOne(queryWrapper); OptionalMbomMaterialEntity material; if (optionalMbomCompareEntity == null) { material = new OptionalMbomMaterialEntity(); @@ -243,8 +241,7 @@ public class PublishMaterialService { try { String data = materialService.addMaterialPublish(material.getDrawingNo(), material.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.MACHINE.getCategory()); - ResultVO resultVO = JSON.parseObject(data, new TypeReference>() { - }); + ResultVO resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference>(){}); if (resultVO == null) { throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败,联系管理员," + data); } @@ -257,21 +254,21 @@ public class PublishMaterialService { } - try { - //数据不存在保存 - if (StrUtil.isNotEmpty(material.getMaterialNo())) { - optionalMbomCompareEntity = Convert.convert(new TypeReference() { - }, material); - optionalMbomCompareEntity.setParentRowId(rootRowId); - optionalMbomCompareEntity.setSignMd5(signMd5); - optionalMbomCompareEntity.setCreatedTime(new Date()); - optionalMbomCompareEntity.setChildRowIds(result); - optionalMbomCompareService.save(optionalMbomCompareEntity); - } - - } catch (Exception e) { - e.printStackTrace(); - } +// try { +// //数据不存在保存 +// if (StrUtil.isNotEmpty(material.getMaterialNo())) { +// optionalMbomCompareEntity = Convert.convert(new TypeReference() { +// }, material); +// optionalMbomCompareEntity.setParentRowId(rootRowId); +// optionalMbomCompareEntity.setSignMd5(signMd5); +// optionalMbomCompareEntity.setCreatedTime(new Date()); +// optionalMbomCompareEntity.setChildRowIds(result); +// optionalMbomCompareService.save(optionalMbomCompareEntity); +// } +// +// } catch (Exception e) { +// e.printStackTrace(); +// } } else { //同物料号 material = Convert.convert(new TypeReference() { @@ -288,6 +285,7 @@ public class PublishMaterialService { } + materialList.add(material); List optionConvertList = Convert.toList(OptionalMbomMaterialEntity.class, optionList); optionConvertList.forEach(item -> { item.setCreatedBy(SessionUtil.getUserCode()); @@ -333,8 +331,7 @@ public class PublishMaterialService { try { String data = materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory()); - ResultVO resultVO = JSON.parseObject(data, new TypeReference>() { - }); + ResultVO resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference>(){}); if (resultVO == null) { throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败,联系管理员," + data); } @@ -364,8 +361,7 @@ public class PublishMaterialService { sendPack.setMaterialNo("");//申请物料号 try { String data = materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory()); - ResultVO resultVO = JSON.parseObject(data, new TypeReference>() { - }); + ResultVO resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference>(){}); if (resultVO == null) { throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败,联系管理员," + data); } @@ -380,8 +376,11 @@ public class PublishMaterialService { if (StrUtil.isEmpty(sendPack.getMaterialNo())) { throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败"); } - materialList.add(makePack); - materialList.add(sendPack); + if(materialList!=null){ + materialList.add(makePack); + materialList.add(sendPack); + } + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml index f42d610f..ef086f7f 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml @@ -42,8 +42,8 @@ - - = #{query.startTime} and created_time < #{query.endTime} ]]> + + = #{query.startDate} and created_time < #{query.endDate} ]]> diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml index 00c0e14e..a4765763 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml @@ -56,8 +56,8 @@ row_id,parent_row_id,root_row_id,material_no,material_name,material_desc,drawing - - = #{query.startTime} and created_time < #{query.endTime}]]> + + = #{query.startDate} and created_time < #{query.endDate}]]> diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml index cf78e9ae..80112d42 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml @@ -41,8 +41,8 @@ and dept_name like concat('%', '${query.deptName}', '%') - - = #{query.startTime} and created_time < #{query.endTime}]]> + + = #{query.startDate} and created_time < #{query.endDate}]]> diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml index 0af0fac7..ab52c828 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml @@ -70,8 +70,8 @@ row_id,parent_row_id,level_row_id,material_no,material_name,material_desc,drawin and t1.drawing_no like concat('%', '${query.drawingNo}', '%') - - = #{query.startTime} and t1.created_time < #{query.endTime}]]> + + = #{query.startDate} and t1.created_time < #{query.endDate}]]> diff --git a/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java b/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java index c5b809fd..67b0121a 100644 --- a/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java +++ b/nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java @@ -27,19 +27,15 @@ public class MaterialServiceTest { @Test public void addMaterialPublish() { try { - String data = materialService.addMaterialPublish("33323", "物料名称1(发货)", "201101"); - System.out.println(data); - // ResultVO r = JSON.parseObject(data, new TypeReference>(){}); -<<<<<<< HEAD - System.out.println(data); - } catch (NflgBusinessException e) { -======= + String data = materialService.addMaterialPublish("", "好家伙名称2222234324(制作)", "201101"); + System.out.println(data); + ResultVO r = JSON.parseObject(data, new TypeReference>(){}); + System.out.println(r); + } catch (Exception e) { ->>>>>>> 3df3a2a782cdb1d2f7507543ba9e7f747f4b6821 + e.getMessage(); - } catch (IOException e) { - e.getMessage(); } }