diff --git a/os-mes/src/main/java/com/os/mes/api/domain/ERPParamDto.java b/os-mes/src/main/java/com/os/mes/api/domain/ERPParamDto.java index c41ffc9..122df26 100644 --- a/os-mes/src/main/java/com/os/mes/api/domain/ERPParamDto.java +++ b/os-mes/src/main/java/com/os/mes/api/domain/ERPParamDto.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * ERP接口请求参数实体 + * * @Author YinQ * @create 2023-09-26 14:46 */ @@ -12,21 +13,47 @@ public class ERPParamDto { private static final long serialVersionUID = 1L; + /** + * 应用代码 + */ @JsonProperty(value = "AppCode") private String AppCode; + + /** + * 控制器 + */ @JsonProperty(value = "Controller") private String Controller; + + /** + * 动作名称 + */ @JsonProperty(value = "ActionName") private String ActionName; - @JsonProperty(value = "SeqNo") - private String SeqNo; // 任务编号 - @JsonProperty(value = "ProductStatus") - private String ProductStatus; // 产品状态 - @JsonProperty(value = "OrderStartTime") - private String OrderStartTime; // 下单日期_开始时间 - @JsonProperty(value = "OrderEndTime") - private String OrderEndTime; // 下单日期_截止时间 + /** + * 任务编号 + */ + @JsonProperty(value = "SeqNo") + private String SeqNo; + + /** + * 产品状态 + */ + @JsonProperty(value = "ProductStatus") + private String ProductStatus; + + /** + * 下单日期_开始时间 + */ + @JsonProperty(value = "OrderStartTime") + private String OrderStartTime; + + /** + * 下单日期_截止时间 + */ + @JsonProperty(value = "OrderEndTime") + private String OrderEndTime; public String getAppCode() { return AppCode; @@ -83,4 +110,17 @@ public class ERPParamDto { public void setOrderEndTime(String orderEndTime) { OrderEndTime = orderEndTime; } + + @Override + public String toString() { + return "ERPParamDto{" + + "AppCode='" + AppCode + '\'' + + ", Controller='" + Controller + '\'' + + ", ActionName='" + ActionName + '\'' + + ", SeqNo='" + SeqNo + '\'' + + ", ProductStatus='" + ProductStatus + '\'' + + ", OrderStartTime='" + OrderStartTime + '\'' + + ", OrderEndTime='" + OrderEndTime + '\'' + + '}'; + } } 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 f17a00e..7a9e071 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 @@ -6,91 +6,91 @@ import java.util.HashMap; public class RecordData { - /** 带宽 */ + /** 输送带宽度(mm)*/ @JsonProperty("BeltWidth") - private int BeltWidth; + private double BeltWidth; - /** 带布层 */ + /** 输送带布层 */ @JsonProperty("BeltClothLayer") private int BeltClothLayer; - /** 带所需长度 */ + /** 客户要求输送带长度(m) */ @JsonProperty("BeltRequiredLength") - private int BeltRequiredLength; + private double BeltRequiredLength; - /** 粘合所需厚度 */ + /** 客户要求上胶厚度(mm) */ @JsonProperty("GluingRequiredThickness") - private int GluingRequiredThickness; + private double GluingRequiredThickness; - /** 下胶所需厚度 */ + /** 客户要求下胶厚度(mm) */ @JsonProperty("LowerGlueRequiredThickness") - private int LowerGlueRequiredThickness; + private double LowerGlueRequiredThickness; - /** 生产粘合厚度 */ + /** 生产上胶厚度(mm) */ @JsonProperty("ProductionGluingThickness") private double ProductionGluingThickness; - /** 上缓冲粘合厚度 */ + /** 上缓冲胶厚度(mm) */ @JsonProperty("UpperBufferAdhesiveThickness") - private int UpperBufferAdhesiveThickness; + private double UpperBufferAdhesiveThickness; - /** 生产下胶厚度 */ + /** 生产下胶厚度(mm) */ @JsonProperty("ProductionLowerGlueThickness") private double ProductionLowerGlueThickness; - /** 下缓冲粘合厚度 */ + /** 下缓冲胶厚度(mm) */ @JsonProperty("LowerBufferAdhesiveThickness") private double LowerBufferAdhesiveThickness; - /** 布粘合厚度 */ + /** 布胶厚度 */ @JsonProperty("ClothGlueThickness") private double ClothGlueThickness; - /** 小布料层 */ + /** 小布用布布层 */ @JsonProperty("SmallClothFabricLayer") - private int SmallClothFabricLayer; + private double SmallClothFabricLayer; - /** 小布厚度 */ + /** 小布布料厚度(mm) */ @JsonProperty("SmallClothThickness") - private int SmallClothThickness; + private double SmallClothThickness; - /** 是否需要加厚 */ + /** 是否需要每层加厚 */ @JsonProperty("IsNeedThicken") private String IsNeedThicken; - /** 每层加厚厚度 */ + /** 每层加厚厚度(mm) */ @JsonProperty("EachLayerThickenThickness") - private int EachLayerThickenThickness; + private double EachLayerThickenThickness; - /** 额外加厚厚度 */ + /** 额外加厚厚度(mm) */ @JsonProperty("ExtraThickeningThickness") - private int ExtraThickeningThickness; + private double ExtraThickeningThickness; - /** 总生产厚度 */ + /** 生产总厚度(mm) */ @JsonProperty("TotalProductionThickness") private double TotalProductionThickness; - /** 额外厚度 */ + /** 压延追加厚度 */ @JsonProperty("AdditionalThickness") private double AdditionalThickness; - /** 推荐垫片厚度 */ + /** 推荐垫铁厚度(mm) */ @JsonProperty("RecommendedShimThickness") - private int RecommendedShimThickness; + private double RecommendedShimThickness; - /** 半成品宽度 */ + /** 推荐半成品宽度(mm) */ @JsonProperty("SemiFinishedProductWidth") - private int SemiFinishedProductWidth; + private double SemiFinishedProductWidth; - /** 轧制生产米数 */ + /** 压延生产米数(m) */ @JsonProperty("RollingProductionMeters") private double RollingProductionMeters; - /** 推荐垫片宽度 */ + /** 推荐垫布宽度(mm) */ @JsonProperty("RecommendedPadWidth") - private int RecommendedPadWidth; + private double RecommendedPadWidth; - /** 大布料制造商 */ + /** 大布厂家 */ @JsonProperty("BigFabricManufacturer") private String BigFabricManufacturer; @@ -98,39 +98,39 @@ public class RecordData { @JsonProperty("FabricSpecifications") private Material FabricSpecifications; - /** 估计布料使用量 */ + /** 预计布料使用量(m) */ @JsonProperty("EstimatedFabricUsage") private double EstimatedFabricUsage; - /** 布宽 */ + /** 布宽度(mm) */ @JsonProperty("ClothWidth") - private int ClothWidth; + private double ClothWidth; - /** 布重 */ + /** 布重量(kg) */ @JsonProperty("ClothWeight") private double ClothWeight; - /** 小布料规格字典 */ + /** 小布使用布料规格 */ @JsonProperty("SmallFabricSpecificationsDic") private Material SmallFabricSpecificationsDic; - /** 小布宽 */ + /** 小布宽度(mm) */ @JsonProperty("SmallClothWidth") - private int SmallClothWidth; + private double SmallClothWidth; - /** 小布使用量 */ + /** 小布布料使用量(m) */ @JsonProperty("SmallClothUsage") private double SmallClothUsage; - /** 小布重量 */ + /** 小布用布重量(kg) */ @JsonProperty("SmallClothWeight") private double SmallClothWeight; - /** 粘合工艺 */ + /** 用胶工艺 */ @JsonProperty("GluingProcess") private String GluingProcess; - /** 上下胶 */ + /** 上下胶使用胶料 */ @JsonProperty("UpperLowerGlue") private UpperLowerGlue UpperLowerGlue; @@ -138,11 +138,11 @@ public class RecordData { @JsonProperty("UpperLowerGlueCoefficient") private double UpperLowerGlueCoefficient; - /** 上下胶使用量 */ + /** 上下胶标准用胶量(kg) */ @JsonProperty("UpperLowerGlueUsage") private double UpperLowerGlueUsage; - /** 下胶 */ + /** 下胶使用胶料 */ @JsonProperty("LowerGlue") private HashMap LowerGlue; @@ -150,11 +150,11 @@ public class RecordData { @JsonProperty("LowerGlueCoefficient") private double LowerGlueCoefficient; - /** 下胶使用量 */ + /** 下胶标准用胶量(kg) */ @JsonProperty("LowerGlueUsage") private double LowerGlueUsage; - /** 大布胶 */ + /** 大布胶使用胶料 */ @JsonProperty("LargeClothGlue") private HashMap LargeClothGlue; @@ -162,11 +162,11 @@ public class RecordData { @JsonProperty("LargeClothGlueCoefficient") private double LargeClothGlueCoefficient; - /** 大布胶使用量 */ + /** 胶布标准用胶量(kg) */ @JsonProperty("LargeClothGlueUsage") private double LargeClothGlueUsage; - /** 缓冲胶使用量 */ + /** 上下缓冲胶标准用胶量(kg) */ @JsonProperty("BufferGlueUsage") private double BufferGlueUsage; @@ -182,33 +182,33 @@ public class RecordData { @JsonProperty("MiddleGlueUsage") private double MiddleGlueUsage; - /** 小棒宽度 */ + /** 小条宽度 */ @JsonProperty("SmallBarWidth") - private int SmallBarWidth; + private double SmallBarWidth; - /** 小棒厚度 */ + /** 小条厚度 */ @JsonProperty("SmallBarThickness") - private int SmallBarThickness; + private double SmallBarThickness; - /** 小棒标准使用量 */ + /** 小条标准使用量(kg) */ @JsonProperty("SmallBarStandardUsage") - private int SmallBarStandardUsage; + private double SmallBarStandardUsage; - /** 成型区 */ + /** 成型面积 */ @JsonProperty("FormingArea") - private int FormingArea; + private double FormingArea; - /** 涂辊区 */ + /** 压延包胶面积 */ @JsonProperty("RollCoatingArea") - private int RollCoatingArea; + private double RollCoatingArea; - /** 卷布区 */ + /** 压延出布面积 */ @JsonProperty("RolledFabricArea") - private int RolledFabricArea; + private double RolledFabricArea; - /** 硫化区 */ + /** 硫化面积 */ @JsonProperty("SulfurizationArea") - private int SulfurizationArea; + private double SulfurizationArea; /** 大布面积 */ @JsonProperty("LargeClothArea") @@ -218,27 +218,27 @@ public class RecordData { @JsonProperty("SmallClothArea") private double SmallClothArea; - /** 带总面积 */ + /** 输送带总面积 */ @JsonProperty("BeltTotalArea") - private int BeltTotalArea; + private double BeltTotalArea; /** 裙边面积 */ @JsonProperty("SkirtArea") - private int SkirtArea; + private double SkirtArea; - /** 隔断面积 */ + /** 隔板面积 */ @JsonProperty("PartitionArea") - private int PartitionArea; + private double PartitionArea; - /** 封边总面积 */ + /** 挡边带总面积 */ @JsonProperty("EdgeBandingTotalArea") - private int EdgeBandingTotalArea; + private double EdgeBandingTotalArea; - /** 钢丝绳带总面积 */ + /** 钢丝绳输送带工资总面积 */ @JsonProperty("WireropeBeltTotalArea") - private int WireropeBeltTotalArea; + private double WireropeBeltTotalArea; - /** 订单日期 */ + /** 下单日期 */ @JsonProperty("OrderDate") private String OrderDate; @@ -246,7 +246,7 @@ public class RecordData { @JsonProperty("DeliveryDate") private String DeliveryDate; - /** 序号 */ + /** 任务编号 */ @JsonProperty("SeqNo") private String SeqNo; @@ -258,7 +258,7 @@ public class RecordData { @JsonProperty("ProductStatus") private String ProductStatus; - /** 订单所有者 */ + /** 订单所属 */ @JsonProperty("OrderOwner") private String OrderOwner; @@ -266,11 +266,11 @@ public class RecordData { @JsonProperty("CustomerInfo") private String CustomerInfo; - /** 带长规格 */ + /** 输送带长度规格 */ @JsonProperty("BeltLengthSpecifications") private String BeltLengthSpecifications; - /** 面积和重量 */ + /** 面积与重量 */ @JsonProperty("AreaAndWeight") private String AreaAndWeight; @@ -278,11 +278,11 @@ public class RecordData { @JsonProperty("UsingRawMaterials") private String UsingRawMaterials; - public int getBeltWidth() { + public double getBeltWidth() { return BeltWidth; } - public void setBeltWidth(int beltWidth) { + public void setBeltWidth(double beltWidth) { BeltWidth = beltWidth; } @@ -294,27 +294,27 @@ public class RecordData { BeltClothLayer = beltClothLayer; } - public int getBeltRequiredLength() { + public double getBeltRequiredLength() { return BeltRequiredLength; } - public void setBeltRequiredLength(int beltRequiredLength) { + public void setBeltRequiredLength(double beltRequiredLength) { BeltRequiredLength = beltRequiredLength; } - public int getGluingRequiredThickness() { + public double getGluingRequiredThickness() { return GluingRequiredThickness; } - public void setGluingRequiredThickness(int gluingRequiredThickness) { + public void setGluingRequiredThickness(double gluingRequiredThickness) { GluingRequiredThickness = gluingRequiredThickness; } - public int getLowerGlueRequiredThickness() { + public double getLowerGlueRequiredThickness() { return LowerGlueRequiredThickness; } - public void setLowerGlueRequiredThickness(int lowerGlueRequiredThickness) { + public void setLowerGlueRequiredThickness(double lowerGlueRequiredThickness) { LowerGlueRequiredThickness = lowerGlueRequiredThickness; } @@ -326,11 +326,11 @@ public class RecordData { ProductionGluingThickness = productionGluingThickness; } - public int getUpperBufferAdhesiveThickness() { + public double getUpperBufferAdhesiveThickness() { return UpperBufferAdhesiveThickness; } - public void setUpperBufferAdhesiveThickness(int upperBufferAdhesiveThickness) { + public void setUpperBufferAdhesiveThickness(double upperBufferAdhesiveThickness) { UpperBufferAdhesiveThickness = upperBufferAdhesiveThickness; } @@ -358,19 +358,19 @@ public class RecordData { ClothGlueThickness = clothGlueThickness; } - public int getSmallClothFabricLayer() { + public double getSmallClothFabricLayer() { return SmallClothFabricLayer; } - public void setSmallClothFabricLayer(int smallClothFabricLayer) { + public void setSmallClothFabricLayer(double smallClothFabricLayer) { SmallClothFabricLayer = smallClothFabricLayer; } - public int getSmallClothThickness() { + public double getSmallClothThickness() { return SmallClothThickness; } - public void setSmallClothThickness(int smallClothThickness) { + public void setSmallClothThickness(double smallClothThickness) { SmallClothThickness = smallClothThickness; } @@ -382,19 +382,19 @@ public class RecordData { IsNeedThicken = isNeedThicken; } - public int getEachLayerThickenThickness() { + public double getEachLayerThickenThickness() { return EachLayerThickenThickness; } - public void setEachLayerThickenThickness(int eachLayerThickenThickness) { + public void setEachLayerThickenThickness(double eachLayerThickenThickness) { EachLayerThickenThickness = eachLayerThickenThickness; } - public int getExtraThickeningThickness() { + public double getExtraThickeningThickness() { return ExtraThickeningThickness; } - public void setExtraThickeningThickness(int extraThickeningThickness) { + public void setExtraThickeningThickness(double extraThickeningThickness) { ExtraThickeningThickness = extraThickeningThickness; } @@ -414,19 +414,19 @@ public class RecordData { AdditionalThickness = additionalThickness; } - public int getRecommendedShimThickness() { + public double getRecommendedShimThickness() { return RecommendedShimThickness; } - public void setRecommendedShimThickness(int recommendedShimThickness) { + public void setRecommendedShimThickness(double recommendedShimThickness) { RecommendedShimThickness = recommendedShimThickness; } - public int getSemiFinishedProductWidth() { + public double getSemiFinishedProductWidth() { return SemiFinishedProductWidth; } - public void setSemiFinishedProductWidth(int semiFinishedProductWidth) { + public void setSemiFinishedProductWidth(double semiFinishedProductWidth) { SemiFinishedProductWidth = semiFinishedProductWidth; } @@ -438,11 +438,11 @@ public class RecordData { RollingProductionMeters = rollingProductionMeters; } - public int getRecommendedPadWidth() { + public double getRecommendedPadWidth() { return RecommendedPadWidth; } - public void setRecommendedPadWidth(int recommendedPadWidth) { + public void setRecommendedPadWidth(double recommendedPadWidth) { RecommendedPadWidth = recommendedPadWidth; } @@ -470,11 +470,11 @@ public class RecordData { EstimatedFabricUsage = estimatedFabricUsage; } - public int getClothWidth() { + public double getClothWidth() { return ClothWidth; } - public void setClothWidth(int clothWidth) { + public void setClothWidth(double clothWidth) { ClothWidth = clothWidth; } @@ -494,11 +494,11 @@ public class RecordData { SmallFabricSpecificationsDic = smallFabricSpecificationsDic; } - public int getSmallClothWidth() { + public double getSmallClothWidth() { return SmallClothWidth; } - public void setSmallClothWidth(int smallClothWidth) { + public void setSmallClothWidth(double smallClothWidth) { SmallClothWidth = smallClothWidth; } @@ -630,59 +630,59 @@ public class RecordData { MiddleGlueUsage = middleGlueUsage; } - public int getSmallBarWidth() { + public double getSmallBarWidth() { return SmallBarWidth; } - public void setSmallBarWidth(int smallBarWidth) { + public void setSmallBarWidth(double smallBarWidth) { SmallBarWidth = smallBarWidth; } - public int getSmallBarThickness() { + public double getSmallBarThickness() { return SmallBarThickness; } - public void setSmallBarThickness(int smallBarThickness) { + public void setSmallBarThickness(double smallBarThickness) { SmallBarThickness = smallBarThickness; } - public int getSmallBarStandardUsage() { + public double getSmallBarStandardUsage() { return SmallBarStandardUsage; } - public void setSmallBarStandardUsage(int smallBarStandardUsage) { + public void setSmallBarStandardUsage(double smallBarStandardUsage) { SmallBarStandardUsage = smallBarStandardUsage; } - public int getFormingArea() { + public double getFormingArea() { return FormingArea; } - public void setFormingArea(int formingArea) { + public void setFormingArea(double formingArea) { FormingArea = formingArea; } - public int getRollCoatingArea() { + public double getRollCoatingArea() { return RollCoatingArea; } - public void setRollCoatingArea(int rollCoatingArea) { + public void setRollCoatingArea(double rollCoatingArea) { RollCoatingArea = rollCoatingArea; } - public int getRolledFabricArea() { + public double getRolledFabricArea() { return RolledFabricArea; } - public void setRolledFabricArea(int rolledFabricArea) { + public void setRolledFabricArea(double rolledFabricArea) { RolledFabricArea = rolledFabricArea; } - public int getSulfurizationArea() { + public double getSulfurizationArea() { return SulfurizationArea; } - public void setSulfurizationArea(int sulfurizationArea) { + public void setSulfurizationArea(double sulfurizationArea) { SulfurizationArea = sulfurizationArea; } @@ -702,43 +702,43 @@ public class RecordData { SmallClothArea = smallClothArea; } - public int getBeltTotalArea() { + public double getBeltTotalArea() { return BeltTotalArea; } - public void setBeltTotalArea(int beltTotalArea) { + public void setBeltTotalArea(double beltTotalArea) { BeltTotalArea = beltTotalArea; } - public int getSkirtArea() { + public double getSkirtArea() { return SkirtArea; } - public void setSkirtArea(int skirtArea) { + public void setSkirtArea(double skirtArea) { SkirtArea = skirtArea; } - public int getPartitionArea() { + public double getPartitionArea() { return PartitionArea; } - public void setPartitionArea(int partitionArea) { + public void setPartitionArea(double partitionArea) { PartitionArea = partitionArea; } - public int getEdgeBandingTotalArea() { + public double getEdgeBandingTotalArea() { return EdgeBandingTotalArea; } - public void setEdgeBandingTotalArea(int edgeBandingTotalArea) { + public void setEdgeBandingTotalArea(double edgeBandingTotalArea) { EdgeBandingTotalArea = edgeBandingTotalArea; } - public int getWireropeBeltTotalArea() { + public double getWireropeBeltTotalArea() { return WireropeBeltTotalArea; } - public void setWireropeBeltTotalArea(int wireropeBeltTotalArea) { + public void setWireropeBeltTotalArea(double wireropeBeltTotalArea) { WireropeBeltTotalArea = wireropeBeltTotalArea; } diff --git a/os-mes/src/main/java/com/os/mes/api/domain/ReturnData.java b/os-mes/src/main/java/com/os/mes/api/domain/ReturnData.java index ee873b9..1f133c6 100644 --- a/os-mes/src/main/java/com/os/mes/api/domain/ReturnData.java +++ b/os-mes/src/main/java/com/os/mes/api/domain/ReturnData.java @@ -9,15 +9,31 @@ import java.util.List; */ public class ReturnData { + /** + * 总数 + */ @JsonProperty(value = "totle") private int totle; + + /** + * 数据列表 + */ @JsonProperty(value = "data") private List data; + + /** + * 结果 + */ @JsonProperty(value = "result") private String result; + + /** + * 消息 + */ @JsonProperty(value = "message") private String message; + public int getTotle() { return totle; } 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 bb1c032..cc17002 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 @@ -5,13 +5,26 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; public class UpperLowerGlue { + + /** + * 第一次投料明细 + */ @JsonProperty(value = "MaterialList_1") private List MaterialList_1; + + /** + * 第二次投料明细 + */ @JsonProperty(value = "MaterialList_2") private List MaterialList_2; + + /** + * 加促后重量合计 + */ @JsonProperty(value = "AfterPromotionTotalWeight") private double AfterPromotionTotalWeight; + public List getMaterialList_1() { return MaterialList_1; } diff --git a/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem1.java b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem1.java index 9e4819d..775d612 100644 --- a/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem1.java +++ b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem1.java @@ -4,13 +4,19 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class UpperLowerGlueItem1 { + /** 物料编号 */ @JsonProperty(value = "MaterialNo") private String MaterialNo; + + /** 材料 */ @JsonProperty(value = "Material") private Material Material; + + /** 进入二道时重量(KG) */ @JsonProperty(value = "EnterSecondLaneWeight") private double EnterSecondLaneWeight; + public String getMaterialNo() { return MaterialNo; } diff --git a/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem2.java b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem2.java index 43659bf..8307760 100644 --- a/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem2.java +++ b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem2.java @@ -4,13 +4,25 @@ import com.fasterxml.jackson.annotation.JsonProperty; public class UpperLowerGlueItem2 { + /** + * 物料编号 + */ @JsonProperty(value = "MaterialNo") private String MaterialNo; + + /** + * 材料 + */ @JsonProperty(value = "Material") private Material Material; + + /** + * 生产需要重量(kg) + */ @JsonProperty(value = "ProductionRequiresWeight") private double ProductionRequiresWeight; + public String getMaterialNo() { return MaterialNo; }