From 47672c0f50a2c046c72a7be80ff283087e283418 Mon Sep 17 00:00:00 2001 From: "BF-202309241046\\Administrator" Date: Sun, 10 Dec 2023 11:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/entity/OptionalEbomConfigEntity.java | 5 -- .../entity/OptionalMbomCompareEntity.java | 2 +- .../entity/OptionalMbomMaterialEntity.java | 5 +- .../bomnew/service/MaterialService.java | 45 ++++++++------ .../service/OptionalEbomConfigService.java | 2 +- .../OptionalEbomImportChildService.java | 3 +- .../aggreg/PublishMaterialService.java | 58 ++++++++++--------- 7 files changed, 64 insertions(+), 56 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java index 510fc844..d9493707 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalEbomConfigEntity.java @@ -105,11 +105,6 @@ public class OptionalEbomConfigEntity implements Serializable { @ApiModelProperty(value = "创建时间") private String createdTime; - public String getCreatedTime(){ - - return DateUtil.now(); - - } /** * 变更时间 */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomCompareEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomCompareEntity.java index 4af0c78c..a3bef547 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomCompareEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomCompareEntity.java @@ -42,7 +42,7 @@ public class OptionalMbomCompareEntity implements Serializable { */ @TableField(value = "created_time") @ApiModelProperty(value = "创建时间") - private Date createdTime; + private String createdTime; /** * 物料编码 */ diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomMaterialEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomMaterialEntity.java index d57bd764..ae1c2855 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomMaterialEntity.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/OptionalMbomMaterialEntity.java @@ -4,6 +4,7 @@ package com.nflg.product.bomnew.pojo.entity; import java.math.BigDecimal; import java.time.LocalDateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.annotation.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -78,7 +79,9 @@ public class OptionalMbomMaterialEntity implements Serializable { */ @TableField(value = "created_time") @ApiModelProperty(value = "创建时间") - private Date createdTime; + private String createdTime; + + /** * 操作人编码 */ 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 06a9c977..45564e80 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 @@ -45,9 +45,9 @@ public class MaterialService { materialMainDTO.setMaterialName(materialName); materialMainDTO.setDrawingNo(drawingNo); - if(StrUtil.isEmpty(drawingNo)){ + if (StrUtil.isEmpty(drawingNo)) { materialMainDTO.setMaterialDesc(materialName); - }else { + } else { materialMainDTO.setMaterialDesc(StrUtil.join(" ", StrUtil.isNotBlank(drawingNo) ? drawingNo : "", StrUtil.isNotBlank(materialName) ? materialName : "")); } @@ -55,19 +55,28 @@ public class MaterialService { materialMainDTO.setOpEnum(1); materialMainDTO.setRowId(IdWorker.getId()); - // materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); - // String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIxNTQ4MjksImp0aSI6IjQ1YjFlYThlLWJjZjgtNDhlZi05M2M3LTg2ZGQwNjZiM2UzYSJ9.vxOgvTYgFqM3FPAY8fwWtULPeF10wiCWzLOxuoPLvbE"; - String token=SessionUtil.getSessionKey(); + // materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); + + + //测试用 生成编码 + // try { + // Thread.sleep(100); + // }catch (Exception e){ + // + // } + // String s=DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS"); + + HttpUtils httpUtils = new HttpUtils(); + // String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIxNTQ4MjksImp0aSI6IjQ1YjFlYThlLWJjZjgtNDhlZi05M2M3LTg2ZGQwNjZiM2UzYSJ9.vxOgvTYgFqM3FPAY8fwWtULPeF10wiCWzLOxuoPLvbE"; + String token = SessionUtil.getSessionKey(); + String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(), JSON.toJSONString(materialMainDTO), token); - - String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(),JSON.toJSONString(materialMainDTO),token); - - AddMaterialResultDTO result= JSON.parseObject(s,AddMaterialResultDTO.class); - if(STATE.Success.getState().equals(result.getState()) ){ - return result.getData().toString(); + AddMaterialResultDTO result = JSON.parseObject(s, AddMaterialResultDTO.class); + if (STATE.Success.getState().equals(result.getState())) { + return result.getData().toString(); } - VUtils.isTure(true).throwMessage("申请物料失败"+result.getMsg()); + VUtils.isTure(true).throwMessage("申请物料失败" + result.getMsg()); return s; } @@ -82,9 +91,9 @@ public class MaterialService { // materialMainDTO.setRowId(IdWorker.getId()); materialMainDTO.setApplyDeptName(SessionUtil.getDepartName()); - // materialMainDTO.setApplyDeptName("福建南方路面机械有限公司"); - // 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(); // String token=SessionUtil.getSessionKey(); // HttpUtils httpUtils = new HttpUtils(); @@ -93,10 +102,8 @@ public class MaterialService { // return s; - ResultVO r= ResultVO.success(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS")); - return JSON.toJSONString(r); - - + 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 c3f35d53..fef75eab 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 @@ -96,7 +96,7 @@ public class OptionalEbomConfigService extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(OptionalMbomCompareEntity::getSignMd5, signMd5); - OptionalMbomCompareEntity optionalMbomCompareEntity=null ;//= optionalMbomCompareService.getOne(queryWrapper); + OptionalMbomCompareEntity optionalMbomCompareEntity= optionalMbomCompareService.getOne(queryWrapper); OptionalMbomMaterialEntity material; if (optionalMbomCompareEntity == null) { material = new OptionalMbomMaterialEntity(); @@ -234,7 +236,7 @@ public class PublishMaterialService { material.setParentRowId(parentId); material.setRootRowId(rootRowId); material.setCreatedBy(SessionUtil.getUserCode()); - material.setCreatedTime(new Date()); + material.setCreatedTime(DateUtil.now()); material.setMaterialName(desc); material.setMaterialDesc(desc); material.setMaterialNo("");//申请物料号 @@ -250,25 +252,25 @@ public class PublishMaterialService { // } material.setMaterialNo(data); } catch (Exception e) { - throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败," + e.getMessage()); + throw new NflgBusinessException(STATE.Error, "机械部分," + e.getMessage()); } -// 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(DateUtil.now()); + optionalMbomCompareEntity.setChildRowIds(result); + optionalMbomCompareService.save(optionalMbomCompareEntity); + } + + } catch (Exception e) { + e.printStackTrace(); + } } else { //同物料号 material = Convert.convert(new TypeReference() { @@ -277,7 +279,7 @@ public class PublishMaterialService { material.setParentRowId(parentId); material.setRootRowId(rootRowId); material.setCreatedBy(SessionUtil.getUserCode()); - material.setCreatedTime(new Date()); + material.setCreatedTime(DateUtil.now()); } if (StrUtil.isEmpty(material.getMaterialNo())) { @@ -289,7 +291,7 @@ public class PublishMaterialService { List optionConvertList = Convert.toList(OptionalMbomMaterialEntity.class, optionList); optionConvertList.forEach(item -> { item.setCreatedBy(SessionUtil.getUserCode()); - item.setCreatedTime(new Date()); + item.setCreatedTime(DateUtil.now()); item.setRootRowId(rootRowId); item.setParentRowId(material.getRowId()); materialList.add(item); @@ -322,7 +324,7 @@ public class PublishMaterialService { makePack.setRowId(IdWorker.getId()); makePack.setParentRowId(parentId); makePack.setCreatedBy(SessionUtil.getUserCode()); - makePack.setCreatedTime(new Date()); + makePack.setCreatedTime(DateUtil.now()); makePack.setMaterialName(makeMaterialName); makePack.setMaterialDesc(makeMaterialName); makePack.setRootRowId(rootRowId); @@ -340,7 +342,7 @@ public class PublishMaterialService { // } makePack.setMaterialNo(data); } catch (Exception e) { - throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败," + e.getMessage()); + throw new NflgBusinessException(STATE.Error, "电控制作," + e.getMessage()); } @@ -354,7 +356,7 @@ public class PublishMaterialService { sendPack.setRowId(IdWorker.getId()); sendPack.setParentRowId(makePack.getRowId()); sendPack.setCreatedBy(SessionUtil.getUserCode()); - sendPack.setCreatedTime(new Date()); + sendPack.setCreatedTime(DateUtil.now()); sendPack.setMaterialName(sendMaterialName); sendPack.setMaterialDesc(sendMaterialName); sendPack.setRootRowId(rootRowId); @@ -370,7 +372,7 @@ public class PublishMaterialService { // } sendPack.setMaterialNo(data); } catch (Exception e) { - throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败," + e.getMessage()); + throw new NflgBusinessException(STATE.Error, "电控发货,"+e.getMessage()); } if (StrUtil.isEmpty(sendPack.getMaterialNo())) {