From 898b2db19b3891243d78086c8cfa7cbcf444f389 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Tue, 30 Apr 2024 14:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E5=92=8C=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/order/OrderDO.java         |  2 +-
 .../dataobject/ordermodel/OrderModelDO.java   | 24 +++++++++----------
 .../service/order/OrderInputProcessor.java    |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java
index 28dc7f51d..e954eb12c 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java
@@ -44,7 +44,7 @@ public class OrderDO extends OrganBaseDO {
     /**
      * 生产单类型，1主单 2子单
      */
-    private Boolean orderType;
+    private Integer orderType;
     /**
      * 生产单排序号
      */
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
index 18f386c71..b75debf4f 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
@@ -28,16 +28,16 @@ public class OrderModelDO extends ESDocument {
     private Long orderId;
     @Schema(description = "小板id")
     private Long plateId;
-    @Schema(description = "轮廓明细")
-    private List<ModelDetail> contourDetail;
-    @Schema(description = "点明细")
-    private List<PointDetail> pointDetail;
-    @Schema(description = "孔明细")
-    private HoleDetail holeDetail;
-    @Schema(description = "原始点明细")
-    private List<PointDetail> rawPointDetail;
-    @Schema(description = "侧面轮廓明细")
-    private List<ModelDetail> sideModelDetail;
-    @Schema(description = "侧面孔明细")
-    private List<HoleDetail> sideHoleDetail;
+    @Schema(description = "轮廓明细列表")
+    private List<ModelDetail> contourDetailList;
+    @Schema(description = "点明细列表")
+    private List<PointDetail> pointDetailList;
+    @Schema(description = "孔明细列表")
+    private List<HoleDetail> holeDetailList;
+    @Schema(description = "原始点明细列表")
+    private List<PointDetail> rawPointDetailList;
+    @Schema(description = "侧面轮廓明细列表")
+    private List<ModelDetail> sideModelDetailList;
+    @Schema(description = "侧面孔明细列表")
+    private List<HoleDetail> sideHoleDetailList;
 }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java
index 93e198fe5..baeca5a2c 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java
@@ -76,7 +76,7 @@ public class OrderInputProcessor {
     public static final String ORDER_PLATE_MODEL = "imes_order_plate_model";
 
 
-    public void input(List<Detail> sourceList, Long orderId) {
+   /* public void input(List<Detail> sourceList, Long orderId) {
         Long organId = OrganContextHolder.getOrganId();
         ArrayList<RawGoodsDO> rawGoodsDOS = new ArrayList<>();
         ArrayList<OrderBodyDO> orderBodyDOS = new ArrayList<>();
@@ -278,7 +278,7 @@ public class OrderInputProcessor {
         batchSaveModel(orderModelDOS);
         batchInsert(rawGoodsDOS, orderBodyDOS, orderGroupDOS, orderPartsDOS, plateDOS, orderModuleExtraDOS, orderItemDOS);
 
-    }
+    }*/
 
     /**
      * 批量保存生产单小板五金数据