rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

发布功能

This commit is contained in:
jing's 2023-12-08 23:06:04 +08:00
parent a99e3e5ab8
commit 07e18c2c54
13 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/OptionalEbomApi.java
View File

@ -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);

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomConfigListQuery.java
View File

@ -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;

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomImportChildQuery.java
View File

@ -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 查询显示 空全部")

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalEbomMainListQuery.java
View File

@ -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;

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/OptionalMbomMaterialListQuery.java
View File

@ -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;
/**
* 物料编码

19
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
View File

@ -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<String> r= ResultVO.success(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS"));
// return JSON.toJSONString(r);
}
}

2
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalEbomConfigService.java
View File

@ -99,7 +99,7 @@ public class OptionalEbomConfigService extends ServiceImpl<OptionalEbomConfigMap
optionalEbomConfigEntity.setParentRowId(dto.getRowId());
optionalEbomConfigEntity.setUpdatedTime(optionalEbomConfigEntity.getCreatedTime());
optionalEbomConfigEntity.setConfigNo(UUID.randomUUID().toString());
optionalEbomConfigEntity.setConfigNo(DateUtil.format(DateUtil.date(), "yyyyMMddHHmmssSSS"));
optionalEbomConfigEntity.setEditStatus(OptionalBomConstant.PublishEnum.TMP.getValue());
this.saveOrUpdate(optionalEbomConfigEntity);

59
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/aggreg/PublishMaterialService.java
View File

@ -92,7 +92,7 @@ public class PublishMaterialService {
//机械部分申请
genVirtualPackMachineLevel2(materialList, optionList, optionalEbomPublishAddDTO.getRowId(), parentId, optionalEbomPublishAddDTO.getMachineDesc());
boolean ok = optionalMbomMaterialService.saveOrUpdateBatch(materialList);
boolean ok = optionalMbomMaterialService.saveBatch(materialList);
if (ok) {
//物料数据保存更改状态
@ -141,8 +141,7 @@ public class PublishMaterialService {
try {
String data = materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
ResultVO<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
});
ResultVO<String> resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference<ResultVO<String>>(){});
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<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
});
ResultVO<String> resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference<ResultVO<String>>(){});
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<OptionalMbomCompareEntity> 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<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
});
ResultVO<String> resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference<ResultVO<String>>(){});
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<OptionalMbomCompareEntity>() {
}, 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<OptionalMbomCompareEntity>() {
// }, 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<OptionalMbomMaterialEntity>() {
@ -288,6 +285,7 @@ public class PublishMaterialService {
}
materialList.add(material);
List<OptionalMbomMaterialEntity> 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<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
});
ResultVO<String> resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference<ResultVO<String>>(){});
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<String> resultVO = JSON.parseObject(data, new TypeReference<ResultVO<String>>() {
});
ResultVO<String> resultVO = JSON.parseObject(data, new com.alibaba.fastjson.TypeReference<ResultVO<String>>(){});
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);
}
}

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml
View File

@ -42,8 +42,8 @@
</if>
<if test="query.startTime!= null and query.endTime != null">
<![CDATA[and created_time >= #{query.startTime} and created_time < #{query.endTime} ]]>
<if test="query.startDate!= null and query.endDate != null">
<![CDATA[and created_time >= #{query.startDate} and created_time < #{query.endDate} ]]>
</if>

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomImportChildMapper.xml
View File

@ -56,8 +56,8 @@ row_id,parent_row_id,root_row_id,material_no,material_name,material_desc,drawing
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
<![CDATA[ and created_time >= #{query.startTime} and created_time < #{query.endTime}]]>
<if test="query.startDate != null and query.startDate != '' and query.endDate != null and query.endDate != ''">
<![CDATA[ and created_time >= #{query.startDate} and created_time < #{query.endDate}]]>
</if>

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml
View File

@ -41,8 +41,8 @@
and dept_name like concat('%', '${query.deptName}', '%')
</if>
<if test="query.startTime != null and query.endTime != null">
<![CDATA[ and created_time >= #{query.startTime} and created_time < #{query.endTime}]]>
<if test="query.startDate != null and query.endDate != null">
<![CDATA[ and created_time >= #{query.startDate} and created_time < #{query.endDate}]]>
</if>

4
nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml
View File

@ -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}', '%')
</if>
<if test="query.startTime != null and query.endTime != null">
<![CDATA[ and t1.created_time >= #{query.startTime} and t1.created_time < #{query.endTime}]]>
<if test="query.startDate != null and query.endDate != null">
<![CDATA[ and t1.created_time >= #{query.startDate} and t1.created_time < #{query.endDate}]]>
</if>

16
nflg_project_dev/nflg-bom-new/src/test/java/com/nflg/product/bomnew/service/test/MaterialServiceTest.java
View File

@ -27,19 +27,15 @@ public class MaterialServiceTest {
@Test
public void addMaterialPublish() {
try {
String data = materialService.addMaterialPublish("33323", "物料名称1(发货)", "201101");
System.out.println(data);
// ResultVO<String> r = JSON.parseObject(data, new TypeReference<ResultVO<String>>(){});
<<<<<<< HEAD
System.out.println(data);
} catch (NflgBusinessException e) {
=======
String data = materialService.addMaterialPublish("", "好家伙名称2222234324(制作)", "201101");
System.out.println(data);
ResultVO<String> r = JSON.parseObject(data, new TypeReference<ResultVO<String>>(){});
System.out.println(r);
} catch (Exception e) {
>>>>>>> 3df3a2a782cdb1d2f7507543ba9e7f747f4b6821
e.getMessage();
} catch (IOException e) {
e.getMessage();
}
}