From ea7e96af3785241c34f6a6385fb10745328c3e56 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 23 七月 2024 11:31:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java | 9 +++++----
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/QrCodeConstant.java | 4 +++-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java
index 03020de..208f8d7 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoPlt/PltProductTestInspectionItems.java
+++ b/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;
/**
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/QrCodeConstant.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/QrCodeConstant.java
index 6368073..7bc1d45 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/QrCodeConstant.java
+++ b/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, "鍚堟牸"}} ;
}
}
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
index d4fa13e..0d8501b 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/taskPlan/AssemblySv.java
+++ b/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();
--
Gitblit v1.8.0