20031锡膏料仓修改

src/main/java/com/neotel/smfcore/custom/micron20031/Micron20031Api.java

 package com.neotel.smfcore.custom.micron20031;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.exception.ApiException;
 import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.HttpHelper;
@@ -22,6 +23,13 @@ public class Micron20031Api {
     public static String MODE_DISABLE_MAM_AND_SAP="DISABLE_MAM_AND_SAP";
     public static String MODE_ENABLE_MAM_SAP="ENABLE_MAM_SAP";
 
+    public static String NORMAL_RETURN="NORMAL_RETURN";//Return
+    public static String EXPIRED_DISPOSAL="EXPIRED_DISPOSAL";//Removal
+
+    public static String Email_TO="";
+    public static String Email_CC="";
+
+
     private static String AUTH_TOKEN = "";
 
     private static String MATERIAL_TYPE = "SOLDER_PASTE";
@@ -215,6 +223,7 @@ public class Micron20031Api {
         Date stabilizationEndDate = DateUtil.toDate(stabilizationEndDateObj.toString(),"MM-dd-yyyy");
         barcode.updateAppendData("stabilizationEndDate",stabilizationEndDate);
         barcode.updateAppendData("opUsername",username);
+        barcode.updateAppendData("maTrackOut",false);
         Object exposureStartDateObj = resultMap.get("ExposureStartDate");
         Date exposureStartDate = DateUtil.toDate(exposureStartDateObj.toString(),"MM-dd-yyyy");
         barcode.setOpenTime(exposureStartDate);
@@ -342,6 +351,11 @@ public class Micron20031Api {
     public static List<String> getEquipIDList() throws ApiException {
         List<String> equipIdList = new ArrayList<>();
         String checkStockAvailableUrl = "";
+        if(ObjectUtil.isEmpty(checkStockAvailableUrl)) {
+            List<String> result = new ArrayList<String>();
+            result.add("test1");
+            result.add("test2");
+        }
         String auth = getAuthToken();
         Map<String,String> dataMap = new HashMap<>();
         dataMap.put("Facility","MODULE SINGAPORE");
@@ -402,6 +416,9 @@ public class Micron20031Api {
      */
     public static void chkAuthoriseToDispatch(Barcode barcode, String mode, String username) throws ApiException {
         String checkStockAvailableUrl = "";
+        if(ObjectUtil.isEmpty(checkStockAvailableUrl)){
+            return;
+        }
         String auth = getAuthToken();
         Map<String,Object> dataMap = new HashMap<>();
         dataMap.put("MicronPN",barcode.getPartNumber());
@@ -454,11 +471,14 @@ public class Micron20031Api {
      * //Input: TypeofReturn, MicronPN, LotNo, BatchNo, Location, RemainingQuantity, Mode, Username, SystemId, MaterialType
      * //Output: TypeofReturn, MicronPN, LotNo, BatchNo, Location, RemainingQuantity, Mode, Username, SystemId, MaterialType, Message, Status, ExpiredDate
      */
-    public static Barcode returnMaterial(Barcode barcode, String mode, String username) throws ApiException {
+    public static Barcode returnMaterial(Barcode barcode, String typeOfReturn, String username) throws ApiException {
         String checkStockAvailableUrl = "";
+        if(ObjectUtil.isEmpty(checkStockAvailableUrl)){
+            return barcode;
+        }
         String auth = getAuthToken();
         Map<String,Object> dataMap = new HashMap<>();
-        dataMap.put("TypeofReturn","NORMAL_RETURN");
+        dataMap.put("TypeofReturn",typeOfReturn);
         dataMap.put("MicronPN",barcode.getPartNumber());
         dataMap.put("LotNo",barcode.getBarcode());
         dataMap.put("BatchNo",barcode.getBatch());

src/main/java/com/neotel/smfcore/custom/micron20031/Micron20031Menu.java

@@ -28,9 +28,9 @@ public class Micron20031Menu {
         String menuLabel = "20031";
 
         //20031锡膏料仓菜单
-        MenuInit.addMenu(menuLabel,null, 1, "设备概览", "spKanban", "neolight/spKanban/index","sKanban");
+        MenuInit.addMenu(menuLabel,null, -100, "设备概览", "spKanban", "neolight/spKanban/index","sKanban");
 
-        Menu report = Menu.CreatePMenu("报表", 7, "report","inOutData",null);
+        Menu report = Menu.CreatePMenu("报表", 1, "report","inOutData",null);
         //Report菜单
         MenuInit.addMenu(menuLabel,report, 121, "Material Movement", "movementReport", "system/movementReport/index","movementReport");
         MenuInit.addMenu(menuLabel,report, 122, "Inventory", "inventoryReport", "system/inventoryReport/index","inventoryReport");
@@ -44,12 +44,12 @@ public class Micron20031Menu {
 //        MenuInit.addMenu(menuLabel,null, 4, "Performance Report", "performanceReport", "system/performanceReport/index","performanceReport");
 //        MenuInit.addMenu(menuLabel,null, 5, "Abnormality Report", "abnormReport", "system/abnormReport/index","abnormReport");
 
-        MenuInit.addMenu(menuLabel,null, 6, "Order", "order", "system/order/index","order");
-        MenuInit.addMenu(menuLabel,null, 7, "Deposit", "deposit", "system/deposit/index","deposit");
-        MenuInit.addMenu(menuLabel,null, 8, "Stabilization", "stabilization", "system/stabilization/index","stabilization");
-        MenuInit.addMenu(menuLabel,null, 9, "Withdraw", "withdraw", "system/withdraw/index","withdraw");
-        MenuInit.addMenu(menuLabel,null, 10, "Return", "returnPage", "system/returnPage/index","returnPage");
-        MenuInit.addMenu(menuLabel,null, 11, "Removal", "removal", "system/removal/index","removal");
+        MenuInit.addMenu(menuLabel,null, -11, "Order", "order", "system/order/index","order");
+//        MenuInit.addMenu(menuLabel,null, -10, "Deposit", "deposit", "system/deposit/index","deposit");
+        MenuInit.addMenu(menuLabel,null, -9, "Stabilization", "stabilization", "system/stabilization/index","stabilization");
+ //       MenuInit.addMenu(menuLabel,null, -8, "Withdraw", "withdraw", "system/withdraw/index","withdraw");
+//        MenuInit.addMenu(menuLabel,null, -7, "Return", "returnPage", "system/returnPage/index","returnPage");
+//        MenuInit.addMenu(menuLabel,null, -6, "Removal", "removal", "system/removal/index","removal");
 
         String apiName = smfApi.getApiName();
         if(Strings.isNotBlank(apiName) && apiName.equals(menuLabel)){