From 312d3886ad4f5a081966812cc7e666b8e659ff12 Mon Sep 17 00:00:00 2001 From: yinq Date: Fri, 14 Jun 2024 18:01:46 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20ERP=E8=AE=A2=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=8E=E7=BB=86=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ERPPortServiceImpl.java | 7 +- .../com/os/mes/prod/domain/ProdOrderInfo.java | 10 + .../mapper/mes/prod/ProdOrderDetailMapper.xml | 49 ++-- .../mapper/mes/prod/ProdOrderInfoMapper.xml | 253 ++++++++++++++---- 4 files changed, 231 insertions(+), 88 deletions(-) diff --git a/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java b/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java index eda0098..6de1dec 100644 --- a/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java @@ -52,21 +52,18 @@ public class ERPPortServiceImpl implements IERPPortService { 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); List dataList = data.getReturnData().getData(); for (RecordData recordData : dataList) { ProdOrderDetail orderDetail = orderInfoService.insertOrderByERP(recordData); resultList.add(orderDetail); } - logger.warn("获取ERP订单接口:" + requestParam + "|" + result); + logger.warn("获取ERP订单成功:" + requestParam + "|" + result); } catch (JsonProcessingException e) { - e.printStackTrace(); + logger.warn("获取ERP订单异常:" + requestParam + "|" + result + "|" + e); } return resultList; diff --git a/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java b/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java index 9ede93d..0498b8f 100644 --- a/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java +++ b/os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java @@ -185,6 +185,16 @@ public class ProdOrderInfo extends BaseEntity { @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date updatedTime; + private ProdOrderDetail orderDetail; + + public ProdOrderDetail getOrderDetail() { + return orderDetail; + } + + public void setOrderDetail(ProdOrderDetail orderDetail) { + this.orderDetail = orderDetail; + } + public void setObjId(Long objId) { this.objId = objId; } diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml index 94d925d..849af0d 100644 --- a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml @@ -74,10 +74,10 @@ - - - - + + + + @@ -150,10 +150,10 @@ PartitionArea, EdgeBandingTotalArea, WireropeBeltTotalArea, - created_by, - created_time, - updated_by, - updated_time + create_by, + create_time, + update_by, + update_time from prod_order_detail @@ -178,11 +178,6 @@ and BeltWidth = #{BeltWidth} and BeltClothLayer = #{BeltClothLayer} - and BeltRequiredLength = #{BeltRequiredLength} - and GluingRequiredThickness = #{GluingRequiredThickness} - and LowerGlueRequiredThickness = - #{LowerGlueRequiredThickness} - and LargeClothArea = #{LargeClothArea} and SmallClothArea = #{SmallClothArea} and BeltTotalArea = #{BeltTotalArea} @@ -190,10 +185,6 @@ and PartitionArea = #{PartitionArea} and EdgeBandingTotalArea = #{EdgeBandingTotalArea} and WireropeBeltTotalArea = #{WireropeBeltTotalArea} - and created_by = #{createdBy} - and created_time = #{createdTime} - and updated_by = #{updatedBy} - and updated_time = #{updatedTime} @@ -273,10 +264,10 @@ PartitionArea, EdgeBandingTotalArea, WireropeBeltTotalArea, - created_by, - created_time, - updated_by, - updated_time, + create_by, + create_time, + update_by, + update_time, #{SeqNo}, @@ -347,10 +338,10 @@ #{PartitionArea}, #{EdgeBandingTotalArea}, #{WireropeBeltTotalArea}, - #{createdBy}, - #{createdTime}, - #{updatedBy}, - #{updatedTime}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, @@ -434,10 +425,10 @@ PartitionArea = #{PartitionArea}, EdgeBandingTotalArea = #{EdgeBandingTotalArea}, WireropeBeltTotalArea = #{WireropeBeltTotalArea}, - created_by = #{createdBy}, - created_time = #{createdTime}, - updated_by = #{updatedBy}, - updated_time = #{updatedTime}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, where obj_id = #{objId} diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml index c0fc73a..e32497c 100644 --- a/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml @@ -32,80 +32,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - select obj_id, - order_code, - sale_order_code, - sale_order_line_number, - material_code, - material_name, - matkl, - bom_code, - order_amount, - complete_amount, - order_type, - order_status, - finish_flag, - begin_date, - end_date, - real_begin_date, - real_end_date, - factory_code, - is_release, - work_center_code, - routing_code, - print_name, - is_flag, - created_by, - created_time, - updated_by, - updated_time - from prod_order_info + select poi.obj_id, + poi.order_code, + poi.sale_order_code, + poi.sale_order_line_number, + poi.material_code, + poi.material_name, + poi.matkl, + poi.bom_code, + poi.order_amount, + poi.complete_amount, + poi.order_type, + poi.order_status, + poi.finish_flag, + poi.begin_date, + poi.end_date, + poi.real_begin_date, + poi.real_end_date, + poi.factory_code, + poi.is_release, + poi.work_center_code, + poi.routing_code, + poi.print_name, + poi.is_flag, + poi.created_by, + poi.created_time, + poi.updated_by, + poi.updated_time, + pod.SeqNo, + pod.OrderDate, + pod.DeliveryDate, + pod.ProductType, + pod.ProductStatus, + pod.OrderOwner, + pod.CustomerInfo, + pod.BeltLengthSpecifications, + pod.AreaAndWeight, + pod.UsingRawMaterials, + pod.BeltWidth, + pod.BeltClothLayer, + pod.BeltRequiredLength, + pod.GluingRequiredThickness, + pod.LowerGlueRequiredThickness, + pod.ProductionGluingThickness, + pod.UpperBufferAdhesiveThickness, + pod.ProductionLowerGlueThickness, + pod.LowerBufferAdhesiveThickness, + pod.ClothGlueThickness, + pod.SmallClothFabricLayer, + pod.SmallClothThickness, + pod.IsNeedThicken, + pod.EachLayerThickenThickness, + pod.ExtraThickeningThickness, + pod.TotalProductionThickness, + pod.AdditionalThickness, + pod.RecommendedShimThickness, + pod.SemiFinishedProductWidth, + pod.RollingProductionMeters, + pod.RecommendedPadWidth, + pod.BigFabricManufacturer, + pod.FabricSpecifications, + pod.EstimatedFabricUsage, + pod.ClothWidth, + pod.ClothWeight, + pod.SmallFabricSpecificationsDic, + pod.SmallClothWidth, + pod.SmallClothUsage, + pod.SmallClothWeight, + pod.GluingProcess, + pod.UpperLowerGlue, + pod.UpperLowerGlueCoefficient, + pod.UpperLowerGlueUsage, + pod.LowerGlue, + pod.LowerGlueCoefficient, + pod.LowerGlueUsage, + pod.LargeClothGlue, + pod.LargeClothGlueCoefficient, + pod.LargeClothGlueUsage, + pod.BufferGlueUsage, + pod.MiddleGlue, + pod.MiddleGlueCoefficient, + pod.MiddleGlueUsage, + pod.SmallBarWidth, + pod.SmallBarThickness, + pod.SmallBarStandardUsage, + pod.FormingArea, + pod.RollCoatingArea, + pod.RolledFabricArea, + pod.SulfurizationArea, + pod.LargeClothArea, + pod.SmallClothArea, + pod.BeltTotalArea, + pod.SkirtArea, + pod.PartitionArea, + pod.EdgeBandingTotalArea, + pod.WireropeBeltTotalArea + from prod_order_info poi + left join prod_order_detail pod on pod.SeqNo = poi.order_code