diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjCompleteVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjCompleteVO.java index fd12ca1bd..8938de848 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjCompleteVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/vo/SjCompleteVO.java @@ -68,4 +68,16 @@ public class SjCompleteVO { @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) private Date putStoreTime; + @Schema(description = "镀种") + private String plate; + + @Schema(description = "材料") + private String material; + + @Schema(description = "子件类型") + private Integer yieldType; + + @Schema(description = "子件类型") + private String yieldTypeName; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index 6f781ecbe..4cbb5d98c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -190,13 +190,17 @@ a.CARD_NO AS cardNo, a.PRODUCT_IDENT AS productIdent, a.YP_QTY AS ypQty, - a.YP_AREA AS ypArea, + ROUND(a.YP_QTY * a.YP_AREA , 6) AS ypArea, a.PRIORITY_ERP AS priorityErp, a.RELEASE_DATE AS releaseDate, - b.PUT_STORE_TIME AS putStoreTime + b.PUT_STORE_TIME AS putStoreTime, + a.PLATE AS plate, + a.YIELD_TYPE AS yieldType, + c.material AS material FROM MES_YIELD_ORDER a INNER JOIN MES_WORK_ORDER b ON a.id = b.yo_id + INNER JOIN DS_PART c ON a.part_code = c.part_code WHERE a.IS_DELETED = 0 AND b.IS_DELETED = 0 @@ -228,13 +232,17 @@ a.CARD_NO AS cardNo, a.PRODUCT_IDENT AS productIdent, a.YP_QTY AS ypQty, - a.YP_AREA AS ypArea, + ROUND(a.YP_QTY * a.YP_AREA , 6) AS ypArea, a.PRIORITY_ERP AS priorityErp, a.RELEASE_DATE AS releaseDate, - b.PUT_STORE_TIME AS putStoreTime + b.PUT_STORE_TIME AS putStoreTime, + a.PLATE AS plate, + a.YIELD_TYPE AS yieldType, + c.material AS material FROM MES_YIELD_ORDER a INNER JOIN MES_WORK_ORDER b ON a.id = b.yo_id + INNER JOIN DS_PART c ON a.part_code = c.part_code WHERE a.IS_DELETED = 0 AND b.IS_DELETED = 0 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java index 9de695f8f..736f1e384 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PdaLoadServiceImpl.java @@ -612,13 +612,13 @@ public class PdaLoadServiceImpl extends BaseServiceImpl { - workPlan.setOcId(ocId); - }); + workPlans.forEach(workPlan -> workPlan.setOcId(ocId)); List batchResults = workPlanMapper.updateById(workPlans); - // todo:qyl 2.在MES更改后同步给ERP - return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java index 290a62eb8..704a881e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderServiceImpl.java @@ -2998,7 +2998,10 @@ public class WorkOrderServiceImpl extends BaseServiceImpl sjCompleteVO.setPriorityErpName(YieldOrderEnum.getName(sjCompleteVO.getPriorityErp()))); + subCompleteData.forEach(sjCompleteVO -> { + sjCompleteVO.setPriorityErpName(YieldOrderEnum.getName(sjCompleteVO.getPriorityErp())); + sjCompleteVO.setYieldTypeName(YieldOrderEnum.getName(sjCompleteVO.getYieldType())); + }); return subCompleteData; }