diff --git a/os-common/pom.xml b/os-common/pom.xml index d5d5d00..5d5b1f3 100644 --- a/os-common/pom.xml +++ b/os-common/pom.xml @@ -153,6 +153,12 @@ javax.servlet-api + + cn.hutool + hutool-all + 5.8.20 + + \ No newline at end of file diff --git a/os-framework/src/main/java/com/os/framework/config/SecurityConfig.java b/os-framework/src/main/java/com/os/framework/config/SecurityConfig.java index af62d1e..de20e1c 100644 --- a/os-framework/src/main/java/com/os/framework/config/SecurityConfig.java +++ b/os-framework/src/main/java/com/os/framework/config/SecurityConfig.java @@ -131,6 +131,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() .antMatchers("/websocket/**").permitAll() + .antMatchers("/erp/**").permitAll() .antMatchers("/magic/web/**").anonymous() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() 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 new file mode 100644 index 0000000..52fd965 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/controller/ERPPortController.java @@ -0,0 +1,45 @@ +package com.os.mes.api.controller; + +import com.os.common.core.controller.BaseController; +import com.os.common.core.domain.AjaxResult; +import com.os.mes.api.domain.ERPParamDto; +import com.os.mes.api.service.IERPPortService; +import com.os.mes.base.service.IBaseCustomDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * ERP接口Controller + * + * @author Yinq + * @date 2024-05-10 + */ +@RestController +@RequestMapping("/erp") +public class ERPPortController extends BaseController { + @Autowired + private IERPPortService portService; + + + /** + * 获取ERP订单接口 + * + * @param paramMap + * @return + */ + @PostMapping("/getERPOrderData") + public AjaxResult getERPOrderData(@RequestBody Map paramMap) { + ERPParamDto paramDto = new ERPParamDto(); + paramDto.setAppCode(String.valueOf(paramMap.get("AppCode"))); + paramDto.setController(String.valueOf(paramMap.get("Controller"))); + 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); + } + + +} 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 new file mode 100644 index 0000000..c41ffc9 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/ERPParamDto.java @@ -0,0 +1,86 @@ +package com.os.mes.api.domain; + + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * ERP接口请求参数实体 + * @Author YinQ + * @create 2023-09-26 14:46 + */ +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; // 下单日期_截止时间 + + + public String getAppCode() { + return AppCode; + } + + public void setAppCode(String appCode) { + AppCode = appCode; + } + + public String getController() { + return Controller; + } + + public void setController(String controller) { + Controller = controller; + } + + public String getActionName() { + return ActionName; + } + + public void setActionName(String actionName) { + ActionName = actionName; + } + + public String getSeqNo() { + return SeqNo; + } + + public void setSeqNo(String seqNo) { + SeqNo = seqNo; + } + + public String getProductStatus() { + return ProductStatus; + } + + public void setProductStatus(String productStatus) { + ProductStatus = productStatus; + } + + public String getOrderStartTime() { + return OrderStartTime; + } + + public void setOrderStartTime(String orderStartTime) { + OrderStartTime = orderStartTime; + } + + public String getOrderEndTime() { + return OrderEndTime; + } + + public void setOrderEndTime(String orderEndTime) { + OrderEndTime = orderEndTime; + } +} diff --git a/os-mes/src/main/java/com/os/mes/api/domain/Material.java b/os-mes/src/main/java/com/os/mes/api/domain/Material.java new file mode 100644 index 0000000..172dd4d --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/Material.java @@ -0,0 +1,66 @@ +package com.os.mes.api.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class Material { + + /** 材料编号 */ + @JsonProperty("MaterialNo") + private String MaterialNo; + + /** 材料名称 */ + @JsonProperty("MaterialName") + private String MaterialName; + + /** 材料规格 */ + @JsonProperty("MaterialSpecification") + private String MaterialSpecification; + + /** 材料大类 */ + @JsonProperty("MaterialLargeCategories") + private String MaterialLargeCategories; + + /** 材料小类 */ + @JsonProperty("MaterialSmallCategories") + private String MaterialSmallCategories; + + public String getMaterialNo() { + return MaterialNo; + } + + public void setMaterialNo(String materialNo) { + MaterialNo = materialNo; + } + + public String getMaterialName() { + return MaterialName; + } + + public void setMaterialName(String materialName) { + MaterialName = materialName; + } + + public String getMaterialSpecification() { + return MaterialSpecification; + } + + public void setMaterialSpecification(String materialSpecification) { + MaterialSpecification = materialSpecification; + } + + public String getMaterialLargeCategories() { + return MaterialLargeCategories; + } + + public void setMaterialLargeCategories(String materialLargeCategories) { + MaterialLargeCategories = materialLargeCategories; + } + + public String getMaterialSmallCategories() { + return MaterialSmallCategories; + } + + public void setMaterialSmallCategories(String materialSmallCategories) { + MaterialSmallCategories = materialSmallCategories; + } +} 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 new file mode 100644 index 0000000..f17a00e --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/RecordData.java @@ -0,0 +1,824 @@ +package com.os.mes.api.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.HashMap; + +public class RecordData { + + /** 带宽 */ + @JsonProperty("BeltWidth") + private int BeltWidth; + + /** 带布层 */ + @JsonProperty("BeltClothLayer") + private int BeltClothLayer; + + /** 带所需长度 */ + @JsonProperty("BeltRequiredLength") + private int BeltRequiredLength; + + /** 粘合所需厚度 */ + @JsonProperty("GluingRequiredThickness") + private int GluingRequiredThickness; + + /** 下胶所需厚度 */ + @JsonProperty("LowerGlueRequiredThickness") + private int LowerGlueRequiredThickness; + + /** 生产粘合厚度 */ + @JsonProperty("ProductionGluingThickness") + private double ProductionGluingThickness; + + /** 上缓冲粘合厚度 */ + @JsonProperty("UpperBufferAdhesiveThickness") + private int UpperBufferAdhesiveThickness; + + /** 生产下胶厚度 */ + @JsonProperty("ProductionLowerGlueThickness") + private double ProductionLowerGlueThickness; + + /** 下缓冲粘合厚度 */ + @JsonProperty("LowerBufferAdhesiveThickness") + private double LowerBufferAdhesiveThickness; + + /** 布粘合厚度 */ + @JsonProperty("ClothGlueThickness") + private double ClothGlueThickness; + + /** 小布料层 */ + @JsonProperty("SmallClothFabricLayer") + private int SmallClothFabricLayer; + + /** 小布厚度 */ + @JsonProperty("SmallClothThickness") + private int SmallClothThickness; + + /** 是否需要加厚 */ + @JsonProperty("IsNeedThicken") + private String IsNeedThicken; + + /** 每层加厚厚度 */ + @JsonProperty("EachLayerThickenThickness") + private int EachLayerThickenThickness; + + /** 额外加厚厚度 */ + @JsonProperty("ExtraThickeningThickness") + private int ExtraThickeningThickness; + + /** 总生产厚度 */ + @JsonProperty("TotalProductionThickness") + private double TotalProductionThickness; + + /** 额外厚度 */ + @JsonProperty("AdditionalThickness") + private double AdditionalThickness; + + /** 推荐垫片厚度 */ + @JsonProperty("RecommendedShimThickness") + private int RecommendedShimThickness; + + /** 半成品宽度 */ + @JsonProperty("SemiFinishedProductWidth") + private int SemiFinishedProductWidth; + + /** 轧制生产米数 */ + @JsonProperty("RollingProductionMeters") + private double RollingProductionMeters; + + /** 推荐垫片宽度 */ + @JsonProperty("RecommendedPadWidth") + private int RecommendedPadWidth; + + /** 大布料制造商 */ + @JsonProperty("BigFabricManufacturer") + private String BigFabricManufacturer; + + /** 布料规格 */ + @JsonProperty("FabricSpecifications") + private Material FabricSpecifications; + + /** 估计布料使用量 */ + @JsonProperty("EstimatedFabricUsage") + private double EstimatedFabricUsage; + + /** 布宽 */ + @JsonProperty("ClothWidth") + private int ClothWidth; + + /** 布重 */ + @JsonProperty("ClothWeight") + private double ClothWeight; + + /** 小布料规格字典 */ + @JsonProperty("SmallFabricSpecificationsDic") + private Material SmallFabricSpecificationsDic; + + /** 小布宽 */ + @JsonProperty("SmallClothWidth") + private int SmallClothWidth; + + /** 小布使用量 */ + @JsonProperty("SmallClothUsage") + private double SmallClothUsage; + + /** 小布重量 */ + @JsonProperty("SmallClothWeight") + private double SmallClothWeight; + + /** 粘合工艺 */ + @JsonProperty("GluingProcess") + private String GluingProcess; + + /** 上下胶 */ + @JsonProperty("UpperLowerGlue") + private UpperLowerGlue UpperLowerGlue; + + /** 上下胶系数 */ + @JsonProperty("UpperLowerGlueCoefficient") + private double UpperLowerGlueCoefficient; + + /** 上下胶使用量 */ + @JsonProperty("UpperLowerGlueUsage") + private double UpperLowerGlueUsage; + + /** 下胶 */ + @JsonProperty("LowerGlue") + private HashMap LowerGlue; + + /** 下胶系数 */ + @JsonProperty("LowerGlueCoefficient") + private double LowerGlueCoefficient; + + /** 下胶使用量 */ + @JsonProperty("LowerGlueUsage") + private double LowerGlueUsage; + + /** 大布胶 */ + @JsonProperty("LargeClothGlue") + private HashMap LargeClothGlue; + + /** 大布胶系数 */ + @JsonProperty("LargeClothGlueCoefficient") + private double LargeClothGlueCoefficient; + + /** 大布胶使用量 */ + @JsonProperty("LargeClothGlueUsage") + private double LargeClothGlueUsage; + + /** 缓冲胶使用量 */ + @JsonProperty("BufferGlueUsage") + private double BufferGlueUsage; + + /** 中间胶 */ + @JsonProperty("MiddleGlue") + private HashMap MiddleGlue; + + /** 中间胶系数 */ + @JsonProperty("MiddleGlueCoefficient") + private double MiddleGlueCoefficient; + + /** 中间胶使用量 */ + @JsonProperty("MiddleGlueUsage") + private double MiddleGlueUsage; + + /** 小棒宽度 */ + @JsonProperty("SmallBarWidth") + private int SmallBarWidth; + + /** 小棒厚度 */ + @JsonProperty("SmallBarThickness") + private int SmallBarThickness; + + /** 小棒标准使用量 */ + @JsonProperty("SmallBarStandardUsage") + private int SmallBarStandardUsage; + + /** 成型区 */ + @JsonProperty("FormingArea") + private int FormingArea; + + /** 涂辊区 */ + @JsonProperty("RollCoatingArea") + private int RollCoatingArea; + + /** 卷布区 */ + @JsonProperty("RolledFabricArea") + private int RolledFabricArea; + + /** 硫化区 */ + @JsonProperty("SulfurizationArea") + private int SulfurizationArea; + + /** 大布面积 */ + @JsonProperty("LargeClothArea") + private double LargeClothArea; + + /** 小布面积 */ + @JsonProperty("SmallClothArea") + private double SmallClothArea; + + /** 带总面积 */ + @JsonProperty("BeltTotalArea") + private int BeltTotalArea; + + /** 裙边面积 */ + @JsonProperty("SkirtArea") + private int SkirtArea; + + /** 隔断面积 */ + @JsonProperty("PartitionArea") + private int PartitionArea; + + /** 封边总面积 */ + @JsonProperty("EdgeBandingTotalArea") + private int EdgeBandingTotalArea; + + /** 钢丝绳带总面积 */ + @JsonProperty("WireropeBeltTotalArea") + private int WireropeBeltTotalArea; + + /** 订单日期 */ + @JsonProperty("OrderDate") + private String OrderDate; + + /** 交货日期 */ + @JsonProperty("DeliveryDate") + private String DeliveryDate; + + /** 序号 */ + @JsonProperty("SeqNo") + private String SeqNo; + + /** 产品类型 */ + @JsonProperty("ProductType") + private String ProductType; + + /** 产品状态 */ + @JsonProperty("ProductStatus") + private String ProductStatus; + + /** 订单所有者 */ + @JsonProperty("OrderOwner") + private String OrderOwner; + + /** 客户信息 */ + @JsonProperty("CustomerInfo") + private String CustomerInfo; + + /** 带长规格 */ + @JsonProperty("BeltLengthSpecifications") + private String BeltLengthSpecifications; + + /** 面积和重量 */ + @JsonProperty("AreaAndWeight") + private String AreaAndWeight; + + /** 使用原材料 */ + @JsonProperty("UsingRawMaterials") + private String UsingRawMaterials; + + public int getBeltWidth() { + return BeltWidth; + } + + public void setBeltWidth(int beltWidth) { + BeltWidth = beltWidth; + } + + public int getBeltClothLayer() { + return BeltClothLayer; + } + + public void setBeltClothLayer(int beltClothLayer) { + BeltClothLayer = beltClothLayer; + } + + public int getBeltRequiredLength() { + return BeltRequiredLength; + } + + public void setBeltRequiredLength(int beltRequiredLength) { + BeltRequiredLength = beltRequiredLength; + } + + public int getGluingRequiredThickness() { + return GluingRequiredThickness; + } + + public void setGluingRequiredThickness(int gluingRequiredThickness) { + GluingRequiredThickness = gluingRequiredThickness; + } + + public int getLowerGlueRequiredThickness() { + return LowerGlueRequiredThickness; + } + + public void setLowerGlueRequiredThickness(int lowerGlueRequiredThickness) { + LowerGlueRequiredThickness = lowerGlueRequiredThickness; + } + + public double getProductionGluingThickness() { + return ProductionGluingThickness; + } + + public void setProductionGluingThickness(double productionGluingThickness) { + ProductionGluingThickness = productionGluingThickness; + } + + public int getUpperBufferAdhesiveThickness() { + return UpperBufferAdhesiveThickness; + } + + public void setUpperBufferAdhesiveThickness(int upperBufferAdhesiveThickness) { + UpperBufferAdhesiveThickness = upperBufferAdhesiveThickness; + } + + public double getProductionLowerGlueThickness() { + return ProductionLowerGlueThickness; + } + + public void setProductionLowerGlueThickness(double productionLowerGlueThickness) { + ProductionLowerGlueThickness = productionLowerGlueThickness; + } + + public double getLowerBufferAdhesiveThickness() { + return LowerBufferAdhesiveThickness; + } + + public void setLowerBufferAdhesiveThickness(double lowerBufferAdhesiveThickness) { + LowerBufferAdhesiveThickness = lowerBufferAdhesiveThickness; + } + + public double getClothGlueThickness() { + return ClothGlueThickness; + } + + public void setClothGlueThickness(double clothGlueThickness) { + ClothGlueThickness = clothGlueThickness; + } + + public int getSmallClothFabricLayer() { + return SmallClothFabricLayer; + } + + public void setSmallClothFabricLayer(int smallClothFabricLayer) { + SmallClothFabricLayer = smallClothFabricLayer; + } + + public int getSmallClothThickness() { + return SmallClothThickness; + } + + public void setSmallClothThickness(int smallClothThickness) { + SmallClothThickness = smallClothThickness; + } + + public String getIsNeedThicken() { + return IsNeedThicken; + } + + public void setIsNeedThicken(String isNeedThicken) { + IsNeedThicken = isNeedThicken; + } + + public int getEachLayerThickenThickness() { + return EachLayerThickenThickness; + } + + public void setEachLayerThickenThickness(int eachLayerThickenThickness) { + EachLayerThickenThickness = eachLayerThickenThickness; + } + + public int getExtraThickeningThickness() { + return ExtraThickeningThickness; + } + + public void setExtraThickeningThickness(int extraThickeningThickness) { + ExtraThickeningThickness = extraThickeningThickness; + } + + public double getTotalProductionThickness() { + return TotalProductionThickness; + } + + public void setTotalProductionThickness(double totalProductionThickness) { + TotalProductionThickness = totalProductionThickness; + } + + public double getAdditionalThickness() { + return AdditionalThickness; + } + + public void setAdditionalThickness(double additionalThickness) { + AdditionalThickness = additionalThickness; + } + + public int getRecommendedShimThickness() { + return RecommendedShimThickness; + } + + public void setRecommendedShimThickness(int recommendedShimThickness) { + RecommendedShimThickness = recommendedShimThickness; + } + + public int getSemiFinishedProductWidth() { + return SemiFinishedProductWidth; + } + + public void setSemiFinishedProductWidth(int semiFinishedProductWidth) { + SemiFinishedProductWidth = semiFinishedProductWidth; + } + + public double getRollingProductionMeters() { + return RollingProductionMeters; + } + + public void setRollingProductionMeters(double rollingProductionMeters) { + RollingProductionMeters = rollingProductionMeters; + } + + public int getRecommendedPadWidth() { + return RecommendedPadWidth; + } + + public void setRecommendedPadWidth(int recommendedPadWidth) { + RecommendedPadWidth = recommendedPadWidth; + } + + public String getBigFabricManufacturer() { + return BigFabricManufacturer; + } + + public void setBigFabricManufacturer(String bigFabricManufacturer) { + BigFabricManufacturer = bigFabricManufacturer; + } + + public Material getFabricSpecifications() { + return FabricSpecifications; + } + + public void setFabricSpecifications(Material fabricSpecifications) { + FabricSpecifications = fabricSpecifications; + } + + public double getEstimatedFabricUsage() { + return EstimatedFabricUsage; + } + + public void setEstimatedFabricUsage(double estimatedFabricUsage) { + EstimatedFabricUsage = estimatedFabricUsage; + } + + public int getClothWidth() { + return ClothWidth; + } + + public void setClothWidth(int clothWidth) { + ClothWidth = clothWidth; + } + + public double getClothWeight() { + return ClothWeight; + } + + public void setClothWeight(double clothWeight) { + ClothWeight = clothWeight; + } + + public Material getSmallFabricSpecificationsDic() { + return SmallFabricSpecificationsDic; + } + + public void setSmallFabricSpecificationsDic(Material smallFabricSpecificationsDic) { + SmallFabricSpecificationsDic = smallFabricSpecificationsDic; + } + + public int getSmallClothWidth() { + return SmallClothWidth; + } + + public void setSmallClothWidth(int smallClothWidth) { + SmallClothWidth = smallClothWidth; + } + + public double getSmallClothUsage() { + return SmallClothUsage; + } + + public void setSmallClothUsage(double smallClothUsage) { + SmallClothUsage = smallClothUsage; + } + + public double getSmallClothWeight() { + return SmallClothWeight; + } + + public void setSmallClothWeight(double smallClothWeight) { + SmallClothWeight = smallClothWeight; + } + + public String getGluingProcess() { + return GluingProcess; + } + + public void setGluingProcess(String gluingProcess) { + GluingProcess = gluingProcess; + } + + public UpperLowerGlue getUpperLowerGlue() { + return UpperLowerGlue; + } + + public void setUpperLowerGlue(UpperLowerGlue upperLowerGlue) { + UpperLowerGlue = upperLowerGlue; + } + + public double getUpperLowerGlueCoefficient() { + return UpperLowerGlueCoefficient; + } + + public void setUpperLowerGlueCoefficient(double upperLowerGlueCoefficient) { + UpperLowerGlueCoefficient = upperLowerGlueCoefficient; + } + + public double getUpperLowerGlueUsage() { + return UpperLowerGlueUsage; + } + + public void setUpperLowerGlueUsage(double upperLowerGlueUsage) { + UpperLowerGlueUsage = upperLowerGlueUsage; + } + + public HashMap getLowerGlue() { + return LowerGlue; + } + + public void setLowerGlue(HashMap lowerGlue) { + LowerGlue = lowerGlue; + } + + public double getLowerGlueCoefficient() { + return LowerGlueCoefficient; + } + + public void setLowerGlueCoefficient(double lowerGlueCoefficient) { + LowerGlueCoefficient = lowerGlueCoefficient; + } + + public double getLowerGlueUsage() { + return LowerGlueUsage; + } + + public void setLowerGlueUsage(double lowerGlueUsage) { + LowerGlueUsage = lowerGlueUsage; + } + + public HashMap getLargeClothGlue() { + return LargeClothGlue; + } + + public void setLargeClothGlue(HashMap largeClothGlue) { + LargeClothGlue = largeClothGlue; + } + + public double getLargeClothGlueCoefficient() { + return LargeClothGlueCoefficient; + } + + public void setLargeClothGlueCoefficient(double largeClothGlueCoefficient) { + LargeClothGlueCoefficient = largeClothGlueCoefficient; + } + + public double getLargeClothGlueUsage() { + return LargeClothGlueUsage; + } + + public void setLargeClothGlueUsage(double largeClothGlueUsage) { + LargeClothGlueUsage = largeClothGlueUsage; + } + + public double getBufferGlueUsage() { + return BufferGlueUsage; + } + + public void setBufferGlueUsage(double bufferGlueUsage) { + BufferGlueUsage = bufferGlueUsage; + } + + public HashMap getMiddleGlue() { + return MiddleGlue; + } + + public void setMiddleGlue(HashMap middleGlue) { + MiddleGlue = middleGlue; + } + + public double getMiddleGlueCoefficient() { + return MiddleGlueCoefficient; + } + + public void setMiddleGlueCoefficient(double middleGlueCoefficient) { + MiddleGlueCoefficient = middleGlueCoefficient; + } + + public double getMiddleGlueUsage() { + return MiddleGlueUsage; + } + + public void setMiddleGlueUsage(double middleGlueUsage) { + MiddleGlueUsage = middleGlueUsage; + } + + public int getSmallBarWidth() { + return SmallBarWidth; + } + + public void setSmallBarWidth(int smallBarWidth) { + SmallBarWidth = smallBarWidth; + } + + public int getSmallBarThickness() { + return SmallBarThickness; + } + + public void setSmallBarThickness(int smallBarThickness) { + SmallBarThickness = smallBarThickness; + } + + public int getSmallBarStandardUsage() { + return SmallBarStandardUsage; + } + + public void setSmallBarStandardUsage(int smallBarStandardUsage) { + SmallBarStandardUsage = smallBarStandardUsage; + } + + public int getFormingArea() { + return FormingArea; + } + + public void setFormingArea(int formingArea) { + FormingArea = formingArea; + } + + public int getRollCoatingArea() { + return RollCoatingArea; + } + + public void setRollCoatingArea(int rollCoatingArea) { + RollCoatingArea = rollCoatingArea; + } + + public int getRolledFabricArea() { + return RolledFabricArea; + } + + public void setRolledFabricArea(int rolledFabricArea) { + RolledFabricArea = rolledFabricArea; + } + + public int getSulfurizationArea() { + return SulfurizationArea; + } + + public void setSulfurizationArea(int sulfurizationArea) { + SulfurizationArea = sulfurizationArea; + } + + public double getLargeClothArea() { + return LargeClothArea; + } + + public void setLargeClothArea(double largeClothArea) { + LargeClothArea = largeClothArea; + } + + public double getSmallClothArea() { + return SmallClothArea; + } + + public void setSmallClothArea(double smallClothArea) { + SmallClothArea = smallClothArea; + } + + public int getBeltTotalArea() { + return BeltTotalArea; + } + + public void setBeltTotalArea(int beltTotalArea) { + BeltTotalArea = beltTotalArea; + } + + public int getSkirtArea() { + return SkirtArea; + } + + public void setSkirtArea(int skirtArea) { + SkirtArea = skirtArea; + } + + public int getPartitionArea() { + return PartitionArea; + } + + public void setPartitionArea(int partitionArea) { + PartitionArea = partitionArea; + } + + public int getEdgeBandingTotalArea() { + return EdgeBandingTotalArea; + } + + public void setEdgeBandingTotalArea(int edgeBandingTotalArea) { + EdgeBandingTotalArea = edgeBandingTotalArea; + } + + public int getWireropeBeltTotalArea() { + return WireropeBeltTotalArea; + } + + public void setWireropeBeltTotalArea(int wireropeBeltTotalArea) { + WireropeBeltTotalArea = wireropeBeltTotalArea; + } + + public String getOrderDate() { + return OrderDate; + } + + public void setOrderDate(String orderDate) { + OrderDate = orderDate; + } + + public String getDeliveryDate() { + return DeliveryDate; + } + + public void setDeliveryDate(String deliveryDate) { + DeliveryDate = deliveryDate; + } + + public String getSeqNo() { + return SeqNo; + } + + public void setSeqNo(String seqNo) { + SeqNo = seqNo; + } + + public String getProductType() { + return ProductType; + } + + public void setProductType(String productType) { + ProductType = productType; + } + + public String getProductStatus() { + return ProductStatus; + } + + public void setProductStatus(String productStatus) { + ProductStatus = productStatus; + } + + public String getOrderOwner() { + return OrderOwner; + } + + public void setOrderOwner(String orderOwner) { + OrderOwner = orderOwner; + } + + public String getCustomerInfo() { + return CustomerInfo; + } + + public void setCustomerInfo(String customerInfo) { + CustomerInfo = customerInfo; + } + + public String getBeltLengthSpecifications() { + return BeltLengthSpecifications; + } + + public void setBeltLengthSpecifications(String beltLengthSpecifications) { + BeltLengthSpecifications = beltLengthSpecifications; + } + + public String getAreaAndWeight() { + return AreaAndWeight; + } + + public void setAreaAndWeight(String areaAndWeight) { + AreaAndWeight = areaAndWeight; + } + + public String getUsingRawMaterials() { + return UsingRawMaterials; + } + + public void setUsingRawMaterials(String usingRawMaterials) { + UsingRawMaterials = usingRawMaterials; + } +} diff --git a/os-mes/src/main/java/com/os/mes/api/domain/ResponseData.java b/os-mes/src/main/java/com/os/mes/api/domain/ResponseData.java new file mode 100644 index 0000000..9fc793c --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/ResponseData.java @@ -0,0 +1,63 @@ +package com.os.mes.api.domain; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * ERP返回数据 + */ +@JsonIgnoreProperties(ignoreUnknown = true) +public class ResponseData { + + @JsonProperty(value = "Successful") + private boolean Successful; + @JsonProperty(value = "ErrorMessage") + private String ErrorMessage; + @JsonProperty(value = "Logined") + private boolean Logined; + @JsonProperty(value = "ReturnData") + private ReturnData ReturnData; + @JsonProperty(value = "DataType") + private int DataType; + + + public boolean isSuccessful() { + return Successful; + } + + public void setSuccessful(boolean successful) { + Successful = successful; + } + + public String getErrorMessage() { + return ErrorMessage; + } + + public void setErrorMessage(String errorMessage) { + ErrorMessage = errorMessage; + } + + public boolean isLogined() { + return Logined; + } + + public void setLogined(boolean logined) { + Logined = logined; + } + + public com.os.mes.api.domain.ReturnData getReturnData() { + return ReturnData; + } + + public void setReturnData(com.os.mes.api.domain.ReturnData returnData) { + ReturnData = returnData; + } + + public int getDataType() { + return DataType; + } + + public void setDataType(int dataType) { + DataType = dataType; + } +} 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 new file mode 100644 index 0000000..ee873b9 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/ReturnData.java @@ -0,0 +1,52 @@ +package com.os.mes.api.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.util.List; + +/** + * ERP返回数据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; + } + + public void setTotle(int totle) { + this.totle = totle; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public String getResult() { + return result; + } + + public void setResult(String result) { + this.result = result; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} 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 new file mode 100644 index 0000000..bb1c032 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlue.java @@ -0,0 +1,38 @@ +package com.os.mes.api.domain; + +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; + } + + public void setMaterialList_1(List materialList_1) { + MaterialList_1 = materialList_1; + } + + public List getMaterialList_2() { + return MaterialList_2; + } + + public void setMaterialList_2(List materialList_2) { + MaterialList_2 = materialList_2; + } + + public double getAfterPromotionTotalWeight() { + return AfterPromotionTotalWeight; + } + + public void setAfterPromotionTotalWeight(double afterPromotionTotalWeight) { + AfterPromotionTotalWeight = afterPromotionTotalWeight; + } +} 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 new file mode 100644 index 0000000..9e4819d --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem1.java @@ -0,0 +1,37 @@ +package com.os.mes.api.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class UpperLowerGlueItem1 { + + @JsonProperty(value = "MaterialNo") + private String MaterialNo; + @JsonProperty(value = "Material") + private Material Material; + @JsonProperty(value = "EnterSecondLaneWeight") + private double EnterSecondLaneWeight; + + public String getMaterialNo() { + return MaterialNo; + } + + public void setMaterialNo(String materialNo) { + MaterialNo = materialNo; + } + + public com.os.mes.api.domain.Material getMaterial() { + return Material; + } + + public void setMaterial(com.os.mes.api.domain.Material material) { + Material = material; + } + + public double getEnterSecondLaneWeight() { + return EnterSecondLaneWeight; + } + + public void setEnterSecondLaneWeight(double enterSecondLaneWeight) { + EnterSecondLaneWeight = enterSecondLaneWeight; + } +} 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 new file mode 100644 index 0000000..43659bf --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/domain/UpperLowerGlueItem2.java @@ -0,0 +1,37 @@ +package com.os.mes.api.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class UpperLowerGlueItem2 { + + @JsonProperty(value = "MaterialNo") + private String MaterialNo; + @JsonProperty(value = "Material") + private Material Material; + @JsonProperty(value = "ProductionRequiresWeight") + private double ProductionRequiresWeight; + + public String getMaterialNo() { + return MaterialNo; + } + + public void setMaterialNo(String materialNo) { + MaterialNo = materialNo; + } + + public Material getMaterial() { + return Material; + } + + public void setMaterial(Material material) { + Material = material; + } + + public double getProductionRequiresWeight() { + return ProductionRequiresWeight; + } + + public void setProductionRequiresWeight(double productionRequiresWeight) { + ProductionRequiresWeight = productionRequiresWeight; + } +} 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 new file mode 100644 index 0000000..bff7954 --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/service/IERPPortService.java @@ -0,0 +1,24 @@ +package com.os.mes.api.service; + + +import com.os.mes.api.domain.ERPParamDto; + +import java.util.List; + +/** + * ERP接口Service接口 + * + * @author Yinq + * @date 2024-05-10 + */ +public interface IERPPortService { + + + /** + * 获取ERP订单接口 + * @param paramDto + * @return + */ + String 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 new file mode 100644 index 0000000..a604e6b --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java @@ -0,0 +1,56 @@ +package com.os.mes.api.service.impl; + +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.ResponseData; +import com.os.mes.api.service.IERPPortService; +import com.os.mes.api.utils.ApiUtils; +import com.os.mes.api.utils.ERPConstants; +import org.springframework.stereotype.Service; + + +/** + * ERP接口Service业务层处理 + * + * @author Yinq + * @date 2024-05-10 + */ +@Service +public class ERPPortServiceImpl implements IERPPortService { + + + /** + * 获取ERP订单接口 + * @param paramDto + * @return + */ + @Override + public String getERPOrderData(ERPParamDto paramDto) { + String requestParam = null; + String result = null; + try { + // 创建ObjectMapper实例 对象转JSON字符串 + 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}"; + 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); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + + return result; + } + + +} diff --git a/os-mes/src/main/java/com/os/mes/api/utils/ApiUtils.java b/os-mes/src/main/java/com/os/mes/api/utils/ApiUtils.java new file mode 100644 index 0000000..5de852c --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/utils/ApiUtils.java @@ -0,0 +1,45 @@ +package com.os.mes.api.utils; + + + + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; + + +/** + * @Author YinQ + * @create 2023-10-12 10:52 + */ +public class ApiUtils { + + + /** + * POST请求json格式 + * @param apiUrl + * @param jsonData + * @return + */ + public static String sendERPHttpPost(String apiUrl, String jsonData) { + try { + // 构建POST请求 + HttpRequest request = HttpRequest.post(apiUrl) + .header("EngineCode", ERPConstants.EngineCode) + .header("EngineSecret", ERPConstants.EngineSecret) + .body(jsonData) // 设置JSON格式的请求体 + .contentType("application/json") // 设置Content-Type为application/json + .setConnectionTimeout(1000 * 60 * 10) // 设置请求连接超时时间 + ; + + // 发送POST请求 + HttpResponse httpResponse = request.execute(); + + // 获取响应内容 + return httpResponse.body(); + } catch (Exception e) { + // 捕获异常并重新抛出自定义异常 + throw new RuntimeException("Failed to send ERP HTTP POST request: " + e.getMessage(), e); + } + + } +} diff --git a/os-mes/src/main/java/com/os/mes/api/utils/ERPConstants.java b/os-mes/src/main/java/com/os/mes/api/utils/ERPConstants.java new file mode 100644 index 0000000..a8e276b --- /dev/null +++ b/os-mes/src/main/java/com/os/mes/api/utils/ERPConstants.java @@ -0,0 +1,46 @@ +package com.os.mes.api.utils; + +import org.springframework.stereotype.Component; + +/** + * @Author YinQ + * @create 2023-09-26 15:39 + */ +@Component +public class ERPConstants { + + + /** + * ERP-URL前缀 + */ + public static String ERP_URL = "https://www.h3yun.com/OpenApi/Invoke"; + + /** + * ERP-用户名 + */ + public static String EngineCode = "gjcpce9yqtw3x8t8v7zbjky27"; + + /** + * ERP-密码 + */ + public static String EngineSecret = "7qW7OhjZB7hlXM1oQBZ7jD/iz2ni4ZvfWsUoxaUpa+W8cy9EA/gsBA=="; + + + //获取【发布订单】 + public static final String orderAppCode = "Afb7b276a38a04d52b7bd4ca314a42b0c"; + public static final String orderController = "ReleaseOrderApiController"; + public static final String orderActionName = "GetReleaseOrders"; + + + //获取【政策与条款】-最新工资系数 + public static final String salaryAppCode = "A1c661aa059ad4d4f8230b187a85385c5"; + public static final String salaryController = "SalaryCoefficientApiController"; + public static final String salaryActionName = "GetSalaryCoefficient"; + + //获取【政策与条款】-最新工资系数 + public static final String employeeAppCode = "D000886NewEatingPersonnelLPC"; + public static final String employeeController = "EmployeeApiController"; + public static final String employeeActionName = "GetEmployeeInfos"; + + +}