change - ERP订单明细增加

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"};

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));
     }
 
 

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;
     }
 

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 {
 
     /**

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<ProdOrderDetail> getERPOrderData(ERPParamDto paramDto);
 
 }

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));
     }
 

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;
     }
 

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);
 }

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<ProdOrderInfo> 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<ProdOrderDetail> 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;
+    }
 }

os-mes/src/main/resources/mapper/mes/record/RecordStaffAttendanceMapper.xml

@@ -53,6 +53,7 @@
             <if test="createTime != null ">and rsa.create_time = #{createTime}</if>
             <if test="machineCode != null  and machineCode != ''">and rsa.machine_code = #{machineCode}</if>
         </where>
+        order by rsa.create_time desc
     </select>
 
     <select id="selectRecordStaffAttendanceByObjId" parameterType="Long" resultMap="RecordStaffAttendanceResult">