diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index 9b9dbaefe..aaa753981 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -23,8 +23,6 @@ import java.util.Date; @TableName(value = "MES_YIELD_ORDER") @Data public class YieldOrder extends BaseEntity { - @TableField(exist = false) - private static final long serialVersionUID = 1L; /** * 待接收 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index e9b4b1c01..0c3dd6dcd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -1013,23 +1013,23 @@ public class YieldOrderServiceImpl extends BaseServiceImpl listWo = workOrderMapper.listByYoId(yo.getId()); boolean completed = listWo.stream().map(wo -> wo.getRunStatus() >= WorkOrder.RUN_STATUS_COMPLETED).findAny().isPresent(); if (completed) { yo.setStatus(curStatus); } - } else if (YieldOrder.CUR_STATUS_VOIDED.equals(curStatus)) { + } else if (YieldOrderEnum.STATUS_CLOSED.getCode() == curStatus) { //整单报废 List listWo = workOrderMapper.selectList(Wrappers.lambdaQuery(WorkOrder.class).eq(WorkOrder::getYoId, yo.getId())); boolean completed = listWo.stream().map(wo -> WorkOrder.RUN_STATUS_VOIDED.equals(wo.getRunStatus())).findAny().isPresent(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java index 8e984590f..25f8e90b1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldPlanServiceImpl.java @@ -20,6 +20,7 @@ import org.springblade.desk.order.mapper.YieldPlanMapper; import org.springblade.desk.order.pojo.dto.YieldPlanDto; import org.springblade.desk.order.pojo.entity.YieldOrder; import org.springblade.desk.order.pojo.entity.YieldPlan; +import org.springblade.desk.order.pojo.enums.YieldOrderEnum; import org.springblade.desk.order.pojo.enums.YieldPlanEnum; import org.springblade.desk.order.service.IYieldOrderService; import org.springblade.desk.order.service.IYieldPlanService; @@ -216,7 +217,7 @@ public class YieldPlanServiceImpl extends BaseServiceImpl list = yieldOrderService.list(Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getFatherYoId, yieldOrder.getId())); if (CollectionUtils.isNotEmpty(list)) { // 将list转换为id集合 @@ -907,7 +907,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl workPlanItems = workPlanItemService.list(Wrappers.lambdaQuery(WorkPlanItem.class).eq(WorkPlanItem::getWpId, wpId)); + List workPlanItems = workPlanItemService.list(Wrappers.lambdaQuery(WorkPlanItem.class).eq(WorkPlanItem::getWpId, wpId).orderByAsc(WorkPlanItem::getItemCode)); if (CollectionUtils.isNotEmpty(workPlanItems)) { List itemDetails = workPlanItemDetailService.list(Wrappers.lambdaQuery(WorkPlanItemDetail.class).in(WorkPlanItemDetail::getWorkPlanItemId, workPlanItems.stream().map(WorkPlanItem::getId).toList())); List itemVos = new ArrayList<>(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index dafd38140..fe0296b1d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -45,6 +45,7 @@ import org.springblade.desk.device.service.IFeiBaSetService; import org.springblade.desk.device.service.IRackSetService; import org.springblade.desk.order.mapper.YieldOrderMapper; import org.springblade.desk.order.pojo.entity.YieldOrder; +import org.springblade.desk.order.pojo.enums.YieldOrderEnum; import org.springblade.desk.produce.mapper.WorkOrderMapper; import org.springblade.desk.produce.mapper.WorkPlanMapper; import org.springblade.desk.produce.pojo.dto.*; @@ -1657,7 +1658,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl planList, List moduleList) { - if (yieldType == YieldOrder.YIELD_TYPE_4 || yieldType == YieldOrder.YIELD_TYPE_5) { + if (yieldType == YieldOrderEnum.YIELD_TYPE_4.getCode() || yieldType == YieldOrderEnum.YIELD_TYPE_5.getCode()) { return this.metalParts(woId); - } else if (yieldType == YieldOrder.YIELD_TYPE_6) { // 石墨模 + } else if (yieldType == YieldOrderEnum.YIELD_TYPE_6.getCode()) { // 石墨模 // return this.graphiteMold(woId); return this.metalParts(woId); - } else if (yieldType == YieldOrder.YIELD_TYPE_3) { // 玻璃饼 + } else if (yieldType == YieldOrderEnum.YIELD_TYPE_3.getCode()) { // 玻璃饼 return this.glassCake(woId); - } else if (yieldType == YieldOrder.YIELD_TYPE_2) { // 玻璃封接部件 + } else if (yieldType == YieldOrderEnum.YIELD_TYPE_2.getCode()) { // 玻璃封接部件 return this.glassSealing(woId, planList, moduleList); } diff --git a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java index 1260f007c..c611b4145 100644 --- a/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java +++ b/blade-service/blade-erpdata/src/main/java/org/springblade/erpdata/service/impl/ErpMesRbWoServiceImpl.java @@ -284,7 +284,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { purtosoList.forEach(mesRbPurtoso -> { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); - yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode()); yieldOrder.setYpCode(mesRbPurtoso.getWono()); yieldOrder.setYpMemo("物资转车间协作加工"); yieldOrder.setManualIncrease(false); @@ -363,7 +363,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { pacturnrecordList.forEach(mesRbPacturnrecord -> { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); - yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode()); yieldOrder.setYpMemo("临时工艺转工"); yieldOrder.setManualIncrease(false); yieldOrder.setYpCode(mesRbPacturnrecord.getWono()); @@ -438,7 +438,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { rbtosoList.forEach(mesRbtoso -> { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); - yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_SJ); + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_SJ.getCode()); yieldOrder.setYpMemo("烧结转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbtoso.getSono());//生产单号 @@ -507,7 +507,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { wxpromotionList.forEach(mesRbWxpromotion -> { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); - yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode()); yieldOrder.setYpMemo("推进计划"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbWxpromotion.getSono());//生产单号 @@ -590,7 +590,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { mesRbSodelrecwxList.forEach(mesRbSodelrecwx -> { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(false); - yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode()); yieldOrder.setYpMemo("外协转工单"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbSodelrecwx.getSono());//生产单号 @@ -670,7 +670,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { //将查询出的数据放到单个的变量中 YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); - yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode()); yieldOrder.setYpMemo("正式工艺转工"); yieldOrder.setManualIncrease(false); yieldOrder.setYoCode(mesRbSodelreczg.getSono());//生产单号 @@ -755,7 +755,7 @@ public class ErpMesRbWoServiceImpl implements IErpMesRbWoService { mesRbPkList.forEach(mesRbPk -> { YieldOrder yieldOrder=new YieldOrder(); yieldOrder.setSiteWork(true); - yieldOrder.setBusinessType(YieldOrder.BUSINESS_TYPE_RB); + yieldOrder.setBusinessType(YieldOrderEnum.BUSINESS_TYPE_RB.getCode()); yieldOrder.setYpMemo("配套转工单"); yieldOrder.setYoCode(mesRbPk.getWono());//生产单号 yieldOrder.setYpCode(mesRbPk.getWono());