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 979b9e10a..41f4c658e 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 contourDetail; - @Schema(description = "点明细") - private List pointDetail; - @Schema(description = "孔明细") - private HoleDetail holeDetail; - @Schema(description = "原始点明细") - private List rawPointDetail; - @Schema(description = "侧面轮廓明细") - private List sideModelDetail; - @Schema(description = "侧面孔明细") - private List sideHoleDetail; + @Schema(description = "轮廓明细列表") + private List contourDetailList; + @Schema(description = "点明细列表") + private List pointDetailList; + @Schema(description = "孔明细列表") + private List holeDetailList; + @Schema(description = "原始点明细列表") + private List rawPointDetailList; + @Schema(description = "侧面轮廓明细列表") + private List sideModelDetailList; + @Schema(description = "侧面孔明细列表") + private List 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 sourceList, Long orderId) { + /* public void input(List sourceList, Long orderId) { Long organId = OrganContextHolder.getOrganId(); ArrayList rawGoodsDOS = new ArrayList<>(); ArrayList orderBodyDOS = new ArrayList<>(); @@ -278,7 +278,7 @@ public class OrderInputProcessor { batchSaveModel(orderModelDOS); batchInsert(rawGoodsDOS, orderBodyDOS, orderGroupDOS, orderPartsDOS, plateDOS, orderModuleExtraDOS, orderItemDOS); - } + }*/ /** * 批量保存生产单小板五金数据