pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java
@@ -55,7 +55,7 @@ /** * 是否禁用，1是，0否 */ @JSONField(serialize = false) //@JSONField(serialize = false) public Boolean disabled; /** pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/QrCodeConstant.java
@@ -19,6 +19,7 @@ public static final String MarkPreUnqualified = "102005" ; //上位不合格：设备生产过程中发现上位工站生产不合格 public static final String MarkWaste = "102006" ; //废品：设备生产过程中成为废品，实为废弃了该设备编码和部分配件 public static final String MarkLogout = "102007" ; //注销：生产作业人员在生产后注销工站绑定 public static final String MarkQualified = "102008" ; //合格：设备生产过程中本工站生产合格 public static final int MarkQrCodeWidth = 300 ; public static final int MarkQrCodeHeight = 300 ; @@ -30,7 +31,8 @@ {MarkUnqualified, "不合格"}, {MarkPreUnqualified, "上位不合格"}, {MarkWaste, "废品"}, {MarkLogout, "注销"} } ; {MarkLogout, "注销"}, {MarkQualified, "合格"}} ; } } pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
@@ -74,10 +74,7 @@ if(assemblyDao.exists(plan.name,plan.id)){ throw new RuntimeException("计划名称不能重复"); } PrProductionProcess process = processDao.selectByPrimaryKey(plan.processId); if(process == null || !process.proId.equals(plan.proId)){ throw new RuntimeException("产品与生产流程不匹配"); } extractedCheck(plan); PrBatchNumber batch = new PrBatchNumber(); batch.batchNumber = getNextCode(); batch.proId = plan.proId; @@ -130,6 +127,10 @@ if(process == null || !process.proId.equals(plan.proId)){ throw new RuntimeException("产品与生产流程不匹配"); } //开始日期要小于结束日期 if(plan.startDate.compareTo(plan.endDate) > 0){ throw new RuntimeException("开始日期不能大于结束日期"); } //Fancy add 2024/07/09 如果状态为执行 ,则结束日期必须大于等于当前日期 if(plan.status == PlanStatusEnum.NORMAL.getCode()){ String endDateStr = plan.getEndDate();
