From 81e151f26b6852416ae0b7679d081900c9e64ace Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 17 七月 2024 14:51:15 +0800
Subject: [PATCH] status and result change
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceResult.java | 37 ++++++++++++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java | 6 +-
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 81 ++++++++++++++++++++------
3 files changed, 101 insertions(+), 23 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceResult.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceResult.java
new file mode 100644
index 0000000..b7dbe84
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceResult.java
@@ -0,0 +1,37 @@
+package com.dy.pmsGlobal.util;
+
+public enum DeviceResult {
+ PASS(1, "閫氳繃"),
+ TEST_PASS(2, "娴嬭瘯閫氳繃"),
+ INSPECTION_PASS(3, "鍝佹閫氳繃"),
+ REPAIR_PASS(4, "缁翠慨閫氳繃"),
+ TEST_FAIL(5, "娴嬭瘯涓嶉�氳繃"),
+ INSPECTION_FAIL(6, "鍝佹涓嶉�氳繃"),
+ WASTE(7, "鎶ュ簾");
+
+ private final int code;
+ private final String description;
+
+ DeviceResult(int code, String description) {
+ this.code = code;
+ this.description = description;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ // 鏍规嵁code鍊艰幏鍙栧搴旂殑鏋氫妇鍊�
+ public static DeviceResult fromCode(int code) {
+ for (DeviceResult result : values()) {
+ if (result.code == code) {
+ return result;
+ }
+ }
+ throw new IllegalArgumentException("鏈煡鐨勬灇涓綾ode: " + code);
+ }
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java
index a55c5a3..f2a626c 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/util/DeviceStatus.java
@@ -5,9 +5,9 @@
ASSEMBLING(1, "缁勮涓�"),
COMPLETED(2, "瀹屾垚"),
REPAIR(3, "缁翠慨"),
- WASTE(4, "鎶ュ簾"),
- TEST_FAILED(5, "娴嬭瘯涓嶉�氳繃"),
- INSPECTION_FAILED(6, "鍝佹涓嶉�氳繃");
+ WASTE(4, "鎶ュ簾");
+ //TEST_FAIL(5, "娴嬭瘯涓嶉�氳繃"),
+ //INSPECTION_FAIL(6, "鍝佹涓嶉�氳繃");
private final int code;
private final String description;
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index ddb5aa2..270287e 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -15,6 +15,7 @@
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.*;
+import com.dy.pmsGlobal.util.DeviceResult;
import com.dy.pmsGlobal.util.DeviceStatus;
import com.dy.pmsGlobal.util.QrCodeConstant;
import lombok.extern.slf4j.Slf4j;
@@ -233,6 +234,7 @@
record.assistants = workLast.assistants;
record.errorMsg = params.errorMsg;
+ Boolean isEnd = false;//鏄惁缁忓巻杩囩粨鏉熻妭鐐�
PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
record.nodeContent = node.content;
if (node.isRecord) {
@@ -241,12 +243,14 @@
if (node.getIsEnd() && record.outLineTime == null) {
record.outLineTime = new Date();
assemblyPlan.setOutputNumber(assemblyPlan.getOutputNumber() + 1);
+ isEnd = true;
+ }else if(record.outLineTime != null){
+ isEnd = true;
}
assemblyPlanDao.updateByPrimaryKeySelective(assemblyPlan);
- record.status = getStatus(params.status, node.isEnd, workLast.workType.toString());
- if (record.status == null) {
- record.status = preRecord.status;
- }
+
+ record.status = getStatus(params.status, isEnd, workLast.workType.toString());
+ record.result = getResult(params.status, workLast.workType.toString());
return record;
}
@@ -265,32 +269,69 @@
}
/**
- * 鐘舵��: 0:寰呯敓浜�,1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
- *
+ * 鍘熺姸鎬�: 0:寰呯敓浜�,1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
+ *20240717褰撳墠鐘舵�� 鐘舵��: 1, 缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
* @param status 鐘舵��
- * @param isEndNode 鏄惁缁撴潫鑺傜偣
+ * @param isEnd 鏄惁缁忓巻杩囩粨鏉熻妭鐐�
* @return 鐘舵��
*/
- private Integer getStatus(String status, boolean isEndNode, String workType) {
- //缁勮,缁翠慨
- if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_REPAIR.equals(workType)) {
+ private Integer getStatus(String status, boolean isEnd, String workType) {
+ //缁勮 2024/07/17 鐩墠缁勮workType 1 鍙湁MarkOk //娴嬭瘯 //鍝佹 //缁翠慨
+ if (WORK_TYPE_ASSEMBLY.equals(workType) || WORK_TYPE_TEST.equals(workType) || WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_REPAIR.equals(workType)) {
return switch (status) {
- case QrCodeConstant.MarkOk -> isEndNode ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
- case QrCodeConstant.MarkUnqualified, QrCodeConstant.MarkPreUnqualified -> DeviceStatus.REPAIR.getCode();
- case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
- default -> throw new RuntimeException("鐘舵�侀敊璇�");
- };
- //鍝佹,娴嬭瘯
- } else if (WORK_TYPE_INSPECTION.equals(workType) || WORK_TYPE_TEST.equals(workType)) {
- return switch (status) {
- case QrCodeConstant.MarkOk -> null;//DeviceStatus.COMPLETED.getCode();
- case QrCodeConstant.MarkUnqualified -> DeviceStatus.TEST_FAILED.getCode();
+ case QrCodeConstant.MarkOk -> isEnd ? DeviceStatus.COMPLETED.getCode() : DeviceStatus.ASSEMBLING.getCode();
+ case QrCodeConstant.MarkUnqualified -> DeviceStatus.REPAIR.getCode();
case QrCodeConstant.MarkWaste -> DeviceStatus.WASTE.getCode();
default -> throw new RuntimeException("鐘舵�侀敊璇�");
};
}
throw new RuntimeException("鐘舵�侀敊璇紝鏃犳晥鐨勮妭鐐圭被鍨�: " + workType);
}
+ /**
+ * 缁撴灉: 1:閫氳繃,2:娴嬭瘯閫氳繃,3:鍝佹閫氳繃,4:缁翠慨閫氳繃,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃,7:鎶ュ簾
+ * @param status 鍓嶇鍑烘潵鐨勭姸鎬�
+ * @return 缁撴灉
+ */
+ private Integer getResult(String status, String workType) {
+ //缁勮
+ if (WORK_TYPE_ASSEMBLY.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> DeviceResult.PASS.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ //娴嬭瘯
+ }else if (WORK_TYPE_TEST.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> DeviceResult.TEST_PASS.getCode();
+ case QrCodeConstant.MarkUnqualified -> DeviceResult.TEST_FAIL.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ //鍝佹
+ }else if (WORK_TYPE_INSPECTION.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> DeviceResult.INSPECTION_PASS.getCode();
+ case QrCodeConstant.MarkUnqualified -> DeviceResult.INSPECTION_FAIL.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ //缁翠慨
+ }else if (WORK_TYPE_REPAIR.equals(workType)) {
+ return switch (status) {
+ case QrCodeConstant.MarkOk -> DeviceResult.REPAIR_PASS.getCode();
+ case QrCodeConstant.MarkWaste -> DeviceResult.WASTE.getCode();
+ default -> throw new RuntimeException("鐘舵�侀敊璇�");
+ };
+ }
+ throw new RuntimeException("鐘舵�侀敊璇紝鏃犳晥鐨勮妭鐐圭被鍨�: " + workType);
+ }
+
+
+
+
+
+
+
+
+
public int repair(QueryVo vo) {
long workId = Long.parseLong(vo.workId);
--
Gitblit v1.8.0