From 64acda9a1abdc14f14ac8612061843621bf002c0 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 16 Jan 2026 09:52:00 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=99=EC=8A=B5=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20>=20=EB=9D=BC=EB=B2=A8=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=20=EC=83=81=ED=83=9C=20=EA=B8=B0=ED=9A=8D=EC=95=88=EC=97=90=20?= =?UTF-8?q?=EB=A7=9E=EA=B2=8C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java | 7 +------ .../com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java index 9f0663e8..fef1c33e 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java @@ -22,12 +22,7 @@ public class LabelAllocateDto { public enum LabelMngState implements EnumType { PENDING("작업대기"), ASSIGNED("작업할당"), - STOP("중단"), - LABEL_ING("라벨진행중"), - LABEL_COMPLETE("라벨완료"), - INSPECT_REQ("검수요청"), - INSPECT_ING("검수진행중"), - INSPECT_COMPLETE("검수완료"), + ING("진행중"), FINISH("종료"); private String desc; diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java index 761567d1..2fd6f313 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/LabelWorkDto.java @@ -85,9 +85,7 @@ public class LabelWorkDto { } else if (this.labelTotCnt > 0 && this.labelAssignCnt > 0 && this.labelCompleteTotCnt == 0) { mngState = LabelMngState.ASSIGNED.getId(); } else if (this.labelCompleteTotCnt > 0) { - mngState = LabelMngState.LABEL_ING.getId(); - } else if (this.labelTotCnt <= labelCompleteTotCnt) { - mngState = LabelMngState.LABEL_COMPLETE.getId(); + mngState = LabelMngState.ING.getId(); } else if (this.labelingClosedYn.equals("Y") && this.inspectionClosedYn.equals("Y")) { mngState = LabelMngState.FINISH.getId(); }