From b1b48097b7f436e00fbe409b4e40a3a263e407c5 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Thu, 17 Nov 2022 21:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kingdee/bdmaterial/BdMaterialService.java | 37 +++++++++++++++++++
 .../biz/kingdee/bdmaterial/data_model.json    |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

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<String, Object> 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<String, String> map_fEntityModel_ = createMapParams(stringObjectMap);
             ResultBean<String> stringResultBean = setMappingInfosParams(map_fEntityModel_, data,getKeyItems());
@@ -99,7 +118,25 @@ public class BdMaterialService extends FinKingDeeService {
         Map<String, Object> data = getStringObjectMap(bdMaterials);
         List<String> list_r=new ArrayList<>();
         for(BdMaterial b:bdMaterials) {
+            String fNumber = b.getFName();
             Map<String, Object> 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"
   },