diff --git a/os-common/src/main/java/com/os/common/utils/DateUtils.java b/os-common/src/main/java/com/os/common/utils/DateUtils.java index 1d1a9cc..f521985 100644 --- a/os-common/src/main/java/com/os/common/utils/DateUtils.java +++ b/os-common/src/main/java/com/os/common/utils/DateUtils.java @@ -28,7 +28,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - private static String[] parsePatterns = { + public static String[] parsePatterns = { "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"}; diff --git a/os-mes/src/main/java/com/os/mes/api/controller/ERPPortController.java b/os-mes/src/main/java/com/os/mes/api/controller/ERPPortController.java index 52fd965..cf92c78 100644 --- a/os-mes/src/main/java/com/os/mes/api/controller/ERPPortController.java +++ b/os-mes/src/main/java/com/os/mes/api/controller/ERPPortController.java @@ -37,8 +37,7 @@ public class ERPPortController extends BaseController { paramDto.setActionName(String.valueOf(paramMap.get("ActionName"))); paramDto.setOrderStartTime(String.valueOf(paramMap.get("OrderStartTime"))); paramDto.setOrderEndTime(String.valueOf(paramMap.get("OrderEndTime"))); - String list = portService.getERPOrderData(paramDto); - return AjaxResult.success(list); + return AjaxResult.success(portService.getERPOrderData(paramDto)); } diff --git a/os-mes/src/main/java/com/os/mes/api/domain/RecordData.java b/os-mes/src/main/java/com/os/mes/api/domain/RecordData.java index 7a9e071..5856058 100644 --- a/os-mes/src/main/java/com/os/mes/api/domain/RecordData.java +++ b/os-mes/src/main/java/com/os/mes/api/domain/RecordData.java @@ -2,57 +2,58 @@ package com.os.mes.api.domain; import com.fasterxml.jackson.annotation.JsonProperty; +import java.math.BigDecimal; import java.util.HashMap; public class RecordData { /** 输送带宽度（mm）*/ @JsonProperty("BeltWidth") - private double BeltWidth; + private BigDecimal BeltWidth; /** 输送带布层 */ @JsonProperty("BeltClothLayer") - private int BeltClothLayer; + private Long BeltClothLayer; /** 客户要求输送带长度（m） */ @JsonProperty("BeltRequiredLength") - private double BeltRequiredLength; + private BigDecimal BeltRequiredLength; /** 客户要求上胶厚度（mm） */ @JsonProperty("GluingRequiredThickness") - private double GluingRequiredThickness; + private BigDecimal GluingRequiredThickness; /** 客户要求下胶厚度（mm） */ @JsonProperty("LowerGlueRequiredThickness") - private double LowerGlueRequiredThickness; + private BigDecimal LowerGlueRequiredThickness; /** 生产上胶厚度（mm） */ @JsonProperty("ProductionGluingThickness") - private double ProductionGluingThickness; + private BigDecimal ProductionGluingThickness; /** 上缓冲胶厚度（mm） */ @JsonProperty("UpperBufferAdhesiveThickness") - private double UpperBufferAdhesiveThickness; + private BigDecimal UpperBufferAdhesiveThickness; /** 生产下胶厚度（mm） */ @JsonProperty("ProductionLowerGlueThickness") - private double ProductionLowerGlueThickness; + private BigDecimal ProductionLowerGlueThickness; /** 下缓冲胶厚度（mm） */ @JsonProperty("LowerBufferAdhesiveThickness") - private double LowerBufferAdhesiveThickness; + private BigDecimal LowerBufferAdhesiveThickness; /** 布胶厚度 */ @JsonProperty("ClothGlueThickness") - private double ClothGlueThickness; + private BigDecimal ClothGlueThickness; /** 小布用布布层 */ @JsonProperty("SmallClothFabricLayer") - private double SmallClothFabricLayer; + private BigDecimal SmallClothFabricLayer; /** 小布布料厚度（mm） */ @JsonProperty("SmallClothThickness") - private double SmallClothThickness; + private BigDecimal SmallClothThickness; /** 是否需要每层加厚 */ @JsonProperty("IsNeedThicken") @@ -60,35 +61,35 @@ public class RecordData { /** 每层加厚厚度（mm） */ @JsonProperty("EachLayerThickenThickness") - private double EachLayerThickenThickness; + private BigDecimal EachLayerThickenThickness; /** 额外加厚厚度（mm） */ @JsonProperty("ExtraThickeningThickness") - private double ExtraThickeningThickness; + private BigDecimal ExtraThickeningThickness; /** 生产总厚度（mm） */ @JsonProperty("TotalProductionThickness") - private double TotalProductionThickness; + private BigDecimal TotalProductionThickness; /** 压延追加厚度 */ @JsonProperty("AdditionalThickness") - private double AdditionalThickness; + private BigDecimal AdditionalThickness; /** 推荐垫铁厚度（mm） */ @JsonProperty("RecommendedShimThickness") - private double RecommendedShimThickness; + private BigDecimal RecommendedShimThickness; /** 推荐半成品宽度（mm） */ @JsonProperty("SemiFinishedProductWidth") - private double SemiFinishedProductWidth; + private BigDecimal SemiFinishedProductWidth; /** 压延生产米数（m） */ @JsonProperty("RollingProductionMeters") - private double RollingProductionMeters; + private BigDecimal RollingProductionMeters; /** 推荐垫布宽度（mm） */ @JsonProperty("RecommendedPadWidth") - private double RecommendedPadWidth; + private BigDecimal RecommendedPadWidth; /** 大布厂家 */ @JsonProperty("BigFabricManufacturer") @@ -100,15 +101,15 @@ public class RecordData { /** 预计布料使用量（m） */ @JsonProperty("EstimatedFabricUsage") - private double EstimatedFabricUsage; + private BigDecimal EstimatedFabricUsage; /** 布宽度（mm） */ @JsonProperty("ClothWidth") - private double ClothWidth; + private BigDecimal ClothWidth; /** 布重量（kg） */ @JsonProperty("ClothWeight") - private double ClothWeight; + private BigDecimal ClothWeight; /** 小布使用布料规格 */ @JsonProperty("SmallFabricSpecificationsDic") @@ -116,15 +117,15 @@ public class RecordData { /** 小布宽度（mm） */ @JsonProperty("SmallClothWidth") - private double SmallClothWidth; + private BigDecimal SmallClothWidth; /** 小布布料使用量（m） */ @JsonProperty("SmallClothUsage") - private double SmallClothUsage; + private BigDecimal SmallClothUsage; /** 小布用布重量（kg） */ @JsonProperty("SmallClothWeight") - private double SmallClothWeight; + private BigDecimal SmallClothWeight; /** 用胶工艺 */ @JsonProperty("GluingProcess") @@ -136,11 +137,11 @@ public class RecordData { /** 上下胶系数 */ @JsonProperty("UpperLowerGlueCoefficient") - private double UpperLowerGlueCoefficient; + private BigDecimal UpperLowerGlueCoefficient; /** 上下胶标准用胶量（kg） */ @JsonProperty("UpperLowerGlueUsage") - private double UpperLowerGlueUsage; + private BigDecimal UpperLowerGlueUsage; /** 下胶使用胶料 */ @JsonProperty("LowerGlue") @@ -148,11 +149,11 @@ public class RecordData { /** 下胶系数 */ @JsonProperty("LowerGlueCoefficient") - private double LowerGlueCoefficient; + private BigDecimal LowerGlueCoefficient; /** 下胶标准用胶量（kg） */ @JsonProperty("LowerGlueUsage") - private double LowerGlueUsage; + private BigDecimal LowerGlueUsage; /** 大布胶使用胶料 */ @JsonProperty("LargeClothGlue") @@ -160,15 +161,15 @@ public class RecordData { /** 大布胶系数 */ @JsonProperty("LargeClothGlueCoefficient") - private double LargeClothGlueCoefficient; + private BigDecimal LargeClothGlueCoefficient; /** 胶布标准用胶量（kg） */ @JsonProperty("LargeClothGlueUsage") - private double LargeClothGlueUsage; + private BigDecimal LargeClothGlueUsage; /** 上下缓冲胶标准用胶量（kg） */ @JsonProperty("BufferGlueUsage") - private double BufferGlueUsage; + private BigDecimal BufferGlueUsage; /** 中间胶 */ @JsonProperty("MiddleGlue") @@ -176,67 +177,67 @@ public class RecordData { /** 中间胶系数 */ @JsonProperty("MiddleGlueCoefficient") - private double MiddleGlueCoefficient; + private BigDecimal MiddleGlueCoefficient; /** 中间胶使用量 */ @JsonProperty("MiddleGlueUsage") - private double MiddleGlueUsage; + private BigDecimal MiddleGlueUsage; /** 小条宽度 */ @JsonProperty("SmallBarWidth") - private double SmallBarWidth; + private BigDecimal SmallBarWidth; /** 小条厚度 */ @JsonProperty("SmallBarThickness") - private double SmallBarThickness; + private BigDecimal SmallBarThickness; /** 小条标准使用量（kg） */ @JsonProperty("SmallBarStandardUsage") - private double SmallBarStandardUsage; + private BigDecimal SmallBarStandardUsage; /** 成型面积 */ @JsonProperty("FormingArea") - private double FormingArea; + private BigDecimal FormingArea; /** 压延包胶面积 */ @JsonProperty("RollCoatingArea") - private double RollCoatingArea; + private BigDecimal RollCoatingArea; /** 压延出布面积 */ @JsonProperty("RolledFabricArea") - private double RolledFabricArea; + private BigDecimal RolledFabricArea; /** 硫化面积 */ @JsonProperty("SulfurizationArea") - private double SulfurizationArea; + private BigDecimal SulfurizationArea; /** 大布面积 */ @JsonProperty("LargeClothArea") - private double LargeClothArea; + private BigDecimal LargeClothArea; /** 小布面积 */ @JsonProperty("SmallClothArea") - private double SmallClothArea; + private BigDecimal SmallClothArea; /** 输送带总面积 */ @JsonProperty("BeltTotalArea") - private double BeltTotalArea; + private BigDecimal BeltTotalArea; /** 裙边面积 */ @JsonProperty("SkirtArea") - private double SkirtArea; + private BigDecimal SkirtArea; /** 隔板面积 */ @JsonProperty("PartitionArea") - private double PartitionArea; + private BigDecimal PartitionArea; /** 挡边带总面积 */ @JsonProperty("EdgeBandingTotalArea") - private double EdgeBandingTotalArea; + private BigDecimal EdgeBandingTotalArea; /** 钢丝绳输送带工资总面积 */ @JsonProperty("WireropeBeltTotalArea") - private double WireropeBeltTotalArea; + private BigDecimal WireropeBeltTotalArea; /** 下单日期 */ @JsonProperty("OrderDate") @@ -278,99 +279,99 @@ public class RecordData { @JsonProperty("UsingRawMaterials") private String UsingRawMaterials; - public double getBeltWidth() { + public BigDecimal getBeltWidth() { return BeltWidth; } - public void setBeltWidth(double beltWidth) { + public void setBeltWidth(BigDecimal beltWidth) { BeltWidth = beltWidth; } - public int getBeltClothLayer() { + public Long getBeltClothLayer() { return BeltClothLayer; } - public void setBeltClothLayer(int beltClothLayer) { + public void setBeltClothLayer(Long beltClothLayer) { BeltClothLayer = beltClothLayer; } - public double getBeltRequiredLength() { + public BigDecimal getBeltRequiredLength() { return BeltRequiredLength; } - public void setBeltRequiredLength(double beltRequiredLength) { + public void setBeltRequiredLength(BigDecimal beltRequiredLength) { BeltRequiredLength = beltRequiredLength; } - public double getGluingRequiredThickness() { + public BigDecimal getGluingRequiredThickness() { return GluingRequiredThickness; } - public void setGluingRequiredThickness(double gluingRequiredThickness) { + public void setGluingRequiredThickness(BigDecimal gluingRequiredThickness) { GluingRequiredThickness = gluingRequiredThickness; } - public double getLowerGlueRequiredThickness() { + public BigDecimal getLowerGlueRequiredThickness() { return LowerGlueRequiredThickness; } - public void setLowerGlueRequiredThickness(double lowerGlueRequiredThickness) { + public void setLowerGlueRequiredThickness(BigDecimal lowerGlueRequiredThickness) { LowerGlueRequiredThickness = lowerGlueRequiredThickness; } - public double getProductionGluingThickness() { + public BigDecimal getProductionGluingThickness() { return ProductionGluingThickness; } - public void setProductionGluingThickness(double productionGluingThickness) { + public void setProductionGluingThickness(BigDecimal productionGluingThickness) { ProductionGluingThickness = productionGluingThickness; } - public double getUpperBufferAdhesiveThickness() { + public BigDecimal getUpperBufferAdhesiveThickness() { return UpperBufferAdhesiveThickness; } - public void setUpperBufferAdhesiveThickness(double upperBufferAdhesiveThickness) { + public void setUpperBufferAdhesiveThickness(BigDecimal upperBufferAdhesiveThickness) { UpperBufferAdhesiveThickness = upperBufferAdhesiveThickness; } - public double getProductionLowerGlueThickness() { + public BigDecimal getProductionLowerGlueThickness() { return ProductionLowerGlueThickness; } - public void setProductionLowerGlueThickness(double productionLowerGlueThickness) { + public void setProductionLowerGlueThickness(BigDecimal productionLowerGlueThickness) { ProductionLowerGlueThickness = productionLowerGlueThickness; } - public double getLowerBufferAdhesiveThickness() { + public BigDecimal getLowerBufferAdhesiveThickness() { return LowerBufferAdhesiveThickness; } - public void setLowerBufferAdhesiveThickness(double lowerBufferAdhesiveThickness) { + public void setLowerBufferAdhesiveThickness(BigDecimal lowerBufferAdhesiveThickness) { LowerBufferAdhesiveThickness = lowerBufferAdhesiveThickness; } - public double getClothGlueThickness() { + public BigDecimal getClothGlueThickness() { return ClothGlueThickness; } - public void setClothGlueThickness(double clothGlueThickness) { + public void setClothGlueThickness(BigDecimal clothGlueThickness) { ClothGlueThickness = clothGlueThickness; } - public double getSmallClothFabricLayer() { + public BigDecimal getSmallClothFabricLayer() { return SmallClothFabricLayer; } - public void setSmallClothFabricLayer(double smallClothFabricLayer) { + public void setSmallClothFabricLayer(BigDecimal smallClothFabricLayer) { SmallClothFabricLayer = smallClothFabricLayer; } - public double getSmallClothThickness() { + public BigDecimal getSmallClothThickness() { return SmallClothThickness; } - public void setSmallClothThickness(double smallClothThickness) { + public void setSmallClothThickness(BigDecimal smallClothThickness) { SmallClothThickness = smallClothThickness; } @@ -382,67 +383,67 @@ public class RecordData { IsNeedThicken = isNeedThicken; } - public double getEachLayerThickenThickness() { + public BigDecimal getEachLayerThickenThickness() { return EachLayerThickenThickness; } - public void setEachLayerThickenThickness(double eachLayerThickenThickness) { + public void setEachLayerThickenThickness(BigDecimal eachLayerThickenThickness) { EachLayerThickenThickness = eachLayerThickenThickness; } - public double getExtraThickeningThickness() { + public BigDecimal getExtraThickeningThickness() { return ExtraThickeningThickness; } - public void setExtraThickeningThickness(double extraThickeningThickness) { + public void setExtraThickeningThickness(BigDecimal extraThickeningThickness) { ExtraThickeningThickness = extraThickeningThickness; } - public double getTotalProductionThickness() { + public BigDecimal getTotalProductionThickness() { return TotalProductionThickness; } - public void setTotalProductionThickness(double totalProductionThickness) { + public void setTotalProductionThickness(BigDecimal totalProductionThickness) { TotalProductionThickness = totalProductionThickness; } - public double getAdditionalThickness() { + public BigDecimal getAdditionalThickness() { return AdditionalThickness; } - public void setAdditionalThickness(double additionalThickness) { + public void setAdditionalThickness(BigDecimal additionalThickness) { AdditionalThickness = additionalThickness; } - public double getRecommendedShimThickness() { + public BigDecimal getRecommendedShimThickness() { return RecommendedShimThickness; } - public void setRecommendedShimThickness(double recommendedShimThickness) { + public void setRecommendedShimThickness(BigDecimal recommendedShimThickness) { RecommendedShimThickness = recommendedShimThickness; } - public double getSemiFinishedProductWidth() { + public BigDecimal getSemiFinishedProductWidth() { return SemiFinishedProductWidth; } - public void setSemiFinishedProductWidth(double semiFinishedProductWidth) { + public void setSemiFinishedProductWidth(BigDecimal semiFinishedProductWidth) { SemiFinishedProductWidth = semiFinishedProductWidth; } - public double getRollingProductionMeters() { + public BigDecimal getRollingProductionMeters() { return RollingProductionMeters; } - public void setRollingProductionMeters(double rollingProductionMeters) { + public void setRollingProductionMeters(BigDecimal rollingProductionMeters) { RollingProductionMeters = rollingProductionMeters; } - public double getRecommendedPadWidth() { + public BigDecimal getRecommendedPadWidth() { return RecommendedPadWidth; } - public void setRecommendedPadWidth(double recommendedPadWidth) { + public void setRecommendedPadWidth(BigDecimal recommendedPadWidth) { RecommendedPadWidth = recommendedPadWidth; } @@ -462,27 +463,27 @@ public class RecordData { FabricSpecifications = fabricSpecifications; } - public double getEstimatedFabricUsage() { + public BigDecimal getEstimatedFabricUsage() { return EstimatedFabricUsage; } - public void setEstimatedFabricUsage(double estimatedFabricUsage) { + public void setEstimatedFabricUsage(BigDecimal estimatedFabricUsage) { EstimatedFabricUsage = estimatedFabricUsage; } - public double getClothWidth() { + public BigDecimal getClothWidth() { return ClothWidth; } - public void setClothWidth(double clothWidth) { + public void setClothWidth(BigDecimal clothWidth) { ClothWidth = clothWidth; } - public double getClothWeight() { + public BigDecimal getClothWeight() { return ClothWeight; } - public void setClothWeight(double clothWeight) { + public void setClothWeight(BigDecimal clothWeight) { ClothWeight = clothWeight; } @@ -494,27 +495,27 @@ public class RecordData { SmallFabricSpecificationsDic = smallFabricSpecificationsDic; } - public double getSmallClothWidth() { + public BigDecimal getSmallClothWidth() { return SmallClothWidth; } - public void setSmallClothWidth(double smallClothWidth) { + public void setSmallClothWidth(BigDecimal smallClothWidth) { SmallClothWidth = smallClothWidth; } - public double getSmallClothUsage() { + public BigDecimal getSmallClothUsage() { return SmallClothUsage; } - public void setSmallClothUsage(double smallClothUsage) { + public void setSmallClothUsage(BigDecimal smallClothUsage) { SmallClothUsage = smallClothUsage; } - public double getSmallClothWeight() { + public BigDecimal getSmallClothWeight() { return SmallClothWeight; } - public void setSmallClothWeight(double smallClothWeight) { + public void setSmallClothWeight(BigDecimal smallClothWeight) { SmallClothWeight = smallClothWeight; } @@ -534,19 +535,19 @@ public class RecordData { UpperLowerGlue = upperLowerGlue; } - public double getUpperLowerGlueCoefficient() { + public BigDecimal getUpperLowerGlueCoefficient() { return UpperLowerGlueCoefficient; } - public void setUpperLowerGlueCoefficient(double upperLowerGlueCoefficient) { + public void setUpperLowerGlueCoefficient(BigDecimal upperLowerGlueCoefficient) { UpperLowerGlueCoefficient = upperLowerGlueCoefficient; } - public double getUpperLowerGlueUsage() { + public BigDecimal getUpperLowerGlueUsage() { return UpperLowerGlueUsage; } - public void setUpperLowerGlueUsage(double upperLowerGlueUsage) { + public void setUpperLowerGlueUsage(BigDecimal upperLowerGlueUsage) { UpperLowerGlueUsage = upperLowerGlueUsage; } @@ -558,19 +559,19 @@ public class RecordData { LowerGlue = lowerGlue; } - public double getLowerGlueCoefficient() { + public BigDecimal getLowerGlueCoefficient() { return LowerGlueCoefficient; } - public void setLowerGlueCoefficient(double lowerGlueCoefficient) { + public void setLowerGlueCoefficient(BigDecimal lowerGlueCoefficient) { LowerGlueCoefficient = lowerGlueCoefficient; } - public double getLowerGlueUsage() { + public BigDecimal getLowerGlueUsage() { return LowerGlueUsage; } - public void setLowerGlueUsage(double lowerGlueUsage) { + public void setLowerGlueUsage(BigDecimal lowerGlueUsage) { LowerGlueUsage = lowerGlueUsage; } @@ -582,27 +583,27 @@ public class RecordData { LargeClothGlue = largeClothGlue; } - public double getLargeClothGlueCoefficient() { + public BigDecimal getLargeClothGlueCoefficient() { return LargeClothGlueCoefficient; } - public void setLargeClothGlueCoefficient(double largeClothGlueCoefficient) { + public void setLargeClothGlueCoefficient(BigDecimal largeClothGlueCoefficient) { LargeClothGlueCoefficient = largeClothGlueCoefficient; } - public double getLargeClothGlueUsage() { + public BigDecimal getLargeClothGlueUsage() { return LargeClothGlueUsage; } - public void setLargeClothGlueUsage(double largeClothGlueUsage) { + public void setLargeClothGlueUsage(BigDecimal largeClothGlueUsage) { LargeClothGlueUsage = largeClothGlueUsage; } - public double getBufferGlueUsage() { + public BigDecimal getBufferGlueUsage() { return BufferGlueUsage; } - public void setBufferGlueUsage(double bufferGlueUsage) { + public void setBufferGlueUsage(BigDecimal bufferGlueUsage) { BufferGlueUsage = bufferGlueUsage; } @@ -614,131 +615,131 @@ public class RecordData { MiddleGlue = middleGlue; } - public double getMiddleGlueCoefficient() { + public BigDecimal getMiddleGlueCoefficient() { return MiddleGlueCoefficient; } - public void setMiddleGlueCoefficient(double middleGlueCoefficient) { + public void setMiddleGlueCoefficient(BigDecimal middleGlueCoefficient) { MiddleGlueCoefficient = middleGlueCoefficient; } - public double getMiddleGlueUsage() { + public BigDecimal getMiddleGlueUsage() { return MiddleGlueUsage; } - public void setMiddleGlueUsage(double middleGlueUsage) { + public void setMiddleGlueUsage(BigDecimal middleGlueUsage) { MiddleGlueUsage = middleGlueUsage; } - public double getSmallBarWidth() { + public BigDecimal getSmallBarWidth() { return SmallBarWidth; } - public void setSmallBarWidth(double smallBarWidth) { + public void setSmallBarWidth(BigDecimal smallBarWidth) { SmallBarWidth = smallBarWidth; } - public double getSmallBarThickness() { + public BigDecimal getSmallBarThickness() { return SmallBarThickness; } - public void setSmallBarThickness(double smallBarThickness) { + public void setSmallBarThickness(BigDecimal smallBarThickness) { SmallBarThickness = smallBarThickness; } - public double getSmallBarStandardUsage() { + public BigDecimal getSmallBarStandardUsage() { return SmallBarStandardUsage; } - public void setSmallBarStandardUsage(double smallBarStandardUsage) { + public void setSmallBarStandardUsage(BigDecimal smallBarStandardUsage) { SmallBarStandardUsage = smallBarStandardUsage; } - public double getFormingArea() { + public BigDecimal getFormingArea() { return FormingArea; } - public void setFormingArea(double formingArea) { + public void setFormingArea(BigDecimal formingArea) { FormingArea = formingArea; } - public double getRollCoatingArea() { + public BigDecimal getRollCoatingArea() { return RollCoatingArea; } - public void setRollCoatingArea(double rollCoatingArea) { + public void setRollCoatingArea(BigDecimal rollCoatingArea) { RollCoatingArea = rollCoatingArea; } - public double getRolledFabricArea() { + public BigDecimal getRolledFabricArea() { return RolledFabricArea; } - public void setRolledFabricArea(double rolledFabricArea) { + public void setRolledFabricArea(BigDecimal rolledFabricArea) { RolledFabricArea = rolledFabricArea; } - public double getSulfurizationArea() { + public BigDecimal getSulfurizationArea() { return SulfurizationArea; } - public void setSulfurizationArea(double sulfurizationArea) { + public void setSulfurizationArea(BigDecimal sulfurizationArea) { SulfurizationArea = sulfurizationArea; } - public double getLargeClothArea() { + public BigDecimal getLargeClothArea() { return LargeClothArea; } - public void setLargeClothArea(double largeClothArea) { + public void setLargeClothArea(BigDecimal largeClothArea) { LargeClothArea = largeClothArea; } - public double getSmallClothArea() { + public BigDecimal getSmallClothArea() { return SmallClothArea; } - public void setSmallClothArea(double smallClothArea) { + public void setSmallClothArea(BigDecimal smallClothArea) { SmallClothArea = smallClothArea; } - public double getBeltTotalArea() { + public BigDecimal getBeltTotalArea() { return BeltTotalArea; } - public void setBeltTotalArea(double beltTotalArea) { + public void setBeltTotalArea(BigDecimal beltTotalArea) { BeltTotalArea = beltTotalArea; } - public double getSkirtArea() { + public BigDecimal getSkirtArea() { return SkirtArea; } - public void setSkirtArea(double skirtArea) { + public void setSkirtArea(BigDecimal skirtArea) { SkirtArea = skirtArea; } - public double getPartitionArea() { + public BigDecimal getPartitionArea() { return PartitionArea; } - public void setPartitionArea(double partitionArea) { + public void setPartitionArea(BigDecimal partitionArea) { PartitionArea = partitionArea; } - public double getEdgeBandingTotalArea() { + public BigDecimal getEdgeBandingTotalArea() { return EdgeBandingTotalArea; } - public void setEdgeBandingTotalArea(double edgeBandingTotalArea) { + public void setEdgeBandingTotalArea(BigDecimal edgeBandingTotalArea) { EdgeBandingTotalArea = edgeBandingTotalArea; } - public double getWireropeBeltTotalArea() { + public BigDecimal getWireropeBeltTotalArea() { return WireropeBeltTotalArea; } - public void setWireropeBeltTotalArea(double wireropeBeltTotalArea) { + public void setWireropeBeltTotalArea(BigDecimal wireropeBeltTotalArea) { WireropeBeltTotalArea = wireropeBeltTotalArea; } diff --git a/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlue.java b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlue.java index cc17002..d758e54 100644 --- a/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlue.java +++ b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlue.java @@ -4,6 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +/** + * 上下胶使用胶料 + */ public class UpperLowerGlue { /** diff --git a/os-mes/src/main/java/com/os/mes/api/service/IERPPortService.java b/os-mes/src/main/java/com/os/mes/api/service/IERPPortService.java index bff7954..0a2db15 100644 --- a/os-mes/src/main/java/com/os/mes/api/service/IERPPortService.java +++ b/os-mes/src/main/java/com/os/mes/api/service/IERPPortService.java @@ -2,6 +2,7 @@ package com.os.mes.api.service; import com.os.mes.api.domain.ERPParamDto; +import com.os.mes.prod.domain.ProdOrderDetail; import java.util.List; @@ -19,6 +20,6 @@ public interface IERPPortService { * @param paramDto * @return */ - String getERPOrderData(ERPParamDto paramDto); + List getERPOrderData(ERPParamDto paramDto); } diff --git a/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java b/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java index a604e6b..eda0098 100644 --- a/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java @@ -4,12 +4,22 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.os.mes.api.domain.ERPParamDto; +import com.os.mes.api.domain.RecordData; import com.os.mes.api.domain.ResponseData; import com.os.mes.api.service.IERPPortService; import com.os.mes.api.utils.ApiUtils; import com.os.mes.api.utils.ERPConstants; +import com.os.mes.prod.domain.ProdOrderDetail; +import com.os.mes.prod.service.IProdOrderInfoService; +import com.os.mes.prod.service.impl.ProdOrderInfoServiceImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + /** * ERP接口Service业务层处理 @@ -19,15 +29,20 @@ import org.springframework.stereotype.Service; */ @Service public class ERPPortServiceImpl implements IERPPortService { + private static final Logger logger = LoggerFactory.getLogger(ERPPortServiceImpl.class); + @Autowired + private IProdOrderInfoService orderInfoService; /** * 获取ERP订单接口 + * * @param paramDto * @return */ @Override - public String getERPOrderData(ERPParamDto paramDto) { + public List getERPOrderData(ERPParamDto paramDto) { + List resultList = new ArrayList<>(); String requestParam = null; String result = null; try { @@ -35,21 +50,26 @@ public class ERPPortServiceImpl implements IERPPortService { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE); requestParam = objectMapper.writeValueAsString(paramDto); -// result = ApiUtils.sendERPHttpPost(ERPConstants.ERP_URL, requestParam); - result = "{\"Successful\":true,\"ErrorMessage\":null,\"Logined\":false,\"ReturnData\":{\"totle\":3,\"data\":[{\"BeltWidth\":1600,\"BeltClothLayer\":5,\"BeltRequiredLength\":250,\"GluingRequiredThickness\":6,\"LowerGlueRequiredThickness\":2,\"ProductionGluingThickness\":4.5,\"UpperBufferAdhesiveThickness\":1.5,\"ProductionLowerGlueThickness\":1.2,\"LowerBufferAdhesiveThickness\":0.8,\"ClothGlueThickness\":1.3,\"SmallClothFabricLayer\":0,\"SmallClothThickness\":0,\"IsNeedThicken\":\"否\",\"EachLayerThickenThickness\":0,\"ExtraThickeningThickness\":0,\"TotalProductionThickness\":14.5,\"AdditionalThickness\":0.5,\"RecommendedShimThickness\":13.5,\"SemiFinishedProductWidth\":1560,\"RollingProductionMeters\":251.8,\"RecommendedPadWidth\":1794,\"BigFabricManufacturer\":\"安徽旌德\",\"FabricSpecifications\":{\"MaterialNo\":\"WLFB0066\",\"MaterialName\":\"EE300N\",\"MaterialSpecification\":\"EE300N\",\"MaterialLargeCategories\":\"帆布类\",\"MaterialSmallCategories\":\"EE-N轻型浸胶帆布\"},\"EstimatedFabricUsage\":1259,\"ClothWidth\":1600,\"ClothWeight\":1752.528,\"SmallFabricSpecificationsDic\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"SmallClothWidth\":1300,\"SmallClothUsage\":0,\"SmallClothWeight\":0,\"GluingProcess\":\"双胶\",\"UpperLowerGlue\":{\"MaterialList_1\":[{\"MaterialNo\":\"WLXJ0008\",\"Material\":{\"MaterialNo\":\"WLXJ0008\",\"MaterialName\":\"天然胶\",\"MaterialSpecification\":\"天然胶\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"天然橡胶\"},\"EnterSecondLaneWeight\":47.6607},{\"MaterialNo\":\"WLXJ0011\",\"Material\":{\"MaterialNo\":\"WLXJ0011\",\"MaterialName\":\"丁苯-1502\",\"MaterialSpecification\":\"SBR1502\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"丁苯橡胶\"},\"EnterSecondLaneWeight\":27.1485},{\"MaterialNo\":\"WLXJ0005\",\"Material\":{\"MaterialNo\":\"WLXJ0005\",\"MaterialName\":\"顺丁橡胶BR9000\",\"MaterialSpecification\":\"BR9000\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"顺丁橡胶\"},\"EnterSecondLaneWeight\":21.1155},{\"MaterialNo\":\"WLXJ0004\",\"Material\":{\"MaterialNo\":\"WLXJ0004\",\"MaterialName\":\"普通母胶9\",\"MaterialSpecification\":\"普通母胶9\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"再生胶\"},\"EnterSecondLaneWeight\":27.1485},{\"MaterialNo\":\"XJZJ0029\",\"Material\":{\"MaterialNo\":\"XJZJ0029\",\"MaterialName\":\"氧化锌\",\"MaterialSpecification\":\"氧化锌\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":3.837},{\"MaterialNo\":\"XJZJ0028\",\"Material\":{\"MaterialNo\":\"XJZJ0028\",\"MaterialName\":\"硬脂酸\",\"MaterialSpecification\":\"硬脂酸\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"硫化活性剂\"},\"EnterSecondLaneWeight\":2.4132},{\"MaterialNo\":\"XJZJ0082\",\"Material\":{\"MaterialNo\":\"XJZJ0082\",\"MaterialName\":\"橡胶防老剂RD(TMQ)\",\"MaterialSpecification\":\"防老剂RD(TMQ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":1.9185},{\"MaterialNo\":\"XJZJ0092\",\"Material\":{\"MaterialNo\":\"XJZJ0092\",\"MaterialName\":\"L-6023橡胶特种防护蜡\",\"MaterialSpecification\":\"L-6023\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"固体蜡\"},\"EnterSecondLaneWeight\":1.9306},{\"MaterialNo\":\"XJZJ0031\",\"Material\":{\"MaterialNo\":\"XJZJ0031\",\"MaterialName\":\"古马隆\",\"MaterialSpecification\":\"古马隆\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":4.8264},{\"MaterialNo\":\"XJZJ0062\",\"Material\":{\"MaterialNo\":\"XJZJ0062\",\"MaterialName\":\"炭黑N330\",\"MaterialSpecification\":\"炭黑N330\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":57.5548},{\"MaterialNo\":\"XJZJ0013\",\"Material\":{\"MaterialNo\":\"XJZJ0013\",\"MaterialName\":\"2#橡胶油\",\"MaterialSpecification\":\"2#橡胶油\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"液体油\"},\"EnterSecondLaneWeight\":9.5925},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0}],\"MaterialList_2\":[{\"MaterialNo\":\"XJZJ0070\",\"Material\":{\"MaterialNo\":\"XJZJ0070\",\"MaterialName\":\"促进剂CBS(CZ)\",\"MaterialSpecification\":\"促进剂CBS(CZ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":1.6078},{\"MaterialNo\":\"XJZJ0093\",\"Material\":{\"MaterialNo\":\"XJZJ0093\",\"MaterialName\":\"硫磺\",\"MaterialSpecification\":\"硫磺\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"矿物质\"},\"ProductionRequiresWeight\":3.514},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0}],\"AfterPromotionTotalWeight\":208.2362},\"UpperLowerGlueCoefficient\":1.142,\"UpperLowerGlueUsage\":2070.4,\"LowerGlue\":{\"MaterialList_1\":[{\"MaterialNo\":\"WLXJ0008\",\"Material\":{\"MaterialNo\":\"WLXJ0008\",\"MaterialName\":\"天然胶\",\"MaterialSpecification\":\"天然胶\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"天然橡胶\"},\"EnterSecondLaneWeight\":69.6848},{\"MaterialNo\":\"WLXJ0005\",\"Material\":{\"MaterialNo\":\"WLXJ0005\",\"MaterialName\":\"顺丁橡胶BR9000\",\"MaterialSpecification\":\"BR9000\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"顺丁橡胶\"},\"EnterSecondLaneWeight\":12.204},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0},{\"MaterialNo\":\"WLXJ0004\",\"Material\":{\"MaterialNo\":\"WLXJ0004\",\"MaterialName\":\"普通母胶9\",\"MaterialSpecification\":\"普通母胶9\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"再生胶\"},\"EnterSecondLaneWeight\":67.122},{\"MaterialNo\":\"XJZJ0029\",\"Material\":{\"MaterialNo\":\"XJZJ0029\",\"MaterialName\":\"氧化锌\",\"MaterialSpecification\":\"氧化锌\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":2.4591},{\"MaterialNo\":\"XJZJ0028\",\"Material\":{\"MaterialNo\":\"XJZJ0028\",\"MaterialName\":\"硬脂酸\",\"MaterialSpecification\":\"硬脂酸\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"硫化活性剂\"},\"EnterSecondLaneWeight\":1.6414},{\"MaterialNo\":\"XJZJ0092\",\"Material\":{\"MaterialNo\":\"XJZJ0092\",\"MaterialName\":\"L-6023橡胶特种防护蜡\",\"MaterialSpecification\":\"L-6023\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"固体蜡\"},\"EnterSecondLaneWeight\":1.6414},{\"MaterialNo\":\"XJZJ0082\",\"Material\":{\"MaterialNo\":\"XJZJ0082\",\"MaterialName\":\"橡胶防老剂RD(TMQ)\",\"MaterialSpecification\":\"防老剂RD(TMQ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":1.6414},{\"MaterialNo\":\"XJZJ0031\",\"Material\":{\"MaterialNo\":\"XJZJ0031\",\"MaterialName\":\"古马隆\",\"MaterialSpecification\":\"古马隆\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":2.4591},{\"MaterialNo\":\"XJZJ0062\",\"Material\":{\"MaterialNo\":\"XJZJ0062\",\"MaterialName\":\"炭黑N330\",\"MaterialSpecification\":\"炭黑N330\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":18.8552},{\"MaterialNo\":\"XJZJ0059\",\"Material\":{\"MaterialNo\":\"XJZJ0059\",\"MaterialName\":\"白炭黑\",\"MaterialSpecification\":\"白炭黑\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":15.9872},{\"MaterialNo\":\"XJZJ0013\",\"Material\":{\"MaterialNo\":\"XJZJ0013\",\"MaterialName\":\"2#橡胶油\",\"MaterialSpecification\":\"2#橡胶油\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"液体油\"},\"EnterSecondLaneWeight\":1.2204},{\"MaterialNo\":\"XJZJ0024\",\"Material\":{\"MaterialNo\":\"XJZJ0024\",\"MaterialName\":\"SI69(KH-845)\",\"MaterialSpecification\":\"SI69(KH-845)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"粘合剂\"},\"EnterSecondLaneWeight\":2.0503},{\"MaterialNo\":\"XJZJ0083\",\"Material\":{\"MaterialNo\":\"XJZJ0083\",\"MaterialName\":\"橡胶防老剂4010NA(IPPD)\",\"MaterialSpecification\":\"防老剂4010NA(IPPD)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":0.8177},{\"MaterialNo\":\"XJZJ0118\",\"Material\":{\"MaterialNo\":\"XJZJ0118\",\"MaterialName\":\"二氧化硅微粉\",\"MaterialSpecification\":\"二氧化硅微粉\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":6.102},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0}],\"MaterialList_2\":[{\"MaterialNo\":\"XJZJ0093\",\"Material\":{\"MaterialNo\":\"XJZJ0093\",\"MaterialName\":\"硫磺\",\"MaterialSpecification\":\"硫磺\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"矿物质\"},\"ProductionRequiresWeight\":6.5225},{\"MaterialNo\":\"XJZJ0071\",\"Material\":{\"MaterialNo\":\"XJZJ0071\",\"MaterialName\":\"促进剂MBTS(DM)\",\"MaterialSpecification\":\"促进剂MBTS(DM)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":0.5244},{\"MaterialNo\":\"XJZJ0070\",\"Material\":{\"MaterialNo\":\"XJZJ0070\",\"MaterialName\":\"促进剂CBS(CZ)\",\"MaterialSpecification\":\"促进剂CBS(CZ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":0.9177},{\"MaterialNo\":\"XJZJ0091\",\"Material\":{\"MaterialNo\":\"XJZJ0091\",\"MaterialName\":\"防焦剂CTP\",\"MaterialSpecification\":\"防焦剂CTP\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"防焦剂\"},\"ProductionRequiresWeight\":0.3933},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0}],\"AfterPromotionTotalWeight\":208.986},\"LowerGlueCoefficient\":1.145,\"LowerGlueUsage\":553.557,\"LargeClothGlue\":{\"MaterialList_1\":[{\"MaterialNo\":\"WLXJ0008\",\"Material\":{\"MaterialNo\":\"WLXJ0008\",\"MaterialName\":\"天然胶\",\"MaterialSpecification\":\"天然胶\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"天然橡胶\"},\"EnterSecondLaneWeight\":10.478},{\"MaterialNo\":\"WLXJ0011\",\"Material\":{\"MaterialNo\":\"WLXJ0011\",\"MaterialName\":\"丁苯-1502\",\"MaterialSpecification\":\"SBR1502\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"丁苯橡胶\"},\"EnterSecondLaneWeight\":31.434},{\"MaterialNo\":\"WLXJ0013\",\"Material\":{\"MaterialNo\":\"WLXJ0013\",\"MaterialName\":\"丁苯-1712\",\"MaterialSpecification\":\"SBR1712\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"丁苯橡胶\"},\"EnterSecondLaneWeight\":18.3365},{\"MaterialNo\":\"WLXJ0004\",\"Material\":{\"MaterialNo\":\"WLXJ0004\",\"MaterialName\":\"普通母胶9\",\"MaterialSpecification\":\"普通母胶9\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"再生胶\"},\"EnterSecondLaneWeight\":39.2925},{\"MaterialNo\":\"XJZJ0029\",\"Material\":{\"MaterialNo\":\"XJZJ0029\",\"MaterialName\":\"氧化锌\",\"MaterialSpecification\":\"氧化锌\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":2.9548},{\"MaterialNo\":\"XJZJ0028\",\"Material\":{\"MaterialNo\":\"XJZJ0028\",\"MaterialName\":\"硬脂酸\",\"MaterialSpecification\":\"硬脂酸\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"硫化活性剂\"},\"EnterSecondLaneWeight\":1.8441},{\"MaterialNo\":\"XJZJ0082\",\"Material\":{\"MaterialNo\":\"XJZJ0082\",\"MaterialName\":\"橡胶防老剂RD(TMQ)\",\"MaterialSpecification\":\"防老剂RD(TMQ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":1.4774},{\"MaterialNo\":\"XJZJ0031\",\"Material\":{\"MaterialNo\":\"XJZJ0031\",\"MaterialName\":\"古马隆\",\"MaterialSpecification\":\"古马隆\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":5.8991},{\"MaterialNo\":\"XJZJ0030\",\"Material\":{\"MaterialNo\":\"XJZJ0030\",\"MaterialName\":\"碳酸钙\",\"MaterialSpecification\":\"碳酸钙\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":26.7189},{\"MaterialNo\":\"XJZJ0066\",\"Material\":{\"MaterialNo\":\"XJZJ0066\",\"MaterialName\":\"炭黑N660\",\"MaterialSpecification\":\"炭黑N660\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":38.7162},{\"MaterialNo\":\"XJZJ0059\",\"Material\":{\"MaterialNo\":\"XJZJ0059\",\"MaterialName\":\"白炭黑\",\"MaterialSpecification\":\"白炭黑\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":11.0543},{\"MaterialNo\":\"XJZJ0040\",\"Material\":{\"MaterialNo\":\"XJZJ0040\",\"MaterialName\":\"芳烃油\",\"MaterialSpecification\":\"芳烃油\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":15.4027},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0}],\"MaterialList_2\":[{\"MaterialNo\":\"XJZJ0093\",\"Material\":{\"MaterialNo\":\"XJZJ0093\",\"MaterialName\":\"硫磺\",\"MaterialSpecification\":\"硫磺\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"矿物质\"},\"ProductionRequiresWeight\":3.9893},{\"MaterialNo\":\"XJZJ0070\",\"Material\":{\"MaterialNo\":\"XJZJ0070\",\"MaterialName\":\"促进剂CBS(CZ)\",\"MaterialSpecification\":\"促进剂CBS(CZ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":1.6034},{\"MaterialNo\":\"XJZJ0071\",\"Material\":{\"MaterialNo\":\"XJZJ0071\",\"MaterialName\":\"促进剂MBTS(DM)\",\"MaterialSpecification\":\"促进剂MBTS(DM)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":0.4199},{\"MaterialNo\":\"XJZJ0055\",\"Material\":{\"MaterialNo\":\"XJZJ0055\",\"MaterialName\":\"橡胶黏合剂AS-88(AB-30)\",\"MaterialSpecification\":\"AB-30\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶黏合剂\"},\"ProductionRequiresWeight\":6.3562},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0}],\"AfterPromotionTotalWeight\":210.0885},\"LargeClothGlueCoefficient\":1.279,\"LargeClothGlueUsage\":1724.3264,\"BufferGlueUsage\":1176.68,\"MiddleGlue\":{\"MaterialList_1\":\"\",\"MaterialList_2\":\"\",\"AfterPromotionTotalWeight\":\"\"},\"MiddleGlueCoefficient\":0,\"MiddleGlueUsage\":0,\"SmallBarWidth\":300,\"SmallBarThickness\":0,\"SmallBarStandardUsage\":0,\"FormingArea\":2000,\"RollCoatingArea\":2133.3333,\"RolledFabricArea\":2000,\"SulfurizationArea\":4133.3333,\"LargeClothArea\":2014.4,\"SmallClothArea\":0,\"BeltTotalArea\":4133.3333,\"SkirtArea\":0,\"PartitionArea\":0,\"EdgeBandingTotalArea\":4133.3333,\"WireropeBeltTotalArea\":1520,\"OrderDate\":\"2024/6/13 0:00:00\",\"DeliveryDate\":\"2024/5/31 0:00:00\",\"SeqNo\":\"SCRW00020907\",\"ProductType\":\"承包\",\"ProductStatus\":\"待生产\",\"OrderOwner\":\"福建信明 XDLS20240624\",\"CustomerInfo\":\"沙钢（八车间剩余价值皮带） 承包 K501 SCJH00005709\",\"BeltLengthSpecifications\":\"EP300输送带 1600*5(6+2) 250米\",\"AreaAndWeight\":\"面积：4133.3333 重量：7277.49\",\"UsingRawMaterials\":\"布： EP300 1259 米 胶：14# + P芯胶（普通大布胶）\"}],\"result\":\"success\",\"message\":\"\"},\"DataType\":0}"; + result = ApiUtils.sendERPHttpPost(ERPConstants.ERP_URL, requestParam); +// result = "{\"Successful\":true,\"ErrorMessage\":null,\"Logined\":false,\"ReturnData\":{\"totle\":3,\"data\":[{\"BeltWidth\":1600,\"BeltClothLayer\":5,\"BeltRequiredLength\":250,\"GluingRequiredThickness\":6,\"LowerGlueRequiredThickness\":2,\"ProductionGluingThickness\":4.5,\"UpperBufferAdhesiveThickness\":1.5,\"ProductionLowerGlueThickness\":1.2,\"LowerBufferAdhesiveThickness\":0.8,\"ClothGlueThickness\":1.3,\"SmallClothFabricLayer\":0,\"SmallClothThickness\":0,\"IsNeedThicken\":\"否\",\"EachLayerThickenThickness\":0,\"ExtraThickeningThickness\":0,\"TotalProductionThickness\":14.5,\"AdditionalThickness\":0.5,\"RecommendedShimThickness\":13.5,\"SemiFinishedProductWidth\":1560,\"RollingProductionMeters\":251.8,\"RecommendedPadWidth\":1794,\"BigFabricManufacturer\":\"安徽旌德\",\"FabricSpecifications\":{\"MaterialNo\":\"WLFB0066\",\"MaterialName\":\"EE300N\",\"MaterialSpecification\":\"EE300N\",\"MaterialLargeCategories\":\"帆布类\",\"MaterialSmallCategories\":\"EE-N轻型浸胶帆布\"},\"EstimatedFabricUsage\":1259,\"ClothWidth\":1600,\"ClothWeight\":1752.528,\"SmallFabricSpecificationsDic\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"SmallClothWidth\":1300,\"SmallClothUsage\":0,\"SmallClothWeight\":0,\"GluingProcess\":\"双胶\",\"UpperLowerGlue\":{\"MaterialList_1\":[{\"MaterialNo\":\"WLXJ0008\",\"Material\":{\"MaterialNo\":\"WLXJ0008\",\"MaterialName\":\"天然胶\",\"MaterialSpecification\":\"天然胶\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"天然橡胶\"},\"EnterSecondLaneWeight\":47.6607},{\"MaterialNo\":\"WLXJ0011\",\"Material\":{\"MaterialNo\":\"WLXJ0011\",\"MaterialName\":\"丁苯-1502\",\"MaterialSpecification\":\"SBR1502\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"丁苯橡胶\"},\"EnterSecondLaneWeight\":27.1485},{\"MaterialNo\":\"WLXJ0005\",\"Material\":{\"MaterialNo\":\"WLXJ0005\",\"MaterialName\":\"顺丁橡胶BR9000\",\"MaterialSpecification\":\"BR9000\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"顺丁橡胶\"},\"EnterSecondLaneWeight\":21.1155},{\"MaterialNo\":\"WLXJ0004\",\"Material\":{\"MaterialNo\":\"WLXJ0004\",\"MaterialName\":\"普通母胶9\",\"MaterialSpecification\":\"普通母胶9\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"再生胶\"},\"EnterSecondLaneWeight\":27.1485},{\"MaterialNo\":\"XJZJ0029\",\"Material\":{\"MaterialNo\":\"XJZJ0029\",\"MaterialName\":\"氧化锌\",\"MaterialSpecification\":\"氧化锌\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":3.837},{\"MaterialNo\":\"XJZJ0028\",\"Material\":{\"MaterialNo\":\"XJZJ0028\",\"MaterialName\":\"硬脂酸\",\"MaterialSpecification\":\"硬脂酸\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"硫化活性剂\"},\"EnterSecondLaneWeight\":2.4132},{\"MaterialNo\":\"XJZJ0082\",\"Material\":{\"MaterialNo\":\"XJZJ0082\",\"MaterialName\":\"橡胶防老剂RD(TMQ)\",\"MaterialSpecification\":\"防老剂RD(TMQ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":1.9185},{\"MaterialNo\":\"XJZJ0092\",\"Material\":{\"MaterialNo\":\"XJZJ0092\",\"MaterialName\":\"L-6023橡胶特种防护蜡\",\"MaterialSpecification\":\"L-6023\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"固体蜡\"},\"EnterSecondLaneWeight\":1.9306},{\"MaterialNo\":\"XJZJ0031\",\"Material\":{\"MaterialNo\":\"XJZJ0031\",\"MaterialName\":\"古马隆\",\"MaterialSpecification\":\"古马隆\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":4.8264},{\"MaterialNo\":\"XJZJ0062\",\"Material\":{\"MaterialNo\":\"XJZJ0062\",\"MaterialName\":\"炭黑N330\",\"MaterialSpecification\":\"炭黑N330\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":57.5548},{\"MaterialNo\":\"XJZJ0013\",\"Material\":{\"MaterialNo\":\"XJZJ0013\",\"MaterialName\":\"2#橡胶油\",\"MaterialSpecification\":\"2#橡胶油\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"液体油\"},\"EnterSecondLaneWeight\":9.5925},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0}],\"MaterialList_2\":[{\"MaterialNo\":\"XJZJ0070\",\"Material\":{\"MaterialNo\":\"XJZJ0070\",\"MaterialName\":\"促进剂CBS(CZ)\",\"MaterialSpecification\":\"促进剂CBS(CZ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":1.6078},{\"MaterialNo\":\"XJZJ0093\",\"Material\":{\"MaterialNo\":\"XJZJ0093\",\"MaterialName\":\"硫磺\",\"MaterialSpecification\":\"硫磺\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"矿物质\"},\"ProductionRequiresWeight\":3.514},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0}],\"AfterPromotionTotalWeight\":208.2362},\"UpperLowerGlueCoefficient\":1.142,\"UpperLowerGlueUsage\":2070.4,\"LowerGlue\":{\"MaterialList_1\":[{\"MaterialNo\":\"WLXJ0008\",\"Material\":{\"MaterialNo\":\"WLXJ0008\",\"MaterialName\":\"天然胶\",\"MaterialSpecification\":\"天然胶\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"天然橡胶\"},\"EnterSecondLaneWeight\":69.6848},{\"MaterialNo\":\"WLXJ0005\",\"Material\":{\"MaterialNo\":\"WLXJ0005\",\"MaterialName\":\"顺丁橡胶BR9000\",\"MaterialSpecification\":\"BR9000\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"顺丁橡胶\"},\"EnterSecondLaneWeight\":12.204},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0},{\"MaterialNo\":\"WLXJ0004\",\"Material\":{\"MaterialNo\":\"WLXJ0004\",\"MaterialName\":\"普通母胶9\",\"MaterialSpecification\":\"普通母胶9\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"再生胶\"},\"EnterSecondLaneWeight\":67.122},{\"MaterialNo\":\"XJZJ0029\",\"Material\":{\"MaterialNo\":\"XJZJ0029\",\"MaterialName\":\"氧化锌\",\"MaterialSpecification\":\"氧化锌\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":2.4591},{\"MaterialNo\":\"XJZJ0028\",\"Material\":{\"MaterialNo\":\"XJZJ0028\",\"MaterialName\":\"硬脂酸\",\"MaterialSpecification\":\"硬脂酸\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"硫化活性剂\"},\"EnterSecondLaneWeight\":1.6414},{\"MaterialNo\":\"XJZJ0092\",\"Material\":{\"MaterialNo\":\"XJZJ0092\",\"MaterialName\":\"L-6023橡胶特种防护蜡\",\"MaterialSpecification\":\"L-6023\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"固体蜡\"},\"EnterSecondLaneWeight\":1.6414},{\"MaterialNo\":\"XJZJ0082\",\"Material\":{\"MaterialNo\":\"XJZJ0082\",\"MaterialName\":\"橡胶防老剂RD(TMQ)\",\"MaterialSpecification\":\"防老剂RD(TMQ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":1.6414},{\"MaterialNo\":\"XJZJ0031\",\"Material\":{\"MaterialNo\":\"XJZJ0031\",\"MaterialName\":\"古马隆\",\"MaterialSpecification\":\"古马隆\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":2.4591},{\"MaterialNo\":\"XJZJ0062\",\"Material\":{\"MaterialNo\":\"XJZJ0062\",\"MaterialName\":\"炭黑N330\",\"MaterialSpecification\":\"炭黑N330\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":18.8552},{\"MaterialNo\":\"XJZJ0059\",\"Material\":{\"MaterialNo\":\"XJZJ0059\",\"MaterialName\":\"白炭黑\",\"MaterialSpecification\":\"白炭黑\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":15.9872},{\"MaterialNo\":\"XJZJ0013\",\"Material\":{\"MaterialNo\":\"XJZJ0013\",\"MaterialName\":\"2#橡胶油\",\"MaterialSpecification\":\"2#橡胶油\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"液体油\"},\"EnterSecondLaneWeight\":1.2204},{\"MaterialNo\":\"XJZJ0024\",\"Material\":{\"MaterialNo\":\"XJZJ0024\",\"MaterialName\":\"SI69(KH-845)\",\"MaterialSpecification\":\"SI69(KH-845)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"粘合剂\"},\"EnterSecondLaneWeight\":2.0503},{\"MaterialNo\":\"XJZJ0083\",\"Material\":{\"MaterialNo\":\"XJZJ0083\",\"MaterialName\":\"橡胶防老剂4010NA(IPPD)\",\"MaterialSpecification\":\"防老剂4010NA(IPPD)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":0.8177},{\"MaterialNo\":\"XJZJ0118\",\"Material\":{\"MaterialNo\":\"XJZJ0118\",\"MaterialName\":\"二氧化硅微粉\",\"MaterialSpecification\":\"二氧化硅微粉\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":6.102},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0}],\"MaterialList_2\":[{\"MaterialNo\":\"XJZJ0093\",\"Material\":{\"MaterialNo\":\"XJZJ0093\",\"MaterialName\":\"硫磺\",\"MaterialSpecification\":\"硫磺\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"矿物质\"},\"ProductionRequiresWeight\":6.5225},{\"MaterialNo\":\"XJZJ0071\",\"Material\":{\"MaterialNo\":\"XJZJ0071\",\"MaterialName\":\"促进剂MBTS(DM)\",\"MaterialSpecification\":\"促进剂MBTS(DM)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":0.5244},{\"MaterialNo\":\"XJZJ0070\",\"Material\":{\"MaterialNo\":\"XJZJ0070\",\"MaterialName\":\"促进剂CBS(CZ)\",\"MaterialSpecification\":\"促进剂CBS(CZ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":0.9177},{\"MaterialNo\":\"XJZJ0091\",\"Material\":{\"MaterialNo\":\"XJZJ0091\",\"MaterialName\":\"防焦剂CTP\",\"MaterialSpecification\":\"防焦剂CTP\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"防焦剂\"},\"ProductionRequiresWeight\":0.3933},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0}],\"AfterPromotionTotalWeight\":208.986},\"LowerGlueCoefficient\":1.145,\"LowerGlueUsage\":553.557,\"LargeClothGlue\":{\"MaterialList_1\":[{\"MaterialNo\":\"WLXJ0008\",\"Material\":{\"MaterialNo\":\"WLXJ0008\",\"MaterialName\":\"天然胶\",\"MaterialSpecification\":\"天然胶\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"天然橡胶\"},\"EnterSecondLaneWeight\":10.478},{\"MaterialNo\":\"WLXJ0011\",\"Material\":{\"MaterialNo\":\"WLXJ0011\",\"MaterialName\":\"丁苯-1502\",\"MaterialSpecification\":\"SBR1502\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"丁苯橡胶\"},\"EnterSecondLaneWeight\":31.434},{\"MaterialNo\":\"WLXJ0013\",\"Material\":{\"MaterialNo\":\"WLXJ0013\",\"MaterialName\":\"丁苯-1712\",\"MaterialSpecification\":\"SBR1712\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"丁苯橡胶\"},\"EnterSecondLaneWeight\":18.3365},{\"MaterialNo\":\"WLXJ0004\",\"Material\":{\"MaterialNo\":\"WLXJ0004\",\"MaterialName\":\"普通母胶9\",\"MaterialSpecification\":\"普通母胶9\",\"MaterialLargeCategories\":\"橡胶类\",\"MaterialSmallCategories\":\"再生胶\"},\"EnterSecondLaneWeight\":39.2925},{\"MaterialNo\":\"XJZJ0029\",\"Material\":{\"MaterialNo\":\"XJZJ0029\",\"MaterialName\":\"氧化锌\",\"MaterialSpecification\":\"氧化锌\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":2.9548},{\"MaterialNo\":\"XJZJ0028\",\"Material\":{\"MaterialNo\":\"XJZJ0028\",\"MaterialName\":\"硬脂酸\",\"MaterialSpecification\":\"硬脂酸\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"硫化活性剂\"},\"EnterSecondLaneWeight\":1.8441},{\"MaterialNo\":\"XJZJ0082\",\"Material\":{\"MaterialNo\":\"XJZJ0082\",\"MaterialName\":\"橡胶防老剂RD(TMQ)\",\"MaterialSpecification\":\"防老剂RD(TMQ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶防老剂\"},\"EnterSecondLaneWeight\":1.4774},{\"MaterialNo\":\"XJZJ0031\",\"Material\":{\"MaterialNo\":\"XJZJ0031\",\"MaterialName\":\"古马隆\",\"MaterialSpecification\":\"古马隆\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":5.8991},{\"MaterialNo\":\"XJZJ0030\",\"Material\":{\"MaterialNo\":\"XJZJ0030\",\"MaterialName\":\"碳酸钙\",\"MaterialSpecification\":\"碳酸钙\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":26.7189},{\"MaterialNo\":\"XJZJ0066\",\"Material\":{\"MaterialNo\":\"XJZJ0066\",\"MaterialName\":\"炭黑N660\",\"MaterialSpecification\":\"炭黑N660\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":38.7162},{\"MaterialNo\":\"XJZJ0059\",\"Material\":{\"MaterialNo\":\"XJZJ0059\",\"MaterialName\":\"白炭黑\",\"MaterialSpecification\":\"白炭黑\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶补强剂\"},\"EnterSecondLaneWeight\":11.0543},{\"MaterialNo\":\"XJZJ0040\",\"Material\":{\"MaterialNo\":\"XJZJ0040\",\"MaterialName\":\"芳烃油\",\"MaterialSpecification\":\"芳烃油\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"化合物\"},\"EnterSecondLaneWeight\":15.4027},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"EnterSecondLaneWeight\":0}],\"MaterialList_2\":[{\"MaterialNo\":\"XJZJ0093\",\"Material\":{\"MaterialNo\":\"XJZJ0093\",\"MaterialName\":\"硫磺\",\"MaterialSpecification\":\"硫磺\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"矿物质\"},\"ProductionRequiresWeight\":3.9893},{\"MaterialNo\":\"XJZJ0070\",\"Material\":{\"MaterialNo\":\"XJZJ0070\",\"MaterialName\":\"促进剂CBS(CZ)\",\"MaterialSpecification\":\"促进剂CBS(CZ)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":1.6034},{\"MaterialNo\":\"XJZJ0071\",\"Material\":{\"MaterialNo\":\"XJZJ0071\",\"MaterialName\":\"促进剂MBTS(DM)\",\"MaterialSpecification\":\"促进剂MBTS(DM)\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶促进剂\"},\"ProductionRequiresWeight\":0.4199},{\"MaterialNo\":\"XJZJ0055\",\"Material\":{\"MaterialNo\":\"XJZJ0055\",\"MaterialName\":\"橡胶黏合剂AS-88(AB-30)\",\"MaterialSpecification\":\"AB-30\",\"MaterialLargeCategories\":\"橡胶助剂\",\"MaterialSmallCategories\":\"橡胶黏合剂\"},\"ProductionRequiresWeight\":6.3562},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0},{\"MaterialNo\":\"\",\"Material\":{\"MaterialNo\":\"\",\"MaterialName\":\"\",\"MaterialSpecification\":\"\",\"MaterialLargeCategories\":\"\",\"MaterialSmallCategories\":\"\"},\"ProductionRequiresWeight\":0}],\"AfterPromotionTotalWeight\":210.0885},\"LargeClothGlueCoefficient\":1.279,\"LargeClothGlueUsage\":1724.3264,\"BufferGlueUsage\":1176.68,\"MiddleGlue\":{\"MaterialList_1\":\"\",\"MaterialList_2\":\"\",\"AfterPromotionTotalWeight\":\"\"},\"MiddleGlueCoefficient\":0,\"MiddleGlueUsage\":0,\"SmallBarWidth\":300,\"SmallBarThickness\":0,\"SmallBarStandardUsage\":0,\"FormingArea\":2000,\"RollCoatingArea\":2133.3333,\"RolledFabricArea\":2000,\"SulfurizationArea\":4133.3333,\"LargeClothArea\":2014.4,\"SmallClothArea\":0,\"BeltTotalArea\":4133.3333,\"SkirtArea\":0,\"PartitionArea\":0,\"EdgeBandingTotalArea\":4133.3333,\"WireropeBeltTotalArea\":1520,\"OrderDate\":\"2024/6/13 0:00:00\",\"DeliveryDate\":\"2024/5/31 0:00:00\",\"SeqNo\":\"SCRW00020907\",\"ProductType\":\"承包\",\"ProductStatus\":\"待生产\",\"OrderOwner\":\"福建信明 XDLS20240624\",\"CustomerInfo\":\"沙钢（八车间剩余价值皮带） 承包 K501 SCJH00005709\",\"BeltLengthSpecifications\":\"EP300输送带 1600*5(6+2) 250米\",\"AreaAndWeight\":\"面积：4133.3333 重量：7277.49\",\"UsingRawMaterials\":\"布： EP300 1259 米 胶：14# + P芯胶（普通大布胶）\"}],\"result\":\"success\",\"message\":\"\"},\"DataType\":0}"; System.out.println(requestParam); System.out.println(result); // 处理接口返回消息 ObjectMapper resultMapper = new ObjectMapper(); // 将 JSON 字符串转换为 Java 对象 ResponseData data = resultMapper.readValue(result, ResponseData.class); - System.out.println(data); + List dataList = data.getReturnData().getData(); + for (RecordData recordData : dataList) { + ProdOrderDetail orderDetail = orderInfoService.insertOrderByERP(recordData); + resultList.add(orderDetail); + } + logger.warn("获取ERP订单接口:" + requestParam + "|" + result); } catch (JsonProcessingException e) { e.printStackTrace(); } - return result; + return resultList; } diff --git a/os-mes/src/main/java/com/os/mes/prod/controller/ProdOrderDetailController.java b/os-mes/src/main/java/com/os/mes/prod/controller/ProdOrderDetailController.java index 955a1df..4bc4640 100644 --- a/os-mes/src/main/java/com/os/mes/prod/controller/ProdOrderDetailController.java +++ b/os-mes/src/main/java/com/os/mes/prod/controller/ProdOrderDetailController.java @@ -73,7 +73,6 @@ public class ProdOrderDetailController extends BaseController { @Log(title = "订单明细", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ProdOrderDetail prodOrderDetail) { - prodOrderDetail.setCreateBy(getUsername()); return toAjax(prodOrderDetailService.insertProdOrderDetail(prodOrderDetail)); } @@ -84,7 +83,6 @@ public class ProdOrderDetailController extends BaseController { @Log(title = "订单明细", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody ProdOrderDetail prodOrderDetail) { - prodOrderDetail.setUpdateBy(getUsername()); return toAjax(prodOrderDetailService.updateProdOrderDetail(prodOrderDetail)); } diff --git a/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderDetail.java b/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderDetail.java index 409c715..cef2e40 100644 --- a/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderDetail.java +++ b/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderDetail.java @@ -1,9 +1,8 @@ package com.os.mes.prod.domain; import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.os.common.annotation.Excel; @@ -22,1102 +21,1109 @@ public class ProdOrderDetail extends BaseEntity { /** * 主键标识 */ - private BigDecimal objId; + private Long objId; /** * 任务编号 */ @Excel(name = "任务编号") + @JsonProperty(value = "SeqNo") private String SeqNo; /** * 下单日期 */ @Excel(name = "下单日期") + @JsonProperty(value = "OrderDate") private String OrderDate; /** * 交货日期 */ @Excel(name = "交货日期") + @JsonProperty(value = "DeliveryDate") private String DeliveryDate; /** * 产品类型 */ @Excel(name = "产品类型") + @JsonProperty(value = "ProductType") private String ProductType; /** * 产品状态 */ @Excel(name = "产品状态") + @JsonProperty(value = "ProductStatus") private String ProductStatus; /** * 订单所属 */ @Excel(name = "订单所属") + @JsonProperty(value = "OrderOwner") private String OrderOwner; /** * 客户信息 */ @Excel(name = "客户信息") + @JsonProperty(value = "CustomerInfo") private String CustomerInfo; /** * 输送带长度规格 */ @Excel(name = "输送带长度规格") + @JsonProperty(value = "BeltLengthSpecifications") private String BeltLengthSpecifications; /** * 面积与重量 */ @Excel(name = "面积与重量") + @JsonProperty(value = "AreaAndWeight") private String AreaAndWeight; /** * 使用原材料 */ @Excel(name = "使用原材料") + @JsonProperty(value = "UsingRawMaterials") private String UsingRawMaterials; /** * 输送带宽度（mm） */ - @Excel(name = "输送带宽度", readConverterExp = "m=m") + @Excel(name = "输送带宽度（mm）") + @JsonProperty(value = "BeltWidth") private BigDecimal BeltWidth; /** * 输送带布层 */ @Excel(name = "输送带布层") + @JsonProperty(value = "BeltClothLayer") private Long BeltClothLayer; /** * 客户要求输送带长度（m） */ - @Excel(name = "客户要求输送带长度", readConverterExp = "m=") + @Excel(name = "客户要求输送带长度（m）") + @JsonProperty(value = "BeltRequiredLength") private BigDecimal BeltRequiredLength; /** * 客户要求上胶厚度（mm） */ - @Excel(name = "客户要求上胶厚度", readConverterExp = "m=m") + @Excel(name = "客户要求上胶厚度（mm）") + @JsonProperty(value = "GluingRequiredThickness") private BigDecimal GluingRequiredThickness; /** * 客户要求下胶厚度（mm） */ - @Excel(name = "客户要求下胶厚度", readConverterExp = "m=m") + @Excel(name = "客户要求下胶厚度（mm）") + @JsonProperty(value = "LowerGlueRequiredThickness") private BigDecimal LowerGlueRequiredThickness; /** * 生产上胶厚度（mm） */ - @Excel(name = "生产上胶厚度", readConverterExp = "m=m") + @Excel(name = "生产上胶厚度（mm）") + @JsonProperty(value = "ProductionGluingThickness") private BigDecimal ProductionGluingThickness; /** * 上缓冲胶厚度（mm） */ - @Excel(name = "上缓冲胶厚度", readConverterExp = "m=m") + @Excel(name = "上缓冲胶厚度（mm）") + @JsonProperty(value = "UpperBufferAdhesiveThickness") private BigDecimal UpperBufferAdhesiveThickness; /** * 生产下胶厚度（mm） */ - @Excel(name = "生产下胶厚度", readConverterExp = "m=m") + @Excel(name = "生产下胶厚度（mm）") + @JsonProperty(value = "ProductionLowerGlueThickness") private BigDecimal ProductionLowerGlueThickness; /** * 下缓冲胶厚度（mm） */ - @Excel(name = "下缓冲胶厚度", readConverterExp = "m=m") + @Excel(name = "下缓冲胶厚度（mm）") + @JsonProperty(value = "LowerBufferAdhesiveThickness") private BigDecimal LowerBufferAdhesiveThickness; /** * 布胶厚度 */ @Excel(name = "布胶厚度") + @JsonProperty(value = "ClothGlueThickness") private BigDecimal ClothGlueThickness; /** * 小布用布布层 */ @Excel(name = "小布用布布层") + @JsonProperty(value = "SmallClothFabricLayer") private BigDecimal SmallClothFabricLayer; /** * 小布布料厚度（mm） */ - @Excel(name = "小布布料厚度", readConverterExp = "m=m") + @Excel(name = "小布布料厚度（mm）") + @JsonProperty(value = "SmallClothThickness") private BigDecimal SmallClothThickness; /** * 是否需要每层加厚 */ @Excel(name = "是否需要每层加厚") + @JsonProperty(value = "IsNeedThicken") private String IsNeedThicken; /** * 每层加厚厚度（mm） */ - @Excel(name = "每层加厚厚度", readConverterExp = "m=m") + @Excel(name = "每层加厚厚度（mm）") + @JsonProperty(value = "EachLayerThickenThickness") private BigDecimal EachLayerThickenThickness; /** * 额外加厚厚度（mm） */ - @Excel(name = "额外加厚厚度", readConverterExp = "m=m") + @Excel(name = "额外加厚厚度（mm）") + @JsonProperty(value = "ExtraThickeningThickness") private BigDecimal ExtraThickeningThickness; /** * 生产总厚度（mm） */ - @Excel(name = "生产总厚度", readConverterExp = "m=m") + @Excel(name = "生产总厚度（mm）") + @JsonProperty(value = "TotalProductionThickness") private BigDecimal TotalProductionThickness; /** * 压延追加厚度 */ @Excel(name = "压延追加厚度") + @JsonProperty(value = "AdditionalThickness") private BigDecimal AdditionalThickness; /** * 推荐垫铁厚度（mm） */ - @Excel(name = "推荐垫铁厚度", readConverterExp = "m=m") + @Excel(name = "推荐垫铁厚度（mm）") + @JsonProperty(value = "RecommendedShimThickness") private BigDecimal RecommendedShimThickness; /** * 推荐半成品宽度（mm） */ - @Excel(name = "推荐半成品宽度", readConverterExp = "m=m") + @Excel(name = "推荐半成品宽度（mm）") + @JsonProperty(value = "SemiFinishedProductWidth") private BigDecimal SemiFinishedProductWidth; /** * 压延生产米数（m） */ - @Excel(name = "压延生产米数", readConverterExp = "m=") + @Excel(name = "压延生产米数（m）") + @JsonProperty(value = "RollingProductionMeters") private BigDecimal RollingProductionMeters; /** * 推荐垫布宽度（mm） */ - @Excel(name = "推荐垫布宽度", readConverterExp = "m=m") + @Excel(name = "推荐垫布宽度（mm）") + @JsonProperty(value = "RecommendedPadWidth") private BigDecimal RecommendedPadWidth; /** * 大布厂家 */ @Excel(name = "大布厂家") + @JsonProperty(value = "BigFabricManufacturer") private String BigFabricManufacturer; /** * 布料规格 */ @Excel(name = "布料规格") + @JsonProperty(value = "FabricSpecifications") private String FabricSpecifications; /** * 预计布料使用量（m） */ - @Excel(name = "预计布料使用量", readConverterExp = "m=") + @Excel(name = "预计布料使用量（m）") + @JsonProperty(value = "EstimatedFabricUsage") private BigDecimal EstimatedFabricUsage; /** * 布宽度（mm） */ - @Excel(name = "布宽度", readConverterExp = "m=m") + @Excel(name = "布宽度（mm）") + @JsonProperty(value = "ClothWidth") private BigDecimal ClothWidth; /** * 布重量（kg） */ - @Excel(name = "布重量", readConverterExp = "k=g") + @Excel(name = "布重量（kg）") + @JsonProperty(value = "ClothWeight") private BigDecimal ClothWeight; /** * 小布使用布料规格 */ @Excel(name = "小布使用布料规格") + @JsonProperty(value = "SmallFabricSpecificationsDic") private String SmallFabricSpecificationsDic; /** * 小布宽度（mm） */ - @Excel(name = "小布宽度", readConverterExp = "m=m") + @Excel(name = "小布宽度（mm）") + @JsonProperty(value = "SmallClothWidth") private BigDecimal SmallClothWidth; /** * 小布布料使用量（m） */ - @Excel(name = "小布布料使用量", readConverterExp = "m=") + @Excel(name = "小布布料使用量（m）") + @JsonProperty(value = "SmallClothUsage") private BigDecimal SmallClothUsage; /** * 小布用布重量（kg） */ - @Excel(name = "小布用布重量", readConverterExp = "k=g") + @Excel(name = "小布用布重量（kg）") + @JsonProperty(value = "SmallClothWeight") private BigDecimal SmallClothWeight; /** * 用胶工艺 */ @Excel(name = "用胶工艺") + @JsonProperty(value = "GluingProcess") private String GluingProcess; /** * 上下胶使用胶料 */ @Excel(name = "上下胶使用胶料") + @JsonProperty(value = "UpperLowerGlue") private String UpperLowerGlue; /** * 上下胶系数 */ @Excel(name = "上下胶系数") + @JsonProperty(value = "UpperLowerGlueCoefficient") private BigDecimal UpperLowerGlueCoefficient; /** * 上下胶标准用胶量（kg） */ - @Excel(name = "上下胶标准用胶量", readConverterExp = "k=g") + @Excel(name = "上下胶标准用胶量（kg）") + @JsonProperty(value = "UpperLowerGlueUsage") private BigDecimal UpperLowerGlueUsage; /** * 下胶使用胶料 */ @Excel(name = "下胶使用胶料") + @JsonProperty(value = "LowerGlue") private String LowerGlue; /** * 下胶系数 */ @Excel(name = "下胶系数") + @JsonProperty(value = "LowerGlueCoefficient") private BigDecimal LowerGlueCoefficient; /** * 下胶标准用胶量（kg） */ - @Excel(name = "下胶标准用胶量", readConverterExp = "k=g") + @Excel(name = "下胶标准用胶量（kg）") + @JsonProperty(value = "LowerGlueUsage") private BigDecimal LowerGlueUsage; /** * 大布胶使用胶料 */ @Excel(name = "大布胶使用胶料") + @JsonProperty(value = "LargeClothGlue") private String LargeClothGlue; /** * 大布胶系数 */ @Excel(name = "大布胶系数") + @JsonProperty(value = "LargeClothGlueCoefficient") private BigDecimal LargeClothGlueCoefficient; /** * 胶布标准用胶量（kg） */ - @Excel(name = "胶布标准用胶量", readConverterExp = "k=g") + @Excel(name = "胶布标准用胶量（kg）") + @JsonProperty(value = "LargeClothGlueUsage") private BigDecimal LargeClothGlueUsage; /** * 上下缓冲胶标准用胶量（kg） */ - @Excel(name = "上下缓冲胶标准用胶量", readConverterExp = "k=g") + @Excel(name = "上下缓冲胶标准用胶量（kg）") + @JsonProperty(value = "BufferGlueUsage") private BigDecimal BufferGlueUsage; /** * 中间胶 */ @Excel(name = "中间胶") + @JsonProperty(value = "MiddleGlue") private String MiddleGlue; /** * 中间胶系数 */ @Excel(name = "中间胶系数") + @JsonProperty(value = "MiddleGlueCoefficient") private BigDecimal MiddleGlueCoefficient; /** * 中间胶使用量 */ @Excel(name = "中间胶使用量") + @JsonProperty(value = "MiddleGlueUsage") private BigDecimal MiddleGlueUsage; /** * 小条宽度 */ @Excel(name = "小条宽度") + @JsonProperty(value = "SmallBarWidth") private BigDecimal SmallBarWidth; /** * 小条厚度 */ @Excel(name = "小条厚度") + @JsonProperty(value = "SmallBarThickness") private BigDecimal SmallBarThickness; /** * 小条标准使用量（kg） */ - @Excel(name = "小条标准使用量", readConverterExp = "k=g") + @Excel(name = "小条标准使用量（kg）") + @JsonProperty(value = "SmallBarStandardUsage") private BigDecimal SmallBarStandardUsage; /** * 成型面积 */ @Excel(name = "成型面积") + @JsonProperty(value = "FormingArea") private BigDecimal FormingArea; /** * 压延包胶面积 */ @Excel(name = "压延包胶面积") + @JsonProperty(value = "RollCoatingArea") private BigDecimal RollCoatingArea; /** * 压延出布面积 */ @Excel(name = "压延出布面积") + @JsonProperty(value = "RolledFabricArea") private BigDecimal RolledFabricArea; /** * 硫化面积 */ @Excel(name = "硫化面积") + @JsonProperty(value = "SulfurizationArea") private BigDecimal SulfurizationArea; /** * 大布面积 */ @Excel(name = "大布面积") + @JsonProperty(value = "LargeClothArea") private BigDecimal LargeClothArea; /** * 小布面积 */ @Excel(name = "小布面积") + @JsonProperty(value = "SmallClothArea") private BigDecimal SmallClothArea; /** * 输送带总面积 */ @Excel(name = "输送带总面积") + @JsonProperty(value = "BeltTotalArea") private BigDecimal BeltTotalArea; /** * 裙边面积 */ @Excel(name = "裙边面积") + @JsonProperty(value = "SkirtArea") private BigDecimal SkirtArea; /** * 隔板面积 */ @Excel(name = "隔板面积") + @JsonProperty(value = "PartitionArea") private BigDecimal PartitionArea; /** * 挡边带总面积 */ @Excel(name = "挡边带总面积") + @JsonProperty(value = "EdgeBandingTotalArea") private BigDecimal EdgeBandingTotalArea; /** * 钢丝绳输送带工资总面积 */ @Excel(name = "钢丝绳输送带工资总面积") + @JsonProperty(value = "WireropeBeltTotalArea") private BigDecimal WireropeBeltTotalArea; - /** - * 创建者 - */ - @Excel(name = "创建者") - private String createdBy; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date createdTime; - - /** - * 更新者 - */ - @Excel(name = "更新者") - private String updatedBy; - - /** - * 更新时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date updatedTime; - - public void setObjId(BigDecimal objId) { - this.objId = objId; - } - - public BigDecimal getObjId() { + public Long getObjId() { return objId; } - public void setSeqNo(String SeqNo) { - this.SeqNo = SeqNo; + public void setObjId(Long objId) { + this.objId = objId; } public String getSeqNo() { return SeqNo; } - public void setOrderDate(String OrderDate) { - this.OrderDate = OrderDate; + public void setSeqNo(String seqNo) { + SeqNo = seqNo; } public String getOrderDate() { return OrderDate; } - public void setDeliveryDate(String DeliveryDate) { - this.DeliveryDate = DeliveryDate; + public void setOrderDate(String orderDate) { + OrderDate = orderDate; } public String getDeliveryDate() { return DeliveryDate; } - public void setProductType(String ProductType) { - this.ProductType = ProductType; + public void setDeliveryDate(String deliveryDate) { + DeliveryDate = deliveryDate; } public String getProductType() { return ProductType; } - public void setProductStatus(String ProductStatus) { - this.ProductStatus = ProductStatus; + public void setProductType(String productType) { + ProductType = productType; } public String getProductStatus() { return ProductStatus; } - public void setOrderOwner(String OrderOwner) { - this.OrderOwner = OrderOwner; + public void setProductStatus(String productStatus) { + ProductStatus = productStatus; } public String getOrderOwner() { return OrderOwner; } - public void setCustomerInfo(String CustomerInfo) { - this.CustomerInfo = CustomerInfo; + public void setOrderOwner(String orderOwner) { + OrderOwner = orderOwner; } public String getCustomerInfo() { return CustomerInfo; } - public void setBeltLengthSpecifications(String BeltLengthSpecifications) { - this.BeltLengthSpecifications = BeltLengthSpecifications; + public void setCustomerInfo(String customerInfo) { + CustomerInfo = customerInfo; } public String getBeltLengthSpecifications() { return BeltLengthSpecifications; } - public void setAreaAndWeight(String AreaAndWeight) { - this.AreaAndWeight = AreaAndWeight; + public void setBeltLengthSpecifications(String beltLengthSpecifications) { + BeltLengthSpecifications = beltLengthSpecifications; } public String getAreaAndWeight() { return AreaAndWeight; } - public void setUsingRawMaterials(String UsingRawMaterials) { - this.UsingRawMaterials = UsingRawMaterials; + public void setAreaAndWeight(String areaAndWeight) { + AreaAndWeight = areaAndWeight; } public String getUsingRawMaterials() { return UsingRawMaterials; } - public void setBeltWidth(BigDecimal BeltWidth) { - this.BeltWidth = BeltWidth; + public void setUsingRawMaterials(String usingRawMaterials) { + UsingRawMaterials = usingRawMaterials; } public BigDecimal getBeltWidth() { return BeltWidth; } - public void setBeltClothLayer(Long BeltClothLayer) { - this.BeltClothLayer = BeltClothLayer; + public void setBeltWidth(BigDecimal beltWidth) { + BeltWidth = beltWidth; } public Long getBeltClothLayer() { return BeltClothLayer; } - public void setBeltRequiredLength(BigDecimal BeltRequiredLength) { - this.BeltRequiredLength = BeltRequiredLength; + public void setBeltClothLayer(Long beltClothLayer) { + BeltClothLayer = beltClothLayer; } public BigDecimal getBeltRequiredLength() { return BeltRequiredLength; } - public void setGluingRequiredThickness(BigDecimal GluingRequiredThickness) { - this.GluingRequiredThickness = GluingRequiredThickness; + public void setBeltRequiredLength(BigDecimal beltRequiredLength) { + BeltRequiredLength = beltRequiredLength; } public BigDecimal getGluingRequiredThickness() { return GluingRequiredThickness; } - public void setLowerGlueRequiredThickness(BigDecimal LowerGlueRequiredThickness) { - this.LowerGlueRequiredThickness = LowerGlueRequiredThickness; + public void setGluingRequiredThickness(BigDecimal gluingRequiredThickness) { + GluingRequiredThickness = gluingRequiredThickness; } public BigDecimal getLowerGlueRequiredThickness() { return LowerGlueRequiredThickness; } - public void setProductionGluingThickness(BigDecimal ProductionGluingThickness) { - this.ProductionGluingThickness = ProductionGluingThickness; + public void setLowerGlueRequiredThickness(BigDecimal lowerGlueRequiredThickness) { + LowerGlueRequiredThickness = lowerGlueRequiredThickness; } public BigDecimal getProductionGluingThickness() { return ProductionGluingThickness; } - public void setUpperBufferAdhesiveThickness(BigDecimal UpperBufferAdhesiveThickness) { - this.UpperBufferAdhesiveThickness = UpperBufferAdhesiveThickness; + public void setProductionGluingThickness(BigDecimal productionGluingThickness) { + ProductionGluingThickness = productionGluingThickness; } public BigDecimal getUpperBufferAdhesiveThickness() { return UpperBufferAdhesiveThickness; } - public void setProductionLowerGlueThickness(BigDecimal ProductionLowerGlueThickness) { - this.ProductionLowerGlueThickness = ProductionLowerGlueThickness; + public void setUpperBufferAdhesiveThickness(BigDecimal upperBufferAdhesiveThickness) { + UpperBufferAdhesiveThickness = upperBufferAdhesiveThickness; } public BigDecimal getProductionLowerGlueThickness() { return ProductionLowerGlueThickness; } - public void setLowerBufferAdhesiveThickness(BigDecimal LowerBufferAdhesiveThickness) { - this.LowerBufferAdhesiveThickness = LowerBufferAdhesiveThickness; + public void setProductionLowerGlueThickness(BigDecimal productionLowerGlueThickness) { + ProductionLowerGlueThickness = productionLowerGlueThickness; } public BigDecimal getLowerBufferAdhesiveThickness() { return LowerBufferAdhesiveThickness; } - public void setClothGlueThickness(BigDecimal ClothGlueThickness) { - this.ClothGlueThickness = ClothGlueThickness; + public void setLowerBufferAdhesiveThickness(BigDecimal lowerBufferAdhesiveThickness) { + LowerBufferAdhesiveThickness = lowerBufferAdhesiveThickness; } public BigDecimal getClothGlueThickness() { return ClothGlueThickness; } - public void setSmallClothFabricLayer(BigDecimal SmallClothFabricLayer) { - this.SmallClothFabricLayer = SmallClothFabricLayer; + public void setClothGlueThickness(BigDecimal clothGlueThickness) { + ClothGlueThickness = clothGlueThickness; } public BigDecimal getSmallClothFabricLayer() { return SmallClothFabricLayer; } - public void setSmallClothThickness(BigDecimal SmallClothThickness) { - this.SmallClothThickness = SmallClothThickness; + public void setSmallClothFabricLayer(BigDecimal smallClothFabricLayer) { + SmallClothFabricLayer = smallClothFabricLayer; } public BigDecimal getSmallClothThickness() { return SmallClothThickness; } - public void setIsNeedThicken(String IsNeedThicken) { - this.IsNeedThicken = IsNeedThicken; + public void setSmallClothThickness(BigDecimal smallClothThickness) { + SmallClothThickness = smallClothThickness; } public String getIsNeedThicken() { return IsNeedThicken; } - public void setEachLayerThickenThickness(BigDecimal EachLayerThickenThickness) { - this.EachLayerThickenThickness = EachLayerThickenThickness; + public void setIsNeedThicken(String isNeedThicken) { + IsNeedThicken = isNeedThicken; } public BigDecimal getEachLayerThickenThickness() { return EachLayerThickenThickness; } - public void setExtraThickeningThickness(BigDecimal ExtraThickeningThickness) { - this.ExtraThickeningThickness = ExtraThickeningThickness; + public void setEachLayerThickenThickness(BigDecimal eachLayerThickenThickness) { + EachLayerThickenThickness = eachLayerThickenThickness; } public BigDecimal getExtraThickeningThickness() { return ExtraThickeningThickness; } - public void setTotalProductionThickness(BigDecimal TotalProductionThickness) { - this.TotalProductionThickness = TotalProductionThickness; + public void setExtraThickeningThickness(BigDecimal extraThickeningThickness) { + ExtraThickeningThickness = extraThickeningThickness; } public BigDecimal getTotalProductionThickness() { return TotalProductionThickness; } - public void setAdditionalThickness(BigDecimal AdditionalThickness) { - this.AdditionalThickness = AdditionalThickness; + public void setTotalProductionThickness(BigDecimal totalProductionThickness) { + TotalProductionThickness = totalProductionThickness; } public BigDecimal getAdditionalThickness() { return AdditionalThickness; } - public void setRecommendedShimThickness(BigDecimal RecommendedShimThickness) { - this.RecommendedShimThickness = RecommendedShimThickness; + public void setAdditionalThickness(BigDecimal additionalThickness) { + AdditionalThickness = additionalThickness; } public BigDecimal getRecommendedShimThickness() { return RecommendedShimThickness; } - public void setSemiFinishedProductWidth(BigDecimal SemiFinishedProductWidth) { - this.SemiFinishedProductWidth = SemiFinishedProductWidth; + public void setRecommendedShimThickness(BigDecimal recommendedShimThickness) { + RecommendedShimThickness = recommendedShimThickness; } public BigDecimal getSemiFinishedProductWidth() { return SemiFinishedProductWidth; } - public void setRollingProductionMeters(BigDecimal RollingProductionMeters) { - this.RollingProductionMeters = RollingProductionMeters; + public void setSemiFinishedProductWidth(BigDecimal semiFinishedProductWidth) { + SemiFinishedProductWidth = semiFinishedProductWidth; } public BigDecimal getRollingProductionMeters() { return RollingProductionMeters; } - public void setRecommendedPadWidth(BigDecimal RecommendedPadWidth) { - this.RecommendedPadWidth = RecommendedPadWidth; + public void setRollingProductionMeters(BigDecimal rollingProductionMeters) { + RollingProductionMeters = rollingProductionMeters; } public BigDecimal getRecommendedPadWidth() { return RecommendedPadWidth; } - public void setBigFabricManufacturer(String BigFabricManufacturer) { - this.BigFabricManufacturer = BigFabricManufacturer; + public void setRecommendedPadWidth(BigDecimal recommendedPadWidth) { + RecommendedPadWidth = recommendedPadWidth; } public String getBigFabricManufacturer() { return BigFabricManufacturer; } - public void setFabricSpecifications(String FabricSpecifications) { - this.FabricSpecifications = FabricSpecifications; + public void setBigFabricManufacturer(String bigFabricManufacturer) { + BigFabricManufacturer = bigFabricManufacturer; } public String getFabricSpecifications() { return FabricSpecifications; } - public void setEstimatedFabricUsage(BigDecimal EstimatedFabricUsage) { - this.EstimatedFabricUsage = EstimatedFabricUsage; + public void setFabricSpecifications(String fabricSpecifications) { + FabricSpecifications = fabricSpecifications; } public BigDecimal getEstimatedFabricUsage() { return EstimatedFabricUsage; } - public void setClothWidth(BigDecimal ClothWidth) { - this.ClothWidth = ClothWidth; + public void setEstimatedFabricUsage(BigDecimal estimatedFabricUsage) { + EstimatedFabricUsage = estimatedFabricUsage; } public BigDecimal getClothWidth() { return ClothWidth; } - public void setClothWeight(BigDecimal ClothWeight) { - this.ClothWeight = ClothWeight; + public void setClothWidth(BigDecimal clothWidth) { + ClothWidth = clothWidth; } public BigDecimal getClothWeight() { return ClothWeight; } - public void setSmallFabricSpecificationsDic(String SmallFabricSpecificationsDic) { - this.SmallFabricSpecificationsDic = SmallFabricSpecificationsDic; + public void setClothWeight(BigDecimal clothWeight) { + ClothWeight = clothWeight; } public String getSmallFabricSpecificationsDic() { return SmallFabricSpecificationsDic; } - public void setSmallClothWidth(BigDecimal SmallClothWidth) { - this.SmallClothWidth = SmallClothWidth; + public void setSmallFabricSpecificationsDic(String smallFabricSpecificationsDic) { + SmallFabricSpecificationsDic = smallFabricSpecificationsDic; } public BigDecimal getSmallClothWidth() { return SmallClothWidth; } - public void setSmallClothUsage(BigDecimal SmallClothUsage) { - this.SmallClothUsage = SmallClothUsage; + public void setSmallClothWidth(BigDecimal smallClothWidth) { + SmallClothWidth = smallClothWidth; } public BigDecimal getSmallClothUsage() { return SmallClothUsage; } - public void setSmallClothWeight(BigDecimal SmallClothWeight) { - this.SmallClothWeight = SmallClothWeight; + public void setSmallClothUsage(BigDecimal smallClothUsage) { + SmallClothUsage = smallClothUsage; } public BigDecimal getSmallClothWeight() { return SmallClothWeight; } - public void setGluingProcess(String GluingProcess) { - this.GluingProcess = GluingProcess; + public void setSmallClothWeight(BigDecimal smallClothWeight) { + SmallClothWeight = smallClothWeight; } public String getGluingProcess() { return GluingProcess; } - public void setUpperLowerGlue(String UpperLowerGlue) { - this.UpperLowerGlue = UpperLowerGlue; + public void setGluingProcess(String gluingProcess) { + GluingProcess = gluingProcess; } public String getUpperLowerGlue() { return UpperLowerGlue; } - public void setUpperLowerGlueCoefficient(BigDecimal UpperLowerGlueCoefficient) { - this.UpperLowerGlueCoefficient = UpperLowerGlueCoefficient; + public void setUpperLowerGlue(String upperLowerGlue) { + UpperLowerGlue = upperLowerGlue; } public BigDecimal getUpperLowerGlueCoefficient() { return UpperLowerGlueCoefficient; } - public void setUpperLowerGlueUsage(BigDecimal UpperLowerGlueUsage) { - this.UpperLowerGlueUsage = UpperLowerGlueUsage; + public void setUpperLowerGlueCoefficient(BigDecimal upperLowerGlueCoefficient) { + UpperLowerGlueCoefficient = upperLowerGlueCoefficient; } public BigDecimal getUpperLowerGlueUsage() { return UpperLowerGlueUsage; } - public void setLowerGlue(String LowerGlue) { - this.LowerGlue = LowerGlue; + public void setUpperLowerGlueUsage(BigDecimal upperLowerGlueUsage) { + UpperLowerGlueUsage = upperLowerGlueUsage; } public String getLowerGlue() { return LowerGlue; } - public void setLowerGlueCoefficient(BigDecimal LowerGlueCoefficient) { - this.LowerGlueCoefficient = LowerGlueCoefficient; + public void setLowerGlue(String lowerGlue) { + LowerGlue = lowerGlue; } public BigDecimal getLowerGlueCoefficient() { return LowerGlueCoefficient; } - public void setLowerGlueUsage(BigDecimal LowerGlueUsage) { - this.LowerGlueUsage = LowerGlueUsage; + public void setLowerGlueCoefficient(BigDecimal lowerGlueCoefficient) { + LowerGlueCoefficient = lowerGlueCoefficient; } public BigDecimal getLowerGlueUsage() { return LowerGlueUsage; } - public void setLargeClothGlue(String LargeClothGlue) { - this.LargeClothGlue = LargeClothGlue; + public void setLowerGlueUsage(BigDecimal lowerGlueUsage) { + LowerGlueUsage = lowerGlueUsage; } public String getLargeClothGlue() { return LargeClothGlue; } - public void setLargeClothGlueCoefficient(BigDecimal LargeClothGlueCoefficient) { - this.LargeClothGlueCoefficient = LargeClothGlueCoefficient; + public void setLargeClothGlue(String largeClothGlue) { + LargeClothGlue = largeClothGlue; } public BigDecimal getLargeClothGlueCoefficient() { return LargeClothGlueCoefficient; } - public void setLargeClothGlueUsage(BigDecimal LargeClothGlueUsage) { - this.LargeClothGlueUsage = LargeClothGlueUsage; + public void setLargeClothGlueCoefficient(BigDecimal largeClothGlueCoefficient) { + LargeClothGlueCoefficient = largeClothGlueCoefficient; } public BigDecimal getLargeClothGlueUsage() { return LargeClothGlueUsage; } - public void setBufferGlueUsage(BigDecimal BufferGlueUsage) { - this.BufferGlueUsage = BufferGlueUsage; + public void setLargeClothGlueUsage(BigDecimal largeClothGlueUsage) { + LargeClothGlueUsage = largeClothGlueUsage; } public BigDecimal getBufferGlueUsage() { return BufferGlueUsage; } - public void setMiddleGlue(String MiddleGlue) { - this.MiddleGlue = MiddleGlue; + public void setBufferGlueUsage(BigDecimal bufferGlueUsage) { + BufferGlueUsage = bufferGlueUsage; } public String getMiddleGlue() { return MiddleGlue; } - public void setMiddleGlueCoefficient(BigDecimal MiddleGlueCoefficient) { - this.MiddleGlueCoefficient = MiddleGlueCoefficient; + public void setMiddleGlue(String middleGlue) { + MiddleGlue = middleGlue; } public BigDecimal getMiddleGlueCoefficient() { return MiddleGlueCoefficient; } - public void setMiddleGlueUsage(BigDecimal MiddleGlueUsage) { - this.MiddleGlueUsage = MiddleGlueUsage; + public void setMiddleGlueCoefficient(BigDecimal middleGlueCoefficient) { + MiddleGlueCoefficient = middleGlueCoefficient; } public BigDecimal getMiddleGlueUsage() { return MiddleGlueUsage; } - public void setSmallBarWidth(BigDecimal SmallBarWidth) { - this.SmallBarWidth = SmallBarWidth; + public void setMiddleGlueUsage(BigDecimal middleGlueUsage) { + MiddleGlueUsage = middleGlueUsage; } public BigDecimal getSmallBarWidth() { return SmallBarWidth; } - public void setSmallBarThickness(BigDecimal SmallBarThickness) { - this.SmallBarThickness = SmallBarThickness; + public void setSmallBarWidth(BigDecimal smallBarWidth) { + SmallBarWidth = smallBarWidth; } public BigDecimal getSmallBarThickness() { return SmallBarThickness; } - public void setSmallBarStandardUsage(BigDecimal SmallBarStandardUsage) { - this.SmallBarStandardUsage = SmallBarStandardUsage; + public void setSmallBarThickness(BigDecimal smallBarThickness) { + SmallBarThickness = smallBarThickness; } public BigDecimal getSmallBarStandardUsage() { return SmallBarStandardUsage; } - public void setFormingArea(BigDecimal FormingArea) { - this.FormingArea = FormingArea; + public void setSmallBarStandardUsage(BigDecimal smallBarStandardUsage) { + SmallBarStandardUsage = smallBarStandardUsage; } public BigDecimal getFormingArea() { return FormingArea; } - public void setRollCoatingArea(BigDecimal RollCoatingArea) { - this.RollCoatingArea = RollCoatingArea; + public void setFormingArea(BigDecimal formingArea) { + FormingArea = formingArea; } public BigDecimal getRollCoatingArea() { return RollCoatingArea; } - public void setRolledFabricArea(BigDecimal RolledFabricArea) { - this.RolledFabricArea = RolledFabricArea; + public void setRollCoatingArea(BigDecimal rollCoatingArea) { + RollCoatingArea = rollCoatingArea; } public BigDecimal getRolledFabricArea() { return RolledFabricArea; } - public void setSulfurizationArea(BigDecimal SulfurizationArea) { - this.SulfurizationArea = SulfurizationArea; + public void setRolledFabricArea(BigDecimal rolledFabricArea) { + RolledFabricArea = rolledFabricArea; } public BigDecimal getSulfurizationArea() { return SulfurizationArea; } - public void setLargeClothArea(BigDecimal LargeClothArea) { - this.LargeClothArea = LargeClothArea; + public void setSulfurizationArea(BigDecimal sulfurizationArea) { + SulfurizationArea = sulfurizationArea; } public BigDecimal getLargeClothArea() { return LargeClothArea; } - public void setSmallClothArea(BigDecimal SmallClothArea) { - this.SmallClothArea = SmallClothArea; + public void setLargeClothArea(BigDecimal largeClothArea) { + LargeClothArea = largeClothArea; } public BigDecimal getSmallClothArea() { return SmallClothArea; } - public void setBeltTotalArea(BigDecimal BeltTotalArea) { - this.BeltTotalArea = BeltTotalArea; + public void setSmallClothArea(BigDecimal smallClothArea) { + SmallClothArea = smallClothArea; } public BigDecimal getBeltTotalArea() { return BeltTotalArea; } - public void setSkirtArea(BigDecimal SkirtArea) { - this.SkirtArea = SkirtArea; + public void setBeltTotalArea(BigDecimal beltTotalArea) { + BeltTotalArea = beltTotalArea; } public BigDecimal getSkirtArea() { return SkirtArea; } - public void setPartitionArea(BigDecimal PartitionArea) { - this.PartitionArea = PartitionArea; + public void setSkirtArea(BigDecimal skirtArea) { + SkirtArea = skirtArea; } public BigDecimal getPartitionArea() { return PartitionArea; } - public void setEdgeBandingTotalArea(BigDecimal EdgeBandingTotalArea) { - this.EdgeBandingTotalArea = EdgeBandingTotalArea; + public void setPartitionArea(BigDecimal partitionArea) { + PartitionArea = partitionArea; } public BigDecimal getEdgeBandingTotalArea() { return EdgeBandingTotalArea; } - public void setWireropeBeltTotalArea(BigDecimal WireropeBeltTotalArea) { - this.WireropeBeltTotalArea = WireropeBeltTotalArea; + public void setEdgeBandingTotalArea(BigDecimal edgeBandingTotalArea) { + EdgeBandingTotalArea = edgeBandingTotalArea; } public BigDecimal getWireropeBeltTotalArea() { return WireropeBeltTotalArea; } - public void setCreatedBy(String createdBy) { - this.createdBy = createdBy; - } - - public String getCreatedBy() { - return createdBy; - } - - public void setCreatedTime(Date createdTime) { - this.createdTime = createdTime; - } - - public Date getCreatedTime() { - return createdTime; - } - - public void setUpdatedBy(String updatedBy) { - this.updatedBy = updatedBy; - } - - public String getUpdatedBy() { - return updatedBy; - } - - public void setUpdatedTime(Date updatedTime) { - this.updatedTime = updatedTime; - } - - public Date getUpdatedTime() { - return updatedTime; + public void setWireropeBeltTotalArea(BigDecimal wireropeBeltTotalArea) { + WireropeBeltTotalArea = wireropeBeltTotalArea; } @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("objId", getObjId()) - .append("SeqNo", getSeqNo()) - .append("OrderDate", getOrderDate()) - .append("DeliveryDate", getDeliveryDate()) - .append("ProductType", getProductType()) - .append("ProductStatus", getProductStatus()) - .append("OrderOwner", getOrderOwner()) - .append("CustomerInfo", getCustomerInfo()) - .append("BeltLengthSpecifications", getBeltLengthSpecifications()) - .append("AreaAndWeight", getAreaAndWeight()) - .append("UsingRawMaterials", getUsingRawMaterials()) - .append("BeltWidth", getBeltWidth()) - .append("BeltClothLayer", getBeltClothLayer()) - .append("BeltRequiredLength", getBeltRequiredLength()) - .append("GluingRequiredThickness", getGluingRequiredThickness()) - .append("LowerGlueRequiredThickness", getLowerGlueRequiredThickness()) - .append("ProductionGluingThickness", getProductionGluingThickness()) - .append("UpperBufferAdhesiveThickness", getUpperBufferAdhesiveThickness()) - .append("ProductionLowerGlueThickness", getProductionLowerGlueThickness()) - .append("LowerBufferAdhesiveThickness", getLowerBufferAdhesiveThickness()) - .append("ClothGlueThickness", getClothGlueThickness()) - .append("SmallClothFabricLayer", getSmallClothFabricLayer()) - .append("SmallClothThickness", getSmallClothThickness()) - .append("IsNeedThicken", getIsNeedThicken()) - .append("EachLayerThickenThickness", getEachLayerThickenThickness()) - .append("ExtraThickeningThickness", getExtraThickeningThickness()) - .append("TotalProductionThickness", getTotalProductionThickness()) - .append("AdditionalThickness", getAdditionalThickness()) - .append("RecommendedShimThickness", getRecommendedShimThickness()) - .append("SemiFinishedProductWidth", getSemiFinishedProductWidth()) - .append("RollingProductionMeters", getRollingProductionMeters()) - .append("RecommendedPadWidth", getRecommendedPadWidth()) - .append("BigFabricManufacturer", getBigFabricManufacturer()) - .append("FabricSpecifications", getFabricSpecifications()) - .append("EstimatedFabricUsage", getEstimatedFabricUsage()) - .append("ClothWidth", getClothWidth()) - .append("ClothWeight", getClothWeight()) - .append("SmallFabricSpecificationsDic", getSmallFabricSpecificationsDic()) - .append("SmallClothWidth", getSmallClothWidth()) - .append("SmallClothUsage", getSmallClothUsage()) - .append("SmallClothWeight", getSmallClothWeight()) - .append("GluingProcess", getGluingProcess()) - .append("UpperLowerGlue", getUpperLowerGlue()) - .append("UpperLowerGlueCoefficient", getUpperLowerGlueCoefficient()) - .append("UpperLowerGlueUsage", getUpperLowerGlueUsage()) - .append("LowerGlue", getLowerGlue()) - .append("LowerGlueCoefficient", getLowerGlueCoefficient()) - .append("LowerGlueUsage", getLowerGlueUsage()) - .append("LargeClothGlue", getLargeClothGlue()) - .append("LargeClothGlueCoefficient", getLargeClothGlueCoefficient()) - .append("LargeClothGlueUsage", getLargeClothGlueUsage()) - .append("BufferGlueUsage", getBufferGlueUsage()) - .append("MiddleGlue", getMiddleGlue()) - .append("MiddleGlueCoefficient", getMiddleGlueCoefficient()) - .append("MiddleGlueUsage", getMiddleGlueUsage()) - .append("SmallBarWidth", getSmallBarWidth()) - .append("SmallBarThickness", getSmallBarThickness()) - .append("SmallBarStandardUsage", getSmallBarStandardUsage()) - .append("FormingArea", getFormingArea()) - .append("RollCoatingArea", getRollCoatingArea()) - .append("RolledFabricArea", getRolledFabricArea()) - .append("SulfurizationArea", getSulfurizationArea()) - .append("LargeClothArea", getLargeClothArea()) - .append("SmallClothArea", getSmallClothArea()) - .append("BeltTotalArea", getBeltTotalArea()) - .append("SkirtArea", getSkirtArea()) - .append("PartitionArea", getPartitionArea()) - .append("EdgeBandingTotalArea", getEdgeBandingTotalArea()) - .append("WireropeBeltTotalArea", getWireropeBeltTotalArea()) - .append("createdBy", getCreatedBy()) - .append("createdTime", getCreatedTime()) - .append("updatedBy", getUpdatedBy()) - .append("updatedTime", getUpdatedTime()) - .toString(); + return "ProdOrderDetail{" + + "objId=" + objId + + ", SeqNo='" + SeqNo + '\'' + + ", OrderDate='" + OrderDate + '\'' + + ", DeliveryDate='" + DeliveryDate + '\'' + + ", ProductType='" + ProductType + '\'' + + ", ProductStatus='" + ProductStatus + '\'' + + ", OrderOwner='" + OrderOwner + '\'' + + ", CustomerInfo='" + CustomerInfo + '\'' + + ", BeltLengthSpecifications='" + BeltLengthSpecifications + '\'' + + ", AreaAndWeight='" + AreaAndWeight + '\'' + + ", UsingRawMaterials='" + UsingRawMaterials + '\'' + + ", BeltWidth=" + BeltWidth + + ", BeltClothLayer=" + BeltClothLayer + + ", BeltRequiredLength=" + BeltRequiredLength + + ", GluingRequiredThickness=" + GluingRequiredThickness + + ", LowerGlueRequiredThickness=" + LowerGlueRequiredThickness + + ", ProductionGluingThickness=" + ProductionGluingThickness + + ", UpperBufferAdhesiveThickness=" + UpperBufferAdhesiveThickness + + ", ProductionLowerGlueThickness=" + ProductionLowerGlueThickness + + ", LowerBufferAdhesiveThickness=" + LowerBufferAdhesiveThickness + + ", ClothGlueThickness=" + ClothGlueThickness + + ", SmallClothFabricLayer=" + SmallClothFabricLayer + + ", SmallClothThickness=" + SmallClothThickness + + ", IsNeedThicken='" + IsNeedThicken + '\'' + + ", EachLayerThickenThickness=" + EachLayerThickenThickness + + ", ExtraThickeningThickness=" + ExtraThickeningThickness + + ", TotalProductionThickness=" + TotalProductionThickness + + ", AdditionalThickness=" + AdditionalThickness + + ", RecommendedShimThickness=" + RecommendedShimThickness + + ", SemiFinishedProductWidth=" + SemiFinishedProductWidth + + ", RollingProductionMeters=" + RollingProductionMeters + + ", RecommendedPadWidth=" + RecommendedPadWidth + + ", BigFabricManufacturer='" + BigFabricManufacturer + '\'' + + ", FabricSpecifications='" + FabricSpecifications + '\'' + + ", EstimatedFabricUsage=" + EstimatedFabricUsage + + ", ClothWidth=" + ClothWidth + + ", ClothWeight=" + ClothWeight + + ", SmallFabricSpecificationsDic='" + SmallFabricSpecificationsDic + '\'' + + ", SmallClothWidth=" + SmallClothWidth + + ", SmallClothUsage=" + SmallClothUsage + + ", SmallClothWeight=" + SmallClothWeight + + ", GluingProcess='" + GluingProcess + '\'' + + ", UpperLowerGlue='" + UpperLowerGlue + '\'' + + ", UpperLowerGlueCoefficient=" + UpperLowerGlueCoefficient + + ", UpperLowerGlueUsage=" + UpperLowerGlueUsage + + ", LowerGlue='" + LowerGlue + '\'' + + ", LowerGlueCoefficient=" + LowerGlueCoefficient + + ", LowerGlueUsage=" + LowerGlueUsage + + ", LargeClothGlue='" + LargeClothGlue + '\'' + + ", LargeClothGlueCoefficient=" + LargeClothGlueCoefficient + + ", LargeClothGlueUsage=" + LargeClothGlueUsage + + ", BufferGlueUsage=" + BufferGlueUsage + + ", MiddleGlue='" + MiddleGlue + '\'' + + ", MiddleGlueCoefficient=" + MiddleGlueCoefficient + + ", MiddleGlueUsage=" + MiddleGlueUsage + + ", SmallBarWidth=" + SmallBarWidth + + ", SmallBarThickness=" + SmallBarThickness + + ", SmallBarStandardUsage=" + SmallBarStandardUsage + + ", FormingArea=" + FormingArea + + ", RollCoatingArea=" + RollCoatingArea + + ", RolledFabricArea=" + RolledFabricArea + + ", SulfurizationArea=" + SulfurizationArea + + ", LargeClothArea=" + LargeClothArea + + ", SmallClothArea=" + SmallClothArea + + ", BeltTotalArea=" + BeltTotalArea + + ", SkirtArea=" + SkirtArea + + ", PartitionArea=" + PartitionArea + + ", EdgeBandingTotalArea=" + EdgeBandingTotalArea + + ", WireropeBeltTotalArea=" + WireropeBeltTotalArea + + '}'; } } diff --git a/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java b/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java index 7956f8e..9ede93d 100644 --- a/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java +++ b/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java @@ -1,5 +1,6 @@ package com.os.mes.prod.domain; +import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -68,13 +69,13 @@ public class ProdOrderInfo extends BaseEntity { * 订单计划数量 */ @Excel(name = "订单计划数量") - private Long orderAmount; + private BigDecimal orderAmount; /** * 完成数量 */ @Excel(name = "完成数量") - private Long completeAmount; + private BigDecimal completeAmount; /** * 工单类型 @@ -248,19 +249,19 @@ public class ProdOrderInfo extends BaseEntity { return bomCode; } - public void setOrderAmount(Long orderAmount) { + public void setOrderAmount(BigDecimal orderAmount) { this.orderAmount = orderAmount; } - public Long getOrderAmount() { + public BigDecimal getOrderAmount() { return orderAmount; } - public void setCompleteAmount(Long completeAmount) { + public void setCompleteAmount(BigDecimal completeAmount) { this.completeAmount = completeAmount; } - public Long getCompleteAmount() { + public BigDecimal getCompleteAmount() { return completeAmount; } diff --git a/os-mes/src/main/java/com/os/mes/prod/service/IProdOrderInfoService.java b/os-mes/src/main/java/com/os/mes/prod/service/IProdOrderInfoService.java index d83ab31..51a3201 100644 --- a/os-mes/src/main/java/com/os/mes/prod/service/IProdOrderInfoService.java +++ b/os-mes/src/main/java/com/os/mes/prod/service/IProdOrderInfoService.java @@ -2,6 +2,8 @@ package com.os.mes.prod.service; import java.util.List; +import com.os.mes.api.domain.RecordData; +import com.os.mes.prod.domain.ProdOrderDetail; import com.os.mes.prod.domain.ProdOrderInfo; /** @@ -58,4 +60,10 @@ public interface IProdOrderInfoService { * @return 结果 */ public int deleteProdOrderInfoByObjId(Long objId); + + /** + * 通过ERP插入订单信息 + * @param recordData + */ + public ProdOrderDetail insertOrderByERP(RecordData recordData); } diff --git a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdOrderInfoServiceImpl.java b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdOrderInfoServiceImpl.java index c53f1d2..29e1e5a 100644 --- a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdOrderInfoServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdOrderInfoServiceImpl.java @@ -1,7 +1,18 @@ package com.os.mes.prod.service.impl; +import java.math.BigDecimal; +import java.text.ParseException; import java.util.List; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.os.common.utils.DateUtils; +import com.os.mes.api.domain.RecordData; +import com.os.mes.prod.domain.ProdOrderDetail; +import com.os.mes.prod.service.IProdOrderDetailService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.os.mes.prod.mapper.ProdOrderInfoMapper; @@ -16,9 +27,15 @@ import com.os.mes.prod.service.IProdOrderInfoService; */ @Service public class ProdOrderInfoServiceImpl implements IProdOrderInfoService { + + private static final Logger logger = LoggerFactory.getLogger(ProdOrderInfoServiceImpl.class); + @Autowired private ProdOrderInfoMapper prodOrderInfoMapper; + @Autowired + private IProdOrderDetailService prodOrderDetailService; + /** * 查询订单信息 * @@ -49,6 +66,7 @@ public class ProdOrderInfoServiceImpl implements IProdOrderInfoService { */ @Override public int insertProdOrderInfo(ProdOrderInfo prodOrderInfo) { + prodOrderInfo.setCreatedTime(DateUtils.getNowDate()); return prodOrderInfoMapper.insertProdOrderInfo(prodOrderInfo); } @@ -60,6 +78,7 @@ public class ProdOrderInfoServiceImpl implements IProdOrderInfoService { */ @Override public int updateProdOrderInfo(ProdOrderInfo prodOrderInfo) { + prodOrderInfo.setUpdatedTime(DateUtils.getNowDate()); return prodOrderInfoMapper.updateProdOrderInfo(prodOrderInfo); } @@ -84,4 +103,127 @@ public class ProdOrderInfoServiceImpl implements IProdOrderInfoService { public int deleteProdOrderInfoByObjId(Long objId) { return prodOrderInfoMapper.deleteProdOrderInfoByObjId(objId); } + + /** + * 通过ERP插入订单信息 + * + * @param recordData + */ + @Override + public ProdOrderDetail insertOrderByERP(RecordData recordData) { + ProdOrderInfo orderInfo = new ProdOrderInfo(); + ProdOrderDetail orderDetail = new ProdOrderDetail(); + //维护订单信息 + ProdOrderInfo selectOrder = new ProdOrderInfo(); + selectOrder.setOrderCode(recordData.getSeqNo()); + List prodOrderInfos = this.selectProdOrderInfoList(selectOrder); + + orderInfo.setOrderCode(recordData.getSeqNo()); + //orderInfo.setMaterialCode(" "); + orderInfo.setMaterialName(recordData.getBeltLengthSpecifications()); + orderInfo.setOrderType(recordData.getProductType()); + orderInfo.setOrderAmount(recordData.getBeltRequiredLength()); + try { + orderInfo.setBeginDate(DateUtils.parseDate(recordData.getOrderDate(), DateUtils.parsePatterns)); + orderInfo.setEndDate(DateUtils.parseDate(recordData.getOrderDate(), DateUtils.parsePatterns)); + } catch (ParseException e) { + e.printStackTrace(); + } + + if (prodOrderInfos.size() > 0) { + orderInfo.setObjId(prodOrderInfos.get(0).getObjId()); + this.updateProdOrderInfo(orderInfo); + }else { + this.insertProdOrderInfo(orderInfo); + } + //维护订单明细 + ProdOrderDetail selectOrderDetail = new ProdOrderDetail(); + selectOrderDetail.setSeqNo(recordData.getSeqNo()); + List prodOrderDetails = prodOrderDetailService.selectProdOrderDetailList(selectOrderDetail); + orderDetail.setSeqNo(recordData.getSeqNo()); // 任务编号 + orderDetail.setOrderDate(recordData.getOrderDate()); // 下单日期 + orderDetail.setDeliveryDate(recordData.getDeliveryDate()); // 交货日期 + orderDetail.setProductType(recordData.getProductType()); // 产品类型 + orderDetail.setProductStatus(recordData.getProductStatus()); // 产品状态 + orderDetail.setOrderOwner(recordData.getOrderOwner()); // 订单所属 + orderDetail.setCustomerInfo(recordData.getCustomerInfo()); // 客户信息 + orderDetail.setBeltLengthSpecifications(recordData.getBeltLengthSpecifications()); // 输送带长度规格 + orderDetail.setAreaAndWeight(recordData.getAreaAndWeight()); // 面积与重量 + orderDetail.setUsingRawMaterials(recordData.getUsingRawMaterials()); // 使用原材料 + orderDetail.setBeltWidth(recordData.getBeltWidth()); // 输送带宽度（mm） + orderDetail.setBeltClothLayer(recordData.getBeltClothLayer()); // 输送带布层 + orderDetail.setBeltRequiredLength(recordData.getBeltRequiredLength()); // 客户要求输送带长度（m） + orderDetail.setGluingRequiredThickness(recordData.getGluingRequiredThickness()); // 客户要求上胶厚度（mm） + orderDetail.setLowerGlueRequiredThickness(recordData.getLowerGlueRequiredThickness()); // 客户要求下胶厚度（mm） + orderDetail.setProductionGluingThickness(recordData.getProductionGluingThickness()); // 生产上胶厚度（mm） + orderDetail.setUpperBufferAdhesiveThickness(recordData.getUpperBufferAdhesiveThickness()); // 上缓冲胶厚度（mm） + orderDetail.setProductionLowerGlueThickness(recordData.getProductionLowerGlueThickness()); // 生产下胶厚度（mm） + orderDetail.setLowerBufferAdhesiveThickness(recordData.getLowerBufferAdhesiveThickness()); // 下缓冲胶厚度（mm） + orderDetail.setClothGlueThickness(recordData.getClothGlueThickness()); // 布胶厚度 + orderDetail.setSmallClothFabricLayer(recordData.getSmallClothFabricLayer()); // 小布用布布层 + orderDetail.setSmallClothThickness(recordData.getSmallClothThickness()); // 小布布料厚度（mm） + orderDetail.setIsNeedThicken(recordData.getIsNeedThicken()); // 是否需要每层加厚 + orderDetail.setEachLayerThickenThickness(recordData.getEachLayerThickenThickness()); // 每层加厚厚度（mm） + orderDetail.setExtraThickeningThickness(recordData.getExtraThickeningThickness()); // 额外加厚厚度（mm） + orderDetail.setTotalProductionThickness(recordData.getTotalProductionThickness()); // 生产总厚度（mm） + orderDetail.setAdditionalThickness(recordData.getAdditionalThickness()); // 压延追加厚度 + orderDetail.setRecommendedShimThickness(recordData.getRecommendedShimThickness()); // 推荐垫铁厚度（mm） + orderDetail.setSemiFinishedProductWidth(recordData.getSemiFinishedProductWidth()); // 推荐半成品宽度（mm） + orderDetail.setRollingProductionMeters(recordData.getRollingProductionMeters()); // 压延生产米数（m） + orderDetail.setRecommendedPadWidth(recordData.getRecommendedPadWidth()); // 推荐垫布宽度（mm） + orderDetail.setBigFabricManufacturer(recordData.getBigFabricManufacturer()); // 大布厂家 + try { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.setPropertyNamingStrategy(PropertyNamingStrategy.UPPER_CAMEL_CASE); + orderDetail.setFabricSpecifications(objectMapper.writeValueAsString(recordData.getFabricSpecifications())); // 布料规格 + orderDetail.setSmallFabricSpecificationsDic(objectMapper.writeValueAsString(recordData.getSmallFabricSpecificationsDic())); // 小布使用布料规格 + orderDetail.setUpperLowerGlue(objectMapper.writeValueAsString(recordData.getUpperLowerGlue())); // 上下胶使用胶料 + orderDetail.setLowerGlue(objectMapper.writeValueAsString(recordData.getLowerGlue())); // 下胶使用胶料 + orderDetail.setLargeClothGlue(objectMapper.writeValueAsString(recordData.getLargeClothGlue())); // 大布胶使用胶料 + orderDetail.setMiddleGlue(objectMapper.writeValueAsString(recordData.getMiddleGlue())); // 中间胶 + } catch (Exception e) { + logger.error("保存ERP订单接口日志错误：" + e.getMessage()); + } + orderDetail.setEstimatedFabricUsage(recordData.getEstimatedFabricUsage()); // 预计布料使用量（m） + orderDetail.setClothWidth(recordData.getClothWidth()); // 布宽度（mm） + orderDetail.setClothWeight(recordData.getClothWeight()); // 布重量（kg） + orderDetail.setSmallClothWidth(recordData.getSmallClothWidth()); // 小布宽度（mm） + orderDetail.setSmallClothUsage(recordData.getSmallClothUsage()); // 小布布料使用量（m） + orderDetail.setSmallClothWeight(recordData.getSmallClothWeight()); // 小布用布重量（kg） + orderDetail.setGluingProcess(recordData.getGluingProcess()); // 用胶工艺 + orderDetail.setUpperLowerGlueCoefficient(recordData.getUpperLowerGlueCoefficient()); // 上下胶系数 + orderDetail.setUpperLowerGlueUsage(recordData.getUpperLowerGlueUsage()); // 上下胶标准用胶量（kg） + orderDetail.setLowerGlueCoefficient(recordData.getLowerGlueCoefficient()); // 下胶系数 + orderDetail.setLowerGlueUsage(recordData.getLowerGlueUsage()); // 下胶标准用胶量（kg） + orderDetail.setLargeClothGlueCoefficient(recordData.getLargeClothGlueCoefficient()); // 大布胶系数 + orderDetail.setLargeClothGlueUsage(recordData.getLargeClothGlueUsage()); // 胶布标准用胶量（kg） + orderDetail.setBufferGlueUsage(recordData.getBufferGlueUsage()); // 上下缓冲胶标准用胶量（kg） + orderDetail.setMiddleGlueCoefficient(recordData.getMiddleGlueCoefficient()); // 中间胶系数 + orderDetail.setMiddleGlueUsage(recordData.getMiddleGlueUsage()); // 中间胶使用量 + orderDetail.setSmallBarWidth(recordData.getSmallBarWidth()); // 小条宽度 + orderDetail.setSmallBarThickness(recordData.getSmallBarThickness()); // 小条厚度 + orderDetail.setSmallBarStandardUsage(recordData.getSmallBarStandardUsage()); // 小条标准使用量（kg） + orderDetail.setFormingArea(recordData.getFormingArea()); // 成型面积 + orderDetail.setRollCoatingArea(recordData.getRollCoatingArea()); // 压延包胶面积 + orderDetail.setRolledFabricArea(recordData.getRolledFabricArea()); // 压延出布面积 + orderDetail.setSulfurizationArea(recordData.getSulfurizationArea()); // 硫化面积 + orderDetail.setLargeClothArea(recordData.getLargeClothArea()); // 大布面积 + orderDetail.setSmallClothArea(recordData.getSmallClothArea()); // 小布面积 + orderDetail.setBeltTotalArea(recordData.getBeltTotalArea()); // 输送带总面积 + orderDetail.setSkirtArea(recordData.getSkirtArea()); // 裙边面积 + orderDetail.setPartitionArea(recordData.getPartitionArea()); // 隔板面积 + orderDetail.setEdgeBandingTotalArea(recordData.getEdgeBandingTotalArea()); // 挡边带总面积 + orderDetail.setWireropeBeltTotalArea(recordData.getWireropeBeltTotalArea()); // 钢丝绳输送带工资总面积 + + if (prodOrderDetails.size() > 0) { + orderDetail.setObjId(prodOrderDetails.get(0).getObjId()); + orderDetail.setUpdateTime(DateUtils.getNowDate()); // 更新时间 + prodOrderDetailService.updateProdOrderDetail(orderDetail); + } else { + orderDetail.setCreateTime(DateUtils.getNowDate()); // 创建时间 + prodOrderDetailService.insertProdOrderDetail(orderDetail); + } + + return orderDetail; + } } diff --git a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml index 04097aa..f6c62c6 100644 --- a/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml @@ -53,6 +53,7 @@ and rsa.create_time = #{createTime} and rsa.machine_code = #{machineCode} + order by rsa.create_time desc