From 628801c013afa0063ad99b8899764251b075e3a7 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Tue, 14 Sep 2021 14:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/CustomFieldConstant.java  |  10 +-
 .../impl/ProdReadyTaskServiceImpl.java        |   2 +-
 .../mesnac/common/util/StringUtil.java        |   5 +-
 .../integration/dto/ItemSyncRequest.java      | 102 ++++++++----------
 .../service/impl/InterfaceServiceImpl.java    |  58 +++++-----
 5 files changed, 75 insertions(+), 102 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/CustomFieldConstant.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/CustomFieldConstant.java
index c0964796..6f3725dd 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/constant/CustomFieldConstant.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/CustomFieldConstant.java
@@ -52,11 +52,11 @@ public class CustomFieldConstant {
 
     //**************************************************************************************
     public static final String ITEM_ACCESSORY_TYPE = "ACCESSORY_TYPE";//辅料类型
-    public static final String ITEM_WEIGHT = "MAT_WEIGHT";
     public static final String ITEM_MAT_SPEC = "MAT_SPEC";//规格
-    public static final String ITEM_MODEL = "MODEL";//型号
-    public static final String ITEM_TEXTURE = "TEXTURE";//材质
-    public static final String ITEM_DRAWING = "DRAWING";//图号
-    public static final String ITEM_DRAWING_REVISION = "DRAWING_REVISION";//图号版本
+    public static final String ITEM_MODEL = "COMPONENT_TYPE";//组件类型
+    public static final String ITEM_TEXTTURE = "TEXTTURE";//材质
+    public static final String ITEM_DWG_NO = "DWG_NO";//图号
+    public static final String ITEM_PER_METER = "PER_METER";//每米重
+    public static final String ITEM_PER_SQUARE_METER = "PER_SQUARE_METER";//每平米重
 }
 
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index 51ee3f71..b57c5b3c 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -477,7 +477,7 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             labelPrintDto.setItemDescription(selectCurrent.getDescription());
             labelPrintDto.setSfc(prodReadyTask.getSfc());
             Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, prodReadyTask.getSfc()));
-            String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DRAWING_REVISION);
+            String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DWG_NO);
             labelPrintDto.setDrawingVersion(drawingRevision);
             labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
             String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_WORK_ORDER);
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java
index 4bcf1dfc..c58f3047 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/util/StringUtil.java
@@ -120,8 +120,9 @@ public class StringUtil
 	static public boolean isBlank(String str)
 	{
 		boolean isBlank = false;
-		if( str == null ) isBlank = true;
-		else if( str.trim().equals( "" ) ) isBlank = true;
+		if (str == null) isBlank = true;
+		else if (str.trim().equals("")) isBlank = true;
+		else if (str.equals("null")) isBlank = true;
 		return isBlank;
 	}
 
diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemSyncRequest.java b/integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemSyncRequest.java
index 582789c8..ad326e7a 100644
--- a/integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemSyncRequest.java
+++ b/integration/src/main/java/com/foreverwin/mesnac/integration/dto/ItemSyncRequest.java
@@ -1,9 +1,5 @@
 package com.foreverwin.mesnac.integration.dto;
 
-
-import com.sap.me.common.ItemType;
-import com.sap.me.common.MaterialType;
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -24,13 +20,12 @@ import javax.xml.bind.annotation.XmlType;
         "UNIT_OF_MEASURE",
         "ASSY_DATA_TYPE",
         "INV_ASSY_DATA_TYPE",
-        "INGRED_TYPE",
-        "WEIGHT",
+        "ACCESSORY_TYPE",
         "MAT_SPEC",
