原材料增加物料长宽高属性

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp

@@ -143,6 +143,13 @@
                 <x:inputC name="mhdrz" label="最小货架寿命" labelCol="1" fieldCol="2"/>
                 <x:inputC name="normt" label="适用行业标准" labelCol="1" fieldCol="2"/>
 
+                <x:inputC name="length" label="长度cm" labelCol="1" fieldCol="2" mask="999999.9999"/>
+                <x:inputC name="widthCm" label="宽度cm" labelCol="1" fieldCol="2" mask="999999.9999"/>
+                <x:inputC name="thickness" label="厚度cm" labelCol="1" fieldCol="2" mask="999999.9999"/>
+                <x:inputC name="weight" label="克重g" labelCol="1" fieldCol="2" mask="999999.9999"/>
+                <x:inputC name="singleThickness" label="单层厚" labelCol="1" fieldCol="2" mask="999999.9999"/>
+
+
 
                     <x:inputC name="klart" label="类型" labelCol="1" fieldCol="2" readonly="true"/>
                     <x:inputC name="classify" label="分类" labelCol="1" fieldCol="2" readonly="true"/>

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -469,6 +469,22 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             url = "bd_mastdata/material02";
             busiType="产品主数据推送SAP";
         }
+
+        /**
+         * 封装EP BOM原材料信息
+         */
+        StringBuilder bomText = new StringBuilder();
+        bomText.append(applyDept.getLength())
+                .append(",")
+                .append(applyDept.getWidthCm())
+                .append(",")
+                .append(applyDept.getThickness())
+                .append(",")
+                .append(applyDept.getWeight())
+                .append(",")
+                .append(applyDept.getSingleThickness());
+        sapVO.setBomText(bomText.toString());
+
         List<ProdApplyToSapVO> mapList = new ArrayList<>();
         mapList.add(sapVO);
         //日志记录

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java

 package com.huigou.topsun.sap.nonProdApply.domain;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -969,5 +968,28 @@ public class SapNonProdApplyDept implements Serializable {
     @Transient
     private Date createdDate;
 
+    /**
+     *EP BOM原材料信息
+     */
+    //长度cm
+    @Column(name = "length")
+    private BigDecimal length;
+
+    //宽度cm
+    @Column(name = "width_cm")
+    private BigDecimal widthCm;
+
+    //厚度cm
+    @Column(name = "thickness")
+    private BigDecimal thickness;
+
+    //克重g
+    @Column(name = "weight")
+    private BigDecimal weight;
+
+    //单层厚
+    @Column(name = "single_thickness")
+    private BigDecimal singleThickness;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.nonProdApply.domain.vo;
 import lombok.Data;
 
 import javax.persistence.Column;
+import java.math.BigDecimal;
 
 @Data
 public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
@@ -662,4 +663,22 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
     //销售评估类
     private String eklas;
 
+    /**
+     *EP BOM原材料信息
+     */
+    //长度cm
+    private BigDecimal length;
+
+    //宽度cm
+    private BigDecimal widthCm;
+
+    //厚度cm
+    private BigDecimal thickness;
+
+    //克重g
+    private BigDecimal weight;
+
+    //单层厚
+    private BigDecimal singleThickness;
+
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyBomTextVo.java

+package com.huigou.topsun.sap.nonProdApply.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Auther: xin.lu
+ * @Date: 2024/09/05/15:43
+ * @Description:
+ */
+@Data
+public class ProdApplyBomTextVo implements Serializable {
+    /**
+     *EP BOM原材料信息
+     */
+    //长度cm
+    @JsonProperty("length")
+    private BigDecimal length;
+
+    //宽度cm
+    @JsonProperty("widthCm")
+    private BigDecimal widthCm;
+
+    //厚度cm
+    @JsonProperty("thickness")
+    private BigDecimal thickness;
+
+    //克重g
+    @JsonProperty("weight")
+    private BigDecimal weight;
+
+    //单层厚
+    @JsonProperty("singleThickness")
+    private BigDecimal singleThickness;
+}

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java

@@ -818,4 +818,7 @@ public class ProdApplyToSapVO {
     @JsonProperty("TMARM")
     private List<Map<String,Object>> mapList;
 
+    @JsonProperty("VOLUME")
+    private String bomText;
+
 }