获取登录token
This commit is contained in:
parent
f6ff56487f
commit
8bf84be97f
|
|
@ -61,8 +61,8 @@ public class MaterialService {
|
||||||
|
|
||||||
materialMainDTO.setApplyDeptName(SessionUtil.getDepartName());
|
materialMainDTO.setApplyDeptName(SessionUtil.getDepartName());
|
||||||
|
|
||||||
String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI";
|
// String token="eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI";
|
||||||
// String token=SessionUtil.getsessionKey();
|
String token=SessionUtil.getsessionKey();
|
||||||
HttpUtils httpUtils=new HttpUtils();
|
HttpUtils httpUtils=new HttpUtils();
|
||||||
|
|
||||||
String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(),JSON.toJSONString(materialMainDTO),token);
|
String s = httpUtils.doPost(NacosConfig.getNacosConfig().getAddMaterialUrl(),JSON.toJSONString(materialMainDTO),token);
|
||||||
|
|
|
||||||
|
|
@ -140,17 +140,18 @@ public class PublishMaterialService {
|
||||||
sendPack.setMaterialNo("");//申请物料号
|
sendPack.setMaterialNo("");//申请物料号
|
||||||
|
|
||||||
try {
|
try {
|
||||||
String data= materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
|
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 TypeReference<ResultVO<String>>() {
|
||||||
if(resultVO==null){
|
});
|
||||||
throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败,联系管理员,"+data);
|
if (resultVO == null) {
|
||||||
|
throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败,联系管理员," + data);
|
||||||
}
|
}
|
||||||
if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
|
if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
|
||||||
throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
|
throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
|
||||||
}
|
}
|
||||||
sendPack.setMaterialNo(resultVO.getData());
|
sendPack.setMaterialNo(resultVO.getData());
|
||||||
}catch (Exception e){
|
} catch (Exception e) {
|
||||||
throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败,"+e.getMessage());
|
throw new NflgBusinessException(STATE.Error, "机型发货物料编码申请失败," + e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StrUtil.isEmpty(sendPack.getMaterialNo())) {
|
if (StrUtil.isEmpty(sendPack.getMaterialNo())) {
|
||||||
|
|
@ -171,21 +172,21 @@ public class PublishMaterialService {
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
String data= materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
|
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 TypeReference<ResultVO<String>>() {
|
||||||
if(resultVO==null){
|
});
|
||||||
throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败,联系管理员,"+data);
|
if (resultVO == null) {
|
||||||
|
throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败,联系管理员," + data);
|
||||||
}
|
}
|
||||||
if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
|
if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
|
||||||
throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
|
throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
|
||||||
}
|
}
|
||||||
makePack.setMaterialNo(resultVO.getData());
|
makePack.setMaterialNo(resultVO.getData());
|
||||||
}catch (Exception e){
|
} catch (Exception e) {
|
||||||
throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败,"+e.getMessage());
|
throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败," + e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (StrUtil.isEmpty(makePack.getMaterialNo())) {
|
if (StrUtil.isEmpty(makePack.getMaterialNo())) {
|
||||||
throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败");
|
throw new NflgBusinessException(STATE.Error, "机型制作物料编码申请失败");
|
||||||
}
|
}
|
||||||
|
|
@ -228,8 +229,8 @@ public class PublishMaterialService {
|
||||||
OptionalMbomMaterialEntity material;
|
OptionalMbomMaterialEntity material;
|
||||||
if (optionalMbomCompareEntity == null) {
|
if (optionalMbomCompareEntity == null) {
|
||||||
material = new OptionalMbomMaterialEntity();
|
material = new OptionalMbomMaterialEntity();
|
||||||
//第一个空格位置图号
|
//第一个空格位置图号
|
||||||
String drawingNo = StrUtil.sub(desc,0,desc.indexOf(" ") );
|
String drawingNo = StrUtil.sub(desc, 0, desc.indexOf(" "));
|
||||||
material.setRowId(IdWorker.getId());
|
material.setRowId(IdWorker.getId());
|
||||||
material.setDrawingNo(drawingNo);
|
material.setDrawingNo(drawingNo);
|
||||||
material.setParentRowId(parentId);
|
material.setParentRowId(parentId);
|
||||||
|
|
@ -241,21 +242,21 @@ public class PublishMaterialService {
|
||||||
material.setMaterialNo("");//申请物料号
|
material.setMaterialNo("");//申请物料号
|
||||||
|
|
||||||
try {
|
try {
|
||||||
String data= materialService.addMaterialPublish(material.getDrawingNo(), material.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.MACHINE.getCategory());
|
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 TypeReference<ResultVO<String>>() {
|
||||||
if(resultVO==null){
|
});
|
||||||
throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败,联系管理员,"+data);
|
if (resultVO == null) {
|
||||||
|
throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败,联系管理员," + data);
|
||||||
}
|
}
|
||||||
if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
|
if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
|
||||||
throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
|
throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
|
||||||
}
|
}
|
||||||
material.setMaterialNo(resultVO.getData());
|
material.setMaterialNo(resultVO.getData());
|
||||||
}catch (Exception e){
|
} catch (Exception e) {
|
||||||
throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败,"+e.getMessage());
|
throw new NflgBusinessException(STATE.Error, "机械部分物料编码申请失败," + e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
//数据不存在保存
|
//数据不存在保存
|
||||||
if (StrUtil.isNotEmpty(material.getMaterialNo())) {
|
if (StrUtil.isNotEmpty(material.getMaterialNo())) {
|
||||||
|
|
@ -331,17 +332,18 @@ public class PublishMaterialService {
|
||||||
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
String data= materialService.addMaterialPublish("", makePack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
|
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 TypeReference<ResultVO<String>>() {
|
||||||
if(resultVO==null){
|
});
|
||||||
throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败,联系管理员,"+data);
|
if (resultVO == null) {
|
||||||
|
throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败,联系管理员," + data);
|
||||||
}
|
}
|
||||||
if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
|
if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
|
||||||
throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
|
throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
|
||||||
}
|
}
|
||||||
makePack.setMaterialNo(resultVO.getData());
|
makePack.setMaterialNo(resultVO.getData());
|
||||||
}catch (Exception e){
|
} catch (Exception e) {
|
||||||
throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败,"+e.getMessage());
|
throw new NflgBusinessException(STATE.Error, "电控制作物料编码申请失败," + e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -350,7 +352,6 @@ public class PublishMaterialService {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
OptionalMbomMaterialEntity sendPack = new OptionalMbomMaterialEntity();
|
OptionalMbomMaterialEntity sendPack = new OptionalMbomMaterialEntity();
|
||||||
String sendMaterialName = StrUtil.format("({})", desc).concat("(电控系统)").concat("(发货)");
|
String sendMaterialName = StrUtil.format("({})", desc).concat("(电控系统)").concat("(发货)");
|
||||||
sendPack.setRowId(IdWorker.getId());
|
sendPack.setRowId(IdWorker.getId());
|
||||||
|
|
@ -362,21 +363,22 @@ public class PublishMaterialService {
|
||||||
sendPack.setRootRowId(rootRowId);
|
sendPack.setRootRowId(rootRowId);
|
||||||
sendPack.setMaterialNo("");//申请物料号
|
sendPack.setMaterialNo("");//申请物料号
|
||||||
try {
|
try {
|
||||||
String data= materialService.addMaterialPublish("", sendPack.getMaterialName(), OptionalBomConstant.PublishMaterialEnum.OTHER.getCategory());
|
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 TypeReference<ResultVO<String>>() {
|
||||||
if(resultVO==null){
|
});
|
||||||
throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败,联系管理员,"+data);
|
if (resultVO == null) {
|
||||||
|
throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败,联系管理员," + data);
|
||||||
}
|
}
|
||||||
if(! Objects.equal(resultVO.getState() , STATE.Success.getState() )){
|
if (!Objects.equal(resultVO.getState(), STATE.Success.getState())) {
|
||||||
throw new NflgBusinessException(STATE.Error,resultVO.getMsg());
|
throw new NflgBusinessException(STATE.Error, resultVO.getMsg());
|
||||||
}
|
}
|
||||||
sendPack.setMaterialNo(resultVO.getData());
|
sendPack.setMaterialNo(resultVO.getData());
|
||||||
}catch (Exception e){
|
} catch (Exception e) {
|
||||||
throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败,"+e.getMessage());
|
throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败," + e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (StrUtil.isEmpty(sendPack.getMaterialNo())) {
|
if (StrUtil.isEmpty(sendPack.getMaterialNo())) {
|
||||||
throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败");
|
throw new NflgBusinessException(STATE.Error, "电控发货物料编码申请失败");
|
||||||
}
|
}
|
||||||
materialList.add(makePack);
|
materialList.add(makePack);
|
||||||
materialList.add(sendPack);
|
materialList.add(sendPack);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue