1.API超时时间改为60S

2.显示的库位号名称修改。
3.点料数量上传修改。

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

@@ -286,7 +286,7 @@ public class HttpHelper {
 //		}
 //		}
 		try {
 		try {
 			CloseableHttpClient httpClient = HttpClients.createDefault();
 			CloseableHttpClient httpClient = HttpClients.createDefault();
-			RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECTION_TIMEOUT).setConnectionRequestTimeout(10000).setSocketTimeout(5000).build();
+			RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECTION_TIMEOUT).setConnectionRequestTimeout(60000).setSocketTimeout(60000).build();
 			httpGet.setConfig(requestConfig);
 			httpGet.setConfig(requestConfig);
 			CloseableHttpResponse response = httpClient.execute(httpGet);
 			CloseableHttpResponse response = httpClient.execute(httpGet);
 			int code = response.getStatusLine().getStatusCode();
 			int code = response.getStatusLine().getStatusCode();
@@ -330,7 +330,7 @@ public class HttpHelper {
 			}
 			}
 			try {
 			try {
 				CloseableHttpClient httpClient = HttpClients.createDefault();
 				CloseableHttpClient httpClient = HttpClients.createDefault();
-				RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECTION_TIMEOUT).setConnectionRequestTimeout(10000).setSocketTimeout(5000).build();
+				RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(CONNECTION_TIMEOUT).setConnectionRequestTimeout(60000).setSocketTimeout(60000).build();
 				httpPost.setConfig(requestConfig);
 				httpPost.setConfig(requestConfig);
 				CloseableHttpResponse response = httpClient.execute(httpPost);
 				CloseableHttpResponse response = httpClient.execute(httpPost);
 				HttpEntity entity = response.getEntity();
 				HttpEntity entity = response.getEntity();

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -420,9 +420,14 @@ public class StoragePosController {
                 StoragePosDtos.get(i).setCid(storage.getCid());
                 StoragePosDtos.get(i).setCid(storage.getCid());
 
 
                 if(storage.isTHIRDBox()){
                 if(storage.isTHIRDBox()){
-                    StoragePosDtos.get(i).setPosName(storage.getCid());
+                    String posName=storage.getName() +"_"+StoragePosDtos.get(i).getPosName();
                     if(StoragePosDtos.get(i).getBarcode()!=null){
                     if(StoragePosDtos.get(i).getBarcode()!=null){
-                        StoragePosDtos.get(i).getBarcode().setPosName(storage.getCid());
+                        StoragePosDtos.get(i).getBarcode().setPosName(posName);
+                    }
+                }else{
+                    String posName=storage.getName() +"_"+StoragePosDtos.get(i).getPosName();
+                    if(StoragePosDtos.get(i).getBarcode()!=null){
+                        StoragePosDtos.get(i).getBarcode().setPosName(posName);
                     }
                     }
                 }
                 }
 
 

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

@@ -339,9 +339,9 @@ public class MicronDeviceController {
     @PostMapping(value = "/updateReelQty")
     @PostMapping(value = "/updateReelQty")
     @ResponseBody
     @ResponseBody
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean updateReelQty(@RequestBody Map<String,Object> param, HttpServletRequest request) {
-        String barcodeStr = param.get("barcode").toString();
-        Integer qty = Integer.parseInt(param.get("qty").toString());
+    public ResultBean updateReelQty(HttpServletRequest request) {
+        String barcodeStr = request.getParameter("barcode").toString();
+        Integer qty = Integer.parseInt(request.getParameter("qty").toString());
         log.info("X-Ray点料完成：barcode=" + barcodeStr + ",qty=" + qty);
         log.info("X-Ray点料完成：barcode=" + barcodeStr + ",qty=" + qty);
         Collection<CodeBean> codeBeans = codeResolve.resolveCodeStr(barcodeStr, COMPONENT_TYPE.COMPONENT);
         Collection<CodeBean> codeBeans = codeResolve.resolveCodeStr(barcodeStr, COMPONENT_TYPE.COMPONENT);
         Barcode barcode = null;
         Barcode barcode = null;

src/main/java/com/neotel/smfcore/custom/micron1053/task/enums/OrderItemStatus.java

@@ -8,7 +8,7 @@ public class OrderItemStatus {
     //缺料
     //缺料
     public static final String shortage = "SHORTAGE";
     public static final String shortage = "SHORTAGE";
 
 
-    //MES扣除失败
+    //MES扣除失败 Api010返回失败的
     public static final String executFail = "EXECUTFAIL";
     public static final String executFail = "EXECUTFAIL";
 
 
     //正在执行
     //正在执行
@@ -18,14 +18,14 @@ public class OrderItemStatus {
     //通知成功
     //通知成功
     public static final String notify_success = "SUCCESS";
     public static final String notify_success = "SUCCESS";
 
 
-    //通知失败
+    //通知失败 Api007失败
     public static final String notify_fail = "FAIL";
     public static final String notify_fail = "FAIL";
-
+    //正常完成
     public static final String finish = "FINISH";
     public static final String finish = "FINISH";
 
 
+    //取消
     public static final String cancel = "CANCEL";
     public static final String cancel = "CANCEL";
 
 
-
     //API009验证成功，可用
     //API009验证成功，可用
     public static final String CheckOk = "CheckOk";
     public static final String CheckOk = "CheckOk";