增加 LoadingController

src/main/java/com/neotel/smfcore/common/utils/Constants.java

@@ -167,4 +167,11 @@ public class Constants {
      * 同条码入库设置：
      * 同条码入库设置：
      */
      */
     public static final String CACHE_SAME_BARCODE_SETTINGS   ="CACHE_sameBarcode_settings";
     public static final String CACHE_SAME_BARCODE_SETTINGS   ="CACHE_sameBarcode_settings";
+
+
+    /**
+     * 当前入库信息：
+     */
+    public static final String CACHE_LOADING   ="CACHE_LOADING_INFO";
+
 }
 }

src/main/java/com/neotel/smfcore/custom/micron1053/controller/api/bean/AMaterialBean.java → src/main/java/com/neotel/smfcore/custom/micron1053/api/AMaterialBean.java

-package com.neotel.smfcore.custom.micron1053.controller.api.bean;
+package com.neotel.smfcore.custom.micron1053.api;
 
 
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.custom.micron1053.util.MicronDataCache;
 import com.neotel.smfcore.custom.micron1053.util.MicronDataCache;

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

+package com.neotel.smfcore.custom.micron1053.api;
+
+public class MODE {
+//    MBR|REQ|MCL|GR|MATRET|RET|NPI|RACK|PCBPRETASK|MCLPRETASK|LINEPREP|CTRLDISPATCH
+    public static String MBR="MBR";
+    public static String REQ="REQ";
+    public static String MCL="MCL";
+    public static String GR="GR";
+    public static String MATRET="MATRET";
+    public static String RET="RET";
+    public static String NPI="NPI";
+    public static String RACK="RACK";
+    public static String PCBPRETASK="PCBPRETASK";
+    public static String MCLPRETASK="MCLPRETASK";
+    public static String LINEPREP="LINEPREP";
+    public static String CTRLDISPATCH="CTRLDISPATCH";
+}

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

-package com.neotel.smfcore.custom.micron1053.controller;
+package com.neotel.smfcore.custom.micron1053.api;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.common.exception.ApiException;
@@ -7,16 +7,12 @@ import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.core.api.listener.BaseSmfApiListener;
 import com.neotel.smfcore.core.api.listener.BaseSmfApiListener;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
-import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.custom.micron1053.bean.MaterialInfo;
 import com.neotel.smfcore.custom.micron1053.bean.MaterialInfo;
 import com.neotel.smfcore.custom.micron1053.bean.MicronResult;
 import com.neotel.smfcore.custom.micron1053.bean.MicronResult;
-import com.neotel.smfcore.custom.micron1053.controller.api.bean.AMaterialBean;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 
 import java.text.MessageFormat;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -293,17 +289,20 @@ public class MicronApi extends BaseSmfApiListener {
     }
     }
 
 
 
 
-    public static boolean Api011(String mode, String userName, String source) {
+    public static String Api011(String mode, String userName, String source) {
+//        Mode = "MBR|REQ|MCL|GR|MATRET|RET|NPI|RACK|PCBPRETASK|MCLPRETASK|LINEPREP|CTRLDISPATCH"
+//        Source = toolId, Facility+area for UI
         String url = config.getUrl(config.api_name_011);
         String url = config.getUrl(config.api_name_011);
         url = url + "?mode=" + mode + "&=username=" + userName + "&source=" + source;
         url = url + "?mode=" + mode + "&=username=" + userName + "&source=" + source;
         try {
         try {
             MicronResult result = HttpHelper.getMicronJson(url);
             MicronResult result = HttpHelper.getMicronJson(url);
-            return true;
+            String operationId=result.getResult("operationId");
+            return operationId;
         } catch (ApiException e) {
         } catch (ApiException e) {
             log.error(url + "出错", e);
             log.error(url + "出错", e);
         }
         }
 
 
-        return false;
+        return "";
     }
     }
 
 
 
 

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronConfig.java → src/main/java/com/neotel/smfcore/custom/micron1053/api/MicronConfig.java

