1,申请物料编码
This commit is contained in:
parent
9eed007bcd
commit
7f52eeb7d7
|
|
@ -21,7 +21,10 @@ import java.util.List;
|
|||
@Accessors(chain = true)
|
||||
@ApiModel(value="com-nflg-product-material-pojo-dto-MaterialMainEntityDTO")
|
||||
public class MaterialMainDTO implements Serializable {
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty(value = "行ID 雪花")
|
||||
private Long rowId;
|
||||
/**
|
||||
* 物料名称
|
||||
*/
|
||||
|
|
@ -90,7 +93,7 @@ public class MaterialMainDTO implements Serializable {
|
|||
|
||||
private String materialUnit="PC";
|
||||
|
||||
private Long rowId=0L;
|
||||
|
||||
|
||||
private String materialNo="";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package com.nflg.product.bomnew.service;
|
||||
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
|
|
@ -13,12 +14,14 @@ import com.nflg.product.bomnew.config.NacosConfig;
|
|||
import com.nflg.product.bomnew.pojo.dto.AddMaterialResultDTO;
|
||||
import com.nflg.product.bomnew.pojo.dto.MaterialMainDTO;
|
||||
import com.nflg.product.bomnew.util.HttpUtils;
|
||||
import com.nflg.product.bomnew.util.VUtils;
|
||||
import nflg.product.common.constant.STATE;
|
||||
import nflg.product.common.vo.ResultVO;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -41,12 +44,13 @@ public class MaterialService {
|
|||
MaterialMainDTO materialMainDTO = new MaterialMainDTO();
|
||||
materialMainDTO.setMaterialName(materialName);
|
||||
materialMainDTO.setDrawingNo(drawingNo);
|
||||
materialMainDTO.setMaterialDesc(StrUtil.join(" ", drawingNo, materialName));
|
||||
materialMainDTO.setMaterialDesc(StrUtil.join(" ", StrUtil.isNotBlank(drawingNo)?drawingNo:"" , StrUtil.isNotBlank(materialName)?materialName:"" ));
|
||||
materialMainDTO.setMaterialCategoryCode(materialCategoryCode);
|
||||
materialMainDTO.setOpEnum(1);
|
||||
materialMainDTO.setApplyDeptName("信息流程中心/IT支持");
|
||||
materialMainDTO.setRowId(IdWorker.getId());
|
||||
|
||||
// materialMainDTO.setApplyDeptName(SessionUtil.getDepartName());
|
||||
String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuemj-W7uuWNl-aWuei3r-mdouacuuaisOaciemZkOWFrOWPuFwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk1Njk0ODcyNzg0ODk3LFwiZnVsbERlcHROYW1lXCI6XCJPVT3npo_lu7rljZfmlrnot6_pnaLmnLrmorDmnInpmZDlhazlj7gsREM9bmZsZ1wiLFwicXVlcnlEYXRhXCI6MixcInJlYWxOYW1lXCI6XCJhZG1pblwiLFwicm93SWRcIjoxNTQ3NTEyOTc4MDE2OTE5NTUzLFwidXNlckNvZGVcIjpcImFkbWluXCIsXCJ1c2VyTmFtZVwiOlwiYWRtaW5cIn0iLCJleHAiOjE3MDIwNTI1MzEsImp0aSI6Ijc5NmU2MjZhLWJjYzUtNDY3ZS1iNjFjLWRmOGViNGY0MDYyOSJ9.iq2dyYKpGd7Z60Mmm9ef59CF1YrkG9KLaTGr9CrGsHI";
|
||||
String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySW5mbyI6IntcImRlcGFydE5hbWVcIjpcIuS_oeaBr-a1geeoi-S4reW_gy9JVOaUr-aMgVwiLFwiZGVwYXJ0Um93SWRcIjoxNTg1MTk2OTc4NDEzNjk0OTc4LFwiZnVsbERlcHROYW1lXCI6XCJPVT1JVOaUr-aMgSxPVT3kv6Hmga_mtYHnqIvkuK3lv4MsT1U956aP5bu65Y2X5pa56Lev6Z2i5py65qKw5pyJ6ZmQ5YWs5Y-4LERDPW5mbGdcIixcInF1ZXJ5RGF0YVwiOjMsXCJyZWFsTmFtZVwiOlwi6YOR5Yab5qaVXCIsXCJyb3dJZFwiOjE1ODUxNjQ2NjgzMzU0Mzk4ODEsXCJ1c2VyQ29kZVwiOlwiUUhJMTcwNjIxMDBcIixcInVzZXJOYW1lXCI6XCJRSEkxNzA2MjEwMFwifSIsImV4cCI6MTcwMjE0ODg1MCwianRpIjoiMzE3MDkxZGYtOTc2MS00ZTUxLWI2NzctOWNjZTE0MTkwOTFlIn0.yqaTXcch4hnegN1Z4G4q0hWtJ5cspp_I-uoIar3su8s";
|
||||
// String token=SessionUtil.getSessionKey();
|
||||
HttpUtils httpUtils = new HttpUtils();
|
||||
|
||||
|
|
@ -57,7 +61,7 @@ public class MaterialService {
|
|||
if(STATE.Success.getState().equals(result.getState()) ){
|
||||
return result.getData().toString();
|
||||
}
|
||||
|
||||
VUtils.isTure(true).throwMessage("申请物料失败"+result.getMsg());
|
||||
return s;
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue