COMPLETE改为COMPLETED

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -456,7 +456,7 @@ public class LiteOrderCache {
                                         log.info(" mode=" + order.getMode() + "的出库已结束，清空 key=" + key + " 的cache，更改action=COMPLETE");
                                         log.info(" mode=" + order.getMode() + "的出库已结束，清空 key=" + key + " 的cache，更改action=COMPLETE");
                                         dataCache.updateCache(key, "");
                                         dataCache.updateCache(key, "");
 
 
-                                        MicronApi.ActionUpdate(order.getOperationId(), MicronApi.COMPLETE);
+                                        MicronApi.ActionUpdate(order.getOperationId(), MicronApi.COMPLETED);
                                     }
                                     }
                                     clearOrderLock(order);
                                     clearOrderLock(order);
                                 }
                                 }

src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronApi.java

@@ -31,7 +31,7 @@ import java.util.*;
 public class MicronApi  {
 public class MicronApi  {
 //    每个流程开始时发START,流程正常结束发COMPLETE，流程异常结束发ABORT
 //    每个流程开始时发START,流程正常结束发COMPLETE，流程异常结束发ABORT
     public static String START="START";
     public static String START="START";
-    public static String COMPLETE="COMPLETE";
+    public static String COMPLETED ="COMPLETED";
     public static String ABORT="ABORT";
     public static String ABORT="ABORT";
 
 
 
 
@@ -764,7 +764,7 @@ public class MicronApi  {
         if (Debug) {
         if (Debug) {
             for (Barcode barcode :
             for (Barcode barcode :
                     barcodeList) {
                     barcodeList) {
-                resultMap.put(barcode.getBarcode(), new MaterialStatus(barcode.getBarcode(), barcode.getPartNumber(), "", "", true,"Available"));
+                resultMap.put(barcode.getBarcode(), new MaterialStatus(barcode.getBarcode(), barcode.getPartNumber(), "", "", true,"Reserved"));
             }
             }
             return resultMap;
             return resultMap;
         }
         }

src/main/java/com/neotel/smfcore/custom/micron1053/loading/LoadingController.java

@@ -36,7 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Array;
 import java.util.*;
 import java.util.*;
 
 
 @Slf4j
 @Slf4j
@@ -309,7 +308,7 @@ public class LoadingController {
         } else {
         } else {
             if (inList.getStatus() == INLIST_STATUS.OK){
             if (inList.getStatus() == INLIST_STATUS.OK){
                 log.info("  入库单[" + inList.getName() + "]：任务已全部完成，清空当前loadinginfo,更改action=COMPLETE");
                 log.info("  入库单[" + inList.getName() + "]：任务已全部完成，清空当前loadinginfo,更改action=COMPLETE");
-                MicronApi.ActionUpdate(inList.getOperationId(),MicronApi.COMPLETE  );
+                MicronApi.ActionUpdate(inList.getOperationId(),MicronApi.COMPLETED);
                 dataCache.updateCache(Constants.CACHE_LOADING, new LoadingInfo());
                 dataCache.updateCache(Constants.CACHE_LOADING, new LoadingInfo());
                 return ResultBean.newOkResult("");
                 return ResultBean.newOkResult("");
             }
             }