withdraw修改

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

@@ -243,9 +243,6 @@ public class Micron20031Api {
         return "";
         return "";
     }
     }
 
 
-    public static void main(String[] args) {
-        getAuthToken();
-    }
 
 
     /**
     /**
      * Order
      * Order
@@ -679,11 +676,12 @@ public class Micron20031Api {
         Map<String,String> dataMap = new HashMap<>();
         Map<String,String> dataMap = new HashMap<>();
         dataMap.put("MicronLotID",micronLotId);
         dataMap.put("MicronLotID",micronLotId);
         dataMap.put("EquipID",equipId);
         dataMap.put("EquipID",equipId);
+        dataMap.put("MaterialType", MATERIAL_TYPE);
 
 
         log.info("调用MES接口 GetMicronPN,参数:"+JsonUtil.toJsonStr(dataMap));
         log.info("调用MES接口 GetMicronPN,参数:"+JsonUtil.toJsonStr(dataMap));
         String resultStr = HttpHelper.postJsonWithAuth(checkStockAvailableUrl, dataMap, auth);
         String resultStr = HttpHelper.postJsonWithAuth(checkStockAvailableUrl, dataMap, auth);
         log.info("调用MES接口 GetMicronPN 返回:" + resultStr);
         log.info("调用MES接口 GetMicronPN 返回:" + resultStr);
-        String pn = getResult(resultStr,"MicronPN");
+        String pn = getResult(resultStr,"micronPn");
         return pn;
         return pn;
     }
     }
 
 

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

@@ -86,10 +86,12 @@ public class MicronSpUnloadController {
 
 
             Criteria c = Criteria.where("used").is(true);
             Criteria c = Criteria.where("used").is(true);
             c.and("barcode.partNumber").is(pn);
             c.and("barcode.partNumber").is(pn);
-            c.and("enable").is(true);
+            c.and("enabled").is(true);
             c.and("barcode.lockId").is(null);
             c.and("barcode.lockId").is(null);
             c.and("barcode.appendData.AuthoriseNg").ne(true);
             c.and("barcode.appendData.AuthoriseNg").ne(true);
+            if (excludePosIds != null && !excludePosIds.isEmpty()){
                 c.and("id").nin(excludePosIds);
                 c.and("id").nin(excludePosIds);
+            }
             Query q = new Query(c);
             Query q = new Query(c);
             Sort sort =storagePosManager.getSortByCheckOutType(checkoutType);
             Sort sort =storagePosManager.getSortByCheckOutType(checkoutType);
             q.with(sort);
             q.with(sort);