diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java index 96e7e87618..59c5d087d2 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/BdMaterialService.java @@ -49,6 +49,25 @@ public class BdMaterialService extends FinKingDeeService { for(BdMaterial b:bdMaterials) { //物料信息转map参数 Map stringObjectMap = BeanUtil.beanToMap(b); + String fName = b.getFName(); + String fNumber=b.getFName(); + if(StringUtils.isNotBlank(fNumber)&&fNumber.length()>2){ + String SZ = fNumber.substring(fNumber.length() - 2); + String G = fNumber.substring(fNumber.length() - 1); + if("SZ".equals(SZ)){ + String sz2 = fNumber.substring(0, fNumber.length() - 2); + fName=sz2+"上装"; + } + if("G".equals(G)){ + String g2 = fNumber.substring(0, fNumber.length() - 1); + fName=g2+"挂"; + } + }else{ + return rb.setMsg("物料名称填写不正确!"); + } + stringObjectMap.put("FNumber",fNumber); + stringObjectMap.put("FName",fName); + //业务表的主表数据集合 Map map_fEntityModel_ = createMapParams(stringObjectMap); ResultBean stringResultBean = setMappingInfosParams(map_fEntityModel_, data,getKeyItems()); @@ -99,7 +118,25 @@ public class BdMaterialService extends FinKingDeeService { Map data = getStringObjectMap(bdMaterials); List list_r=new ArrayList<>(); for(BdMaterial b:bdMaterials) { + String fNumber = b.getFName(); Map stringObjectMap = BeanUtil.beanToMap(b); + String fName=b.getFName(); + if(StringUtils.isNotBlank(fNumber)&&fNumber.length()>2){ + String SZ = fNumber.substring(fNumber.length() - 2); + String G = fNumber.substring(fNumber.length() - 1); + if("SZ".equals(SZ)){ + String sz2 = fNumber.substring(0, fNumber.length() - 2); + fName=sz2+"上装"; + } + if("G".equals(G)){ + String g2 = fNumber.substring(0, fNumber.length() - 1); + fName=g2+"挂"; + } + }else{ + return rb.setMsg("物料名称填写不正确!"); + } + stringObjectMap.put("FNumber",fNumber); + stringObjectMap.put("FName",fName); if(StringUtils.isBlank(b.getOldFName())){ return rb.setMsg("FMATERIALID不能为空"); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json index f765a8b552..b7ca2ad5ec 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_model.json @@ -4,7 +4,7 @@ "FCreateOrgId": { "FNumber": "100" }, - "FNumber": "@KD_FName", + "FNumber": "@KD_FNumber", "FUseOrgId": { "FNumber": "100" },