-package com.neotel.smfcore.custom.micron1053.controller;
+package com.neotel.smfcore.custom.micron1053.api;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
@@ -12,7 +12,7 @@ import javax.annotation.PostConstruct;
 @Service
 @Service
 @Slf4j
 @Slf4j
 public class MicronConfig {
 public class MicronConfig {
-    @Value("${micron.addr:}")
+    @Value("${micron.apiAddr:}")
     public String micronAddr;
     public String micronAddr;
 
 
 
 

src/main/java/com/neotel/smfcore/custom/micron1053/bean/MicronResult.java

@@ -43,7 +43,7 @@ public class MicronResult implements Serializable {
 
 
    private Map<String, Object> resultMap=null;
    private Map<String, Object> resultMap=null;
 
 
-    private   <T> T getResult(  String key) throws ApiException {
+    public   <T> T getResult(  String key) throws ApiException {
         if (ObjectUtil.isEmpty(responseData)) {
         if (ObjectUtil.isEmpty(responseData)) {
             return null;
             return null;
         }
         }

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronTestController.java

@@ -2,6 +2,7 @@ package com.neotel.smfcore.custom.micron1053.controller;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.JsonUtil;
+import com.neotel.smfcore.custom.micron1053.api.MicronApi;
 import com.neotel.smfcore.custom.micron1053.bean.MaterialInfo;
 import com.neotel.smfcore.custom.micron1053.bean.MaterialInfo;
 import com.neotel.smfcore.custom.micron1053.bean.MicronResult;
 import com.neotel.smfcore.custom.micron1053.bean.MicronResult;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;

src/main/java/com/neotel/smfcore/custom/micron1053/loading/Bean/LoadingInfo.java

+package com.neotel.smfcore.custom.micron1053.loading.Bean;
+
+import cn.hutool.core.date.DateTime;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 当前入库信息
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoadingInfo implements Serializable {
+
+    /**
+     * 当前入库模式
+     */
+    public String mode="";
+
+    /**
+     * 当前获取到的
+     */
+    public String operationId="";
+
+
+    public DateTime startTime;
+
+
+    public List<String> rfidList=new ArrayList<>();
+}

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

+package com.neotel.smfcore.custom.micron1053.loading;
+
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Slf4j
+@RestController
+@Api(tags = "1053：loading")
+@RequestMapping("/rest/loading")
+@RequiredArgsConstructor
+public class LoadingController {
+
+
+    @ApiOperation("lOADING页面数据获取")
+    @GetMapping("/status")
+    @AnonymousAccess
+    public ResultBean loading(HttpServletRequest servletRequest ) {
+        return ResultBean.newOkResult("");
+    }
+
+
+    @ApiOperation("loading->ReturnMaterial  页面数据获取")
+    @GetMapping("/returnMaterial")
+    @AnonymousAccess
+    public ResultBean returnMaterial(HttpServletRequest servletRequest ) {
+        return ResultBean.newOkResult("");
+    }
+
+}

src/main/resources/config/application-prod.yml

-
+micron:
+  apiAddr: https://testapigtwy.micron.com/t/app.mfg/mmsil/v1/DEVL/SINGAPORE/
+  api_name_001: material/validation/label
+  api_name_002: material/transfer-in
+  api_name_004: operation/dispatchIds?operationId={operationId}
+  api_name_005: material/lineprep/{LinePrepOrderId}
+  api_name_006: material/pretasks
+  api_name_007: material/transfer-out
+  api_name_008: material/xray/{serialNum}/{qty}
+  api_name_009: material/status
+  api_name_010: material/track-out
+  api_name_011: operation?mode={Mode}&username={Username}&source={Source}
+  api_name_101: operation/validation/mbr?id={Id}&operationId={operationId}&skipSap={SkipSap}
+  api_name_102: operation/validation/req?id={Id}&operationId={operationId}
+  api_name_103: operation/validation/gr?purchaseOrder={PurchaseOrder}&packagingSlip={PackagingSlip}&operationId={operationId}&skipSap={SkipSap}
+  api_name_201: operation/validate/ctrldispatch?linePrepOrderId={linePrepOrderId}&operationId={operationId}
+  api_name_202: user/{badgeId}
 
 
 # 登录相关配置
 # 登录相关配置
 login:
 login: