From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs

---
 src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
index 138f91b..99b6d01 100644
--- a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -38,9 +38,9 @@
 
     public static CrnStatusType process(Integer ioType){
         if (ioType>100) {
-            return MACHINE_PAKIN;
-        } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
             return MACHINE_PAKOUT;
+        } else if (ioType < 100 && ioType!=3 && ioType!=6 && ioType!=11) {
+            return MACHINE_PAKIN;
         } else if (ioType == 3) {
             return MACHINE_SITE_MOVE;
         } else if (ioType == 11) {

--
Gitblit v1.9.1