From 83743651639b5ec5b22910275e3b5ccc464cde40 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 5 Mar 2025 11:17:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95xml=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9A1?= =?UTF-8?q?=E3=80=81xmlvo=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E6=94=B9?= =?UTF-8?q?=E5=8F=98=EF=BC=9B2=E3=80=81=E6=9D=BF=E4=BB=B6=E4=B8=8B?= =?UTF-8?q?=E5=B0=81=E8=BE=B9=E6=9D=A1=E5=88=9B=E5=BB=BA=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E7=A9=BA=E5=B1=9E=E6=80=A7=E6=8E=A7=E5=88=B6=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/OrderImportTempDataReqVO.java | 2 +- .../vo/OrderPlateImportExcelVO.java | 2 +- .../orderImport/xml/vo/AssemblyXmlVO.java | 2 +- .../orderImport/xml/vo/BlockXmlVO.java | 2 +- .../orderImport/xml/vo/CorrelationXmlVO.java | 2 +- .../orderImport/xml/vo/CorrelationXmlVOS.java | 2 +- .../xml/vo/CuttingOutlineXmlVO.java | 2 +- .../orderImport/xml/vo/EdgingXmlVO.java | 2 +- .../orderImport/xml/vo/ExtraVO.java | 2 +- .../orderImport/xml/vo/GrooveXmlVO.java | 2 +- .../orderImport/xml/vo/GrooveXmlVOS.java | 2 +- .../orderImport/xml/vo/GroupXmlVO.java | 2 +- .../orderImport/xml/vo/HardwareXmlVO.java | 2 +- .../orderImport/xml/vo/HoleXmlVO.java | 2 +- .../orderImport/xml/vo/HoleXmlVOS.java | 2 +- .../orderImport/xml/vo/IsletXmlVO.java | 2 +- .../orderImport/xml/vo/IsletXmlVOS.java | 2 +- .../orderImport/xml/vo/OffsetLineXmlVO.java | 2 +- .../orderImport/xml/vo/OffsetLineXmlVOS.java | 2 +- .../orderImport/xml/vo/OutlineXmlVO.java | 2 +- .../orderImport/xml/vo/PlateXmlVO.java | 2 +- .../orderImport/xml/vo/PointXmlVO.java | 2 +- .../orderImport/xml/vo/PointXmlVOS.java | 2 +- .../orderImport/xml/vo/RawOutlineXmlVO.java | 2 +- .../orderImport/xml/vo/RectSealVO.java | 2 +- .../orderImport/xml/vo/RemarkXmlVO.java | 2 +- .../orderImport/xml/vo/RemarkXmlVOS.java | 2 +- .../orderImport/xml/vo/RoomBoxXmlVO.java | 2 +- .../OrderImportTempDataMapper.java | 2 +- .../DefaultExcelOrderImportFactory.java | 4 +- .../factory/DefaultXmlOrderImportFactory.java | 72 +++++++++++-------- 31 files changed, 74 insertions(+), 60 deletions(-) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/vo/OrderImportTempDataReqVO.java (94%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/vo/OrderPlateImportExcelVO.java (98%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/AssemblyXmlVO.java (95%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/BlockXmlVO.java (98%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/CorrelationXmlVO.java (92%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/CorrelationXmlVOS.java (84%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/CuttingOutlineXmlVO.java (89%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/EdgingXmlVO.java (95%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/ExtraVO.java (93%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/GrooveXmlVO.java (96%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/GrooveXmlVOS.java (94%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/GroupXmlVO.java (89%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/HardwareXmlVO.java (95%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/HoleXmlVO.java (96%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/HoleXmlVOS.java (93%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/IsletXmlVO.java (86%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/IsletXmlVOS.java (84%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/OffsetLineXmlVO.java (89%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/OffsetLineXmlVOS.java (84%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/OutlineXmlVO.java (82%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/PlateXmlVO.java (95%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/PointXmlVO.java (95%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/PointXmlVOS.java (83%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/RawOutlineXmlVO.java (89%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/RectSealVO.java (88%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/RemarkXmlVO.java (81%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/RemarkXmlVOS.java (83%) rename cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/{ => admin}/orderImport/xml/vo/RoomBoxXmlVO.java (95%) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/vo/OrderImportTempDataReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/vo/OrderImportTempDataReqVO.java similarity index 94% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/vo/OrderImportTempDataReqVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/vo/OrderImportTempDataReqVO.java index 66b812c3a..b0d360337 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/vo/OrderImportTempDataReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/vo/OrderImportTempDataReqVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/vo/OrderPlateImportExcelVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/vo/OrderPlateImportExcelVO.java similarity index 98% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/vo/OrderPlateImportExcelVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/vo/OrderPlateImportExcelVO.java index abecfa191..332d61a8c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/vo/OrderPlateImportExcelVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/vo/OrderPlateImportExcelVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.vo; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/AssemblyXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/AssemblyXmlVO.java similarity index 95% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/AssemblyXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/AssemblyXmlVO.java index 98b47313f..538f0ecb6 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/AssemblyXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/AssemblyXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/BlockXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/BlockXmlVO.java similarity index 98% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/BlockXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/BlockXmlVO.java index b3dc16784..22e1dafdd 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/BlockXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/BlockXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CorrelationXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CorrelationXmlVO.java similarity index 92% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CorrelationXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CorrelationXmlVO.java index 8b34b11e4..f92e7a45e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CorrelationXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CorrelationXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CorrelationXmlVOS.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CorrelationXmlVOS.java similarity index 84% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CorrelationXmlVOS.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CorrelationXmlVOS.java index d7e2df66a..272bbbc0e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CorrelationXmlVOS.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CorrelationXmlVOS.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CuttingOutlineXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CuttingOutlineXmlVO.java similarity index 89% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CuttingOutlineXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CuttingOutlineXmlVO.java index d2e798286..1226d9e29 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/CuttingOutlineXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/CuttingOutlineXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/EdgingXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/EdgingXmlVO.java similarity index 95% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/EdgingXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/EdgingXmlVO.java index 1f98ada11..a997d6d5d 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/EdgingXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/EdgingXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/ExtraVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/ExtraVO.java similarity index 93% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/ExtraVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/ExtraVO.java index da7dec82c..85cd87714 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/ExtraVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/ExtraVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GrooveXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GrooveXmlVO.java similarity index 96% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GrooveXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GrooveXmlVO.java index 7c4e98502..5fd2fc800 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GrooveXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GrooveXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GrooveXmlVOS.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GrooveXmlVOS.java similarity index 94% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GrooveXmlVOS.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GrooveXmlVOS.java index 6d3fabd72..7776158bc 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GrooveXmlVOS.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GrooveXmlVOS.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GroupXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GroupXmlVO.java similarity index 89% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GroupXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GroupXmlVO.java index cafea5de7..378baffb0 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/GroupXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/GroupXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HardwareXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HardwareXmlVO.java similarity index 95% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HardwareXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HardwareXmlVO.java index d35ecff79..ed143a1a6 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HardwareXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HardwareXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HoleXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HoleXmlVO.java similarity index 96% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HoleXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HoleXmlVO.java index 85962bc95..601d1dd0c 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HoleXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HoleXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HoleXmlVOS.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HoleXmlVOS.java similarity index 93% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HoleXmlVOS.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HoleXmlVOS.java index b2ba216da..7de5199e6 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/HoleXmlVOS.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/HoleXmlVOS.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/IsletXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/IsletXmlVO.java similarity index 86% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/IsletXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/IsletXmlVO.java index 9584ec297..40f427186 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/IsletXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/IsletXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/IsletXmlVOS.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/IsletXmlVOS.java similarity index 84% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/IsletXmlVOS.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/IsletXmlVOS.java index d0cf9738a..6247ff952 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/IsletXmlVOS.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/IsletXmlVOS.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OffsetLineXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OffsetLineXmlVO.java similarity index 89% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OffsetLineXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OffsetLineXmlVO.java index 3857d89f0..09e2d928a 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OffsetLineXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OffsetLineXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OffsetLineXmlVOS.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OffsetLineXmlVOS.java similarity index 84% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OffsetLineXmlVOS.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OffsetLineXmlVOS.java index 7762e4a3b..08a3d5572 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OffsetLineXmlVOS.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OffsetLineXmlVOS.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OutlineXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OutlineXmlVO.java similarity index 82% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OutlineXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OutlineXmlVO.java index 777c13a03..8d5c1e370 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/OutlineXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/OutlineXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PlateXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PlateXmlVO.java similarity index 95% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PlateXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PlateXmlVO.java index cd908edf8..4fa54e054 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PlateXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PlateXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PointXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PointXmlVO.java similarity index 95% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PointXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PointXmlVO.java index a9f525594..e7a26914b 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PointXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PointXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PointXmlVOS.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PointXmlVOS.java similarity index 83% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PointXmlVOS.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PointXmlVOS.java index 3e9505f60..61c049299 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/PointXmlVOS.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/PointXmlVOS.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RawOutlineXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RawOutlineXmlVO.java similarity index 89% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RawOutlineXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RawOutlineXmlVO.java index b9618dbbb..61639aa02 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RawOutlineXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RawOutlineXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RectSealVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RectSealVO.java similarity index 88% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RectSealVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RectSealVO.java index 14ee9aad9..a16abafeb 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RectSealVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RectSealVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RemarkXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RemarkXmlVO.java similarity index 81% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RemarkXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RemarkXmlVO.java index c750b12f3..f942aadbc 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RemarkXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RemarkXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RemarkXmlVOS.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RemarkXmlVOS.java similarity index 83% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RemarkXmlVOS.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RemarkXmlVOS.java index 33c48d482..cba9241f1 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RemarkXmlVOS.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RemarkXmlVOS.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RoomBoxXmlVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RoomBoxXmlVO.java similarity index 95% rename from cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RoomBoxXmlVO.java rename to cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RoomBoxXmlVO.java index 96dc2cc86..5c694ef92 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/orderImport/xml/vo/RoomBoxXmlVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/xml/vo/RoomBoxXmlVO.java @@ -1,4 +1,4 @@ -package com.cf.imes.module.plan.controller.orderImport.xml.vo; +package com.cf.imes.module.plan.controller.admin.orderImport.xml.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java index 08064da11..7e1ba4b4e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/dal/mysql/orderImport/OrderImportTempDataMapper.java @@ -1,7 +1,7 @@ package com.cf.imes.module.plan.dal.mysql.orderImport; import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX; -import com.cf.imes.module.plan.controller.orderImport.vo.OrderImportTempDataReqVO; +import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderImportTempDataReqVO; import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataDO; import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsGroupDO; import com.cf.imes.module.plan.dal.dataobject.orderImport.OrderImportTempDataGoodsIdGroupDO; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java index c6c69e62c..348c585c9 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultExcelOrderImportFactory.java @@ -26,8 +26,8 @@ import com.cf.imes.module.executor.enums.OrderImportConstants; import com.cf.imes.module.executor.enums.OrderImportStatusEnum; import com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum; import com.cf.imes.module.executor.enums.OrderItemTypeEnum; -import com.cf.imes.module.plan.controller.orderImport.vo.OrderImportTempDataReqVO; -import com.cf.imes.module.plan.controller.orderImport.vo.OrderPlateImportExcelVO; +import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderImportTempDataReqVO; +import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderPlateImportExcelVO; import com.cf.imes.module.plan.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.plan.dal.dataobject.order.OrderDO; import com.cf.imes.module.plan.dal.dataobject.orderBody.OrderBodyDO; diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java index 0ffc1ffb9..f13eabc4e 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/DefaultXmlOrderImportFactory.java @@ -25,32 +25,32 @@ import com.cf.imes.module.executor.enums.DictTypeConstants; import com.cf.imes.module.executor.enums.OrderImportStatusEnum; import com.cf.imes.module.executor.enums.OrderImportTmpDataTypeEnum; import com.cf.imes.module.executor.enums.OrderItemTypeEnum; -import com.cf.imes.module.plan.controller.orderImport.vo.OrderImportTempDataReqVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.AssemblyXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.BlockXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.CorrelationXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.CorrelationXmlVOS; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.CuttingOutlineXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.EdgingXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.ExtraVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.GrooveXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.GrooveXmlVOS; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.GroupXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.HardwareXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.HoleXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.HoleXmlVOS; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.IsletXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.IsletXmlVOS; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.OffsetLineXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.OffsetLineXmlVOS; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.OutlineXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.PlateXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.PointXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.PointXmlVOS; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.RawOutlineXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.RectSealVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.RemarkXmlVO; -import com.cf.imes.module.plan.controller.orderImport.xml.vo.RoomBoxXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.vo.OrderImportTempDataReqVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.AssemblyXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.BlockXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.CorrelationXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.CorrelationXmlVOS; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.CuttingOutlineXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.EdgingXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.ExtraVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.GrooveXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.GrooveXmlVOS; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.GroupXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.HardwareXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.HoleXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.HoleXmlVOS; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.IsletXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.IsletXmlVOS; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.OffsetLineXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.OffsetLineXmlVOS; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.OutlineXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.PlateXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.PointXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.PointXmlVOS; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RawOutlineXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RectSealVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RemarkXmlVO; +import com.cf.imes.module.plan.controller.admin.orderImport.xml.vo.RoomBoxXmlVO; import com.cf.imes.module.plan.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.plan.dal.dataobject.order.OrderDO; import com.cf.imes.module.plan.dal.dataobject.orderBody.OrderBodyDO; @@ -152,6 +152,7 @@ public class DefaultXmlOrderImportFactory { private static final String EMPTY_STRING = new String(); private static final BigDecimal BIG_ZERO = new BigDecimal(0); + private static final Double DOUBLE_ZERO = NumberUtil.parseDouble("0.0"); private static final int GOODS_TYPE = OrderImportTmpDataTypeEnum.GOODS.getType(); private static final int BODY_TYPE = OrderImportTmpDataTypeEnum.BODY.getType(); @@ -654,6 +655,7 @@ public class DefaultXmlOrderImportFactory { orderInfoBatchInsertWithinThreshold(plateMapper, plateDOS, true); // 批量插入造型数据 orderModelsBatchInsertWithinThreshold(true); + // 所有自定义板编号生成完成后更新配置到生产单 customPlateNoGenerateService.updateCustomPlateNoGenerateConfig(plateNoGenerateConfigVO, orderDO); } @@ -769,15 +771,25 @@ public class DefaultXmlOrderImportFactory { String itemCode = pointXmlVO.getItemCode(); OrderPartsDO orderPartsDOinMap = orderPartsDOMap.get(itemCode); if (ObjectUtil.isNull(orderPartsDOinMap)) { + String edgingMaterial = pointXmlVO.getEdgingMaterial(); + String edgingColor = pointXmlVO.getEdgingColor(); OrderPartsDO orderPartsDO = OrderPartsDO.builder() .id((Long) snowFlakeGenerator.nextId(null)) .name(pointXmlVO.getEdgingName()) .goodsId(itemCode) .type("封边条") + .category("封边条") .orderId(orderId) - .material(pointXmlVO.getEdgingMaterial()) + .material(StringUtils.isNotEmpty(edgingMaterial) ? edgingMaterial : EMPTY_STRING) + .color(StringUtils.isNotEmpty(edgingColor) ? edgingColor : EMPTY_STRING) .unit(pointXmlVO.getCountUnit()) .isComposite(false) + .width(DOUBLE_ZERO) + .length(DOUBLE_ZERO) + .spec(EMPTY_STRING) + .brand(EMPTY_STRING) + .factory(EMPTY_STRING) + .thickness(NumberUtil.parseDouble(pointXmlVO.getEdgingThickness())) .subparts(EMPTY_STRING) .remark(EMPTY_STRING) .model(EMPTY_STRING) @@ -800,7 +812,7 @@ public class DefaultXmlOrderImportFactory { // 封边总长度单位换算 Double count = changeUnit(pointXmlVO.getCount(), pointXmlVO.getCountUnit(), DictTypeConstants.UNIT_LENGTH); - OrderItemDO.builder() + OrderItemDO newEdgePartOrderItem = OrderItemDO.builder() .id((Long) snowFlakeGenerator.nextId(null)) .orderId(orderId) .type(OrderItemTypeEnum.PARTS_ITEM.getStatus()) @@ -810,9 +822,11 @@ public class DefaultXmlOrderImportFactory { .bodyId(orderItemDO.getBodyId()) .num(count) .organId(organId) + .packageId(0L) + .plateId(0L) .build(); // 批量插入order_item - orderItemDOS.add(orderItemDO); + orderItemDOS.add(newEdgePartOrderItem); orderInfoBatchInsertWithinThreshold(orderItemMapper, orderItemDOS, false); } }