-        "MODEL",
-        "TEXTURE",
-        "DRAWING",
-        "DRAWING_REVISION"
+        "TEXTTURE",
+        "DWG_NO",
+        "PER_METER",
+        "PER_SQUARE_METER"
 })
 public class ItemSyncRequest {
 
@@ -72,27 +67,23 @@ public class ItemSyncRequest {
 
     @XmlElement(name = "INV_ASSY_DATA_TYPE")
     private String INV_ASSY_DATA_TYPE;
-    //辅料类型：0或者空则不是辅料，刀具-1，其他-9
-    @XmlElement(name = "INGRED_TYPE")
-    private String INGRED_TYPE;
-    //重量
-    @XmlElement(name = "WEIGHT")
-    private String WEIGHT;
+
+    //辅料类型：0或者空原材料，刀具1，主关件9，非主观件2
+    @XmlElement(name = "ACCESSORY_TYPE")
+    private String ACCESSORY_TYPE;
     //规格
     @XmlElement(name = "MAT_SPEC")
     private String MAT_SPEC;
-    //型号
-    @XmlElement(name = "MODEL")
-    private String MODEL;
     //材质
-    @XmlElement(name = "TEXTURE")
-    private String TEXTURE;
+    @XmlElement(name = "TEXTTURE")
+    private String TEXTTURE;
     //图号
-    @XmlElement(name = "DRAWING")
-    private String DRAWING;
-    //图号版本
-    @XmlElement(name = "DRAWING_REVISION")
-    private String DRAWING_REVISION;
+    @XmlElement(name = "DWG_NO")
+    private String DWG_NO;
+    @XmlElement(name = "PER_METER")
+    private String PER_METER;
+    @XmlElement(name = "PER_SQUARE_METER")
+    private String PER_SQUARE_METER;
 
     public String getTRANID() {
         return TRANID;
@@ -198,20 +189,12 @@ public class ItemSyncRequest {
         this.INV_ASSY_DATA_TYPE = INV_ASSY_DATA_TYPE;
     }
 
-    public String getINGRED_TYPE() {
-        return INGRED_TYPE;
-    }
-
-    public void setINGRED_TYPE(String INGRED_TYPE) {
-        this.INGRED_TYPE = INGRED_TYPE;
-    }
-
-    public String getWEIGHT() {
-        return WEIGHT;
+    public String getACCESSORY_TYPE() {
+        return ACCESSORY_TYPE;
     }
 
-    public void setWEIGHT(String WEIGHT) {
-        this.WEIGHT = WEIGHT;
+    public void setACCESSORY_TYPE(String ACCESSORY_TYPE) {
+        this.ACCESSORY_TYPE = ACCESSORY_TYPE;
     }
 
     public String getMAT_SPEC() {
@@ -222,36 +205,36 @@ public class ItemSyncRequest {
         this.MAT_SPEC = MAT_SPEC;
     }
 
-    public String getMODEL() {
-        return MODEL;
+    public String getTEXTTURE() {
+        return TEXTTURE;
     }
 
-    public void setMODEL(String MODEL) {
-        this.MODEL = MODEL;
+    public void setTEXTTURE(String TEXTTURE) {
+        this.TEXTTURE = TEXTTURE;
     }
 
-    public String getTEXTURE() {
-        return TEXTURE;
+    public String getDWG_NO() {
+        return DWG_NO;
     }
 
-    public void setTEXTURE(String TEXTURE) {
-        this.TEXTURE = TEXTURE;
+    public void setDWG_NO(String DWG_NO) {
+        this.DWG_NO = DWG_NO;
     }
 
-    public String getDRAWING() {
-        return DRAWING;
+    public String getPER_METER() {
+        return PER_METER;
     }
 
-    public void setDRAWING(String DRAWING) {
-        this.DRAWING = DRAWING;
+    public void setPER_METER(String PER_METER) {
+        this.PER_METER = PER_METER;
     }
 
-    public String getDRAWING_REVISION() {
-        return DRAWING_REVISION;
+    public String getPER_SQUARE_METER() {
+        return PER_SQUARE_METER;
     }
 
-    public void setDRAWING_REVISION(String DRAWING_REVISION) {
-        this.DRAWING_REVISION = DRAWING_REVISION;
+    public void setPER_SQUARE_METER(String PER_SQUARE_METER) {
+        this.PER_SQUARE_METER = PER_SQUARE_METER;
     }
 
     @Override
@@ -270,13 +253,12 @@ public class ItemSyncRequest {
                 ", UNIT_OF_MEASURE='" + UNIT_OF_MEASURE + '\'' +
                 ", ASSY_DATA_TYPE='" + ASSY_DATA_TYPE + '\'' +
                 ", INV_ASSY_DATA_TYPE='" + INV_ASSY_DATA_TYPE + '\'' +
-                ", INGRED_TYPE='" + INGRED_TYPE + '\'' +
-                ", WEIGHT='" + WEIGHT + '\'' +
+                ", ACCESSORY_TYPE='" + ACCESSORY_TYPE + '\'' +
                 ", MAT_SPEC='" + MAT_SPEC + '\'' +
-                ", MODEL='" + MODEL + '\'' +
-                ", TEXTURE='" + TEXTURE + '\'' +
-                ", DRAWING='" + DRAWING + '\'' +
-                ", DRAWING_REVISION='" + DRAWING_REVISION + '\'' +
+                ", TEXTTURE='" + TEXTTURE + '\'' +
+                ", DWG_NO='" + DWG_NO + '\'' +
+                ", PER_METER='" + PER_METER + '\'' +
+                ", PER_SOUARE_METER='" + PER_SQUARE_METER + '\'' +
                 '}';
     }
 }
diff --git a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java
index eb121243..c3b2dcac 100644
--- a/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java
+++ b/integration/src/main/java/com/foreverwin/mesnac/integration/service/impl/InterfaceServiceImpl.java
@@ -174,28 +174,18 @@ public class InterfaceServiceImpl implements InterfaceService {
 
         CustomFields customFields = null;
         //辅料类型：ACCESSORY_TYPE
-        String ingredType = itemSyncRequest.getINGRED_TYPE();
-        if (StringUtil.notBlank(ingredType)) {
+        String accessoryType = itemSyncRequest.getACCESSORY_TYPE();
+        if (StringUtil.notBlank(accessoryType)) {
             customFields = new CustomFields();
             customFields.setHandle(itemBo);
             customFields.setAttribute(CustomFieldConstant.ITEM_ACCESSORY_TYPE);
-            customFields.setValue(ingredType);
-            customFieldsList.add(customFields);
-        }
-
-        //重量
-        String weight = itemSyncRequest.getWEIGHT();
-        if (StringUtil.notBlank(ingredType)) {
-            customFields = new CustomFields();
-            customFields.setHandle(itemBo);
-            customFields.setAttribute(CustomFieldConstant.ITEM_WEIGHT);
-            customFields.setValue(weight);
+            customFields.setValue(accessoryType);
             customFieldsList.add(customFields);
         }
 
         //规格
         String spec = itemSyncRequest.getMAT_SPEC();
-        if (StringUtil.notBlank(ingredType)) {
+        if (StringUtil.notBlank(spec)) {
             customFields = new CustomFields();
             customFields.setHandle(itemBo);
             customFields.setAttribute(CustomFieldConstant.ITEM_MAT_SPEC);
@@ -203,43 +193,43 @@ public class InterfaceServiceImpl implements InterfaceService {
             customFieldsList.add(customFields);
         }
 
-        //型号
-        String model = itemSyncRequest.getMODEL();
-        if (StringUtil.notBlank(ingredType)) {
+        //材质
+        String texture = itemSyncRequest.getTEXTTURE();
+        if (StringUtil.notBlank(texture)) {
             customFields = new CustomFields();
             customFields.setHandle(itemBo);
-            customFields.setAttribute(CustomFieldConstant.ITEM_MODEL);
-            customFields.setValue(model);
+            customFields.setAttribute(CustomFieldConstant.ITEM_TEXTTURE);
+            customFields.setValue(texture);
             customFieldsList.add(customFields);
         }
 
-        //材质
-        String texture = itemSyncRequest.getTEXTURE();
-        if (StringUtil.notBlank(ingredType)) {
+        //图号
+        String drawing = itemSyncRequest.getDWG_NO();
+        if (StringUtil.notBlank(drawing)) {
             customFields = new CustomFields();
             customFields.setHandle(itemBo);
-            customFields.setAttribute(CustomFieldConstant.ITEM_TEXTURE);
-            customFields.setValue(texture);
+            customFields.setAttribute(CustomFieldConstant.ITEM_DWG_NO);
+            customFields.setValue(drawing);
             customFieldsList.add(customFields);
         }
 
-        //图号
-        String drawing = itemSyncRequest.getDRAWING();
-        if (StringUtil.notBlank(ingredType)) {
+        //每米重
+        String perMeter = itemSyncRequest.getPER_METER();
+        if (StringUtil.notBlank(perMeter)) {
             customFields = new CustomFields();
             customFields.setHandle(itemBo);
-            customFields.setAttribute(CustomFieldConstant.ITEM_DRAWING);
-            customFields.setValue(drawing);
+            customFields.setAttribute(CustomFieldConstant.ITEM_PER_METER);
+            customFields.setValue(perMeter);
             customFieldsList.add(customFields);
         }
 
-        //图号版本
-        String drawingRevision = itemSyncRequest.getDRAWING_REVISION();
-        if (StringUtil.notBlank(ingredType)) {
+        //每平米重
+        String perSquareMeter = itemSyncRequest.getPER_SQUARE_METER();
+        if (StringUtil.notBlank(perSquareMeter)) {
             customFields = new CustomFields();
             customFields.setHandle(itemBo);
-            customFields.setAttribute(CustomFieldConstant.ITEM_DRAWING_REVISION);
-            customFields.setValue(drawingRevision);
+            customFields.setAttribute(CustomFieldConstant.ITEM_PER_SQUARE_METER);
+            customFields.setValue(perSquareMeter);
             customFieldsList.add(customFields);
         }