Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
liuzhaotian
2024-04-30 15:08:08 +08:00
parent 2e48b02237 6cbb7285d3
commit f9a245bbaa
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class OrderDO extends OrganBaseDO {
/** /**
* 生产单类型，1主单 2子单 * 生产单类型，1主单 2子单
*/ */
private Boolean orderType; private Integer orderType;
/** /**
* 生产单排序号 * 生产单排序号
*/ */
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/ordermodel/OrderModelDO.java
+12 -12
View File
@@ -28,16 +28,16 @@ public class OrderModelDO extends ESDocument {
private Long orderId; private Long orderId;
@Schema(description = "小板id") @Schema(description = "小板id")
private Long plateId; private Long plateId;
@Schema(description = "轮廓明细") @Schema(description = "轮廓明细列表")
private List<ModelDetail> contourDetail; private List<ModelDetail> contourDetailList;
@Schema(description = "点明细") @Schema(description = "点明细列表")
private List<PointDetail> pointDetail; private List<PointDetail> pointDetailList;
@Schema(description = "孔明细") @Schema(description = "孔明细列表")
private HoleDetail holeDetail; private List<HoleDetail> holeDetailList;
@Schema(description = "原始点明细") @Schema(description = "原始点明细列表")
private List<PointDetail> rawPointDetail; private List<PointDetail> rawPointDetailList;
@Schema(description = "侧面轮廓明细") @Schema(description = "侧面轮廓明细列表")
private List<ModelDetail> sideModelDetail; private List<ModelDetail> sideModelDetailList;
@Schema(description = "侧面孔明细") @Schema(description = "侧面孔明细列表")
private List<HoleDetail> sideHoleDetail; private List<HoleDetail> sideHoleDetailList;
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderInputProcessor.java
+2 -2
View File
@@ -76,7 +76,7 @@ public class OrderInputProcessor {
public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; 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(); Long organId = OrganContextHolder.getOrganId();
ArrayList<RawGoodsDO> rawGoodsDOS = new ArrayList<>(); ArrayList<RawGoodsDO> rawGoodsDOS = new ArrayList<>();
ArrayList<OrderBodyDO> orderBodyDOS = new ArrayList<>(); ArrayList<OrderBodyDO> orderBodyDOS = new ArrayList<>();
@@ -278,7 +278,7 @@ public class OrderInputProcessor {
batchSaveModel(orderModelDOS); batchSaveModel(orderModelDOS);
batchInsert(rawGoodsDOS, orderBodyDOS, orderGroupDOS, orderPartsDOS, plateDOS, orderModuleExtraDOS, orderItemDOS); batchInsert(rawGoodsDOS, orderBodyDOS, orderGroupDOS, orderPartsDOS, plateDOS, orderModuleExtraDOS, orderItemDOS);
} }*/
/** /**
* 批量保存生产单小板五金数据 * 批量保存生产单小板五金数据