移远料号转换异常时直接抛出错误

包装料放到同一个位置问题修复(去除获取任务数时清理紧急料架代码)

myproject/src/main/java/com/myproject/util/BarcodeRule.java

@@ -457,8 +457,9 @@ public class BarcodeRule {
             try {
             try {
                 partNumber = QisdaApi.PartNoMapping(partNumber);
                 partNumber = QisdaApi.PartNoMapping(partNumber);
             } catch (ApiException e) {
             } catch (ApiException e) {
-                codeBean.setError(e.getMessage());
-                return codeBean;
+                throw new RuntimeException(e.getMessage());
+                //codeBean.setError(e.getMessage());
+                //return codeBean;
             }
             }
         }
         }
 
 
@@ -588,6 +589,7 @@ public class BarcodeRule {
         codeStr = "=7x8=L0000000000SB1177082J;E20200316 0365;B7H.10421.2B1821872020031604000;R821872020031603034";
         codeStr = "=7x8=L0000000000SB1177082J;E20200316 0365;B7H.10421.2B1821872020031604000;R821872020031603034";
         codeStr = "=7x8=L365K000410;E20200524 0730;BQT0011000884C04192020052415000;R04192020053050254";
         codeStr = "=7x8=L365K000410;E20200524 0730;BQT0011000884C04192020052415000;R04192020053050254";
         codeStr = "=7x8=L338J002486;E20190817 0730;BQT001100087104192019081715000;R04192019091281523";
         codeStr = "=7x8=L338J002486;E20190817 0730;BQT001100087104192019081715000;R04192019091281523";
+        codeStr = "=7x8=L0472401575;E20220901 0730;BQT001200246605242022090115000;R05242023042000844;APNJDK042BBJ474MC-F";
         BarcodeRule br = BarcodeRule.newRule(rule);
         BarcodeRule br = BarcodeRule.newRule(rule);
         Barcode barcode = br.toCodeBean(codeStr).getBarcode();
         Barcode barcode = br.toCodeBean(codeStr).getBarcode();
         if(barcode != null){
         if(barcode != null){

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaDeviceController.java

@@ -836,12 +836,12 @@ public class QisdaDeviceController extends BaseController {
 
 
         if(totalCutTask == 0){
         if(totalCutTask == 0){
             //log.info("已无分盘料任务,清空分盘料使用料架/料串");
             //log.info("已无分盘料任务,清空分盘料使用料架/料串");
-            InquiryShelfBean.clearShelf(InquiryShelfBean.CUT_SHELF_MAP_KEY);
+            //InquiryShelfBean.clearShelf(InquiryShelfBean.CUT_SHELF_MAP_KEY);
         }
         }
 
 
         if(totalUrgentTask == 0){
         if(totalUrgentTask == 0){
             //log.info("已无紧急料任务,清空紧急料使用料架/料串");
             //log.info("已无紧急料任务,清空紧急料使用料架/料串");
-            InquiryShelfBean.clearShelf(InquiryShelfBean.URGENT_SHELF_MAP_KEY);
+            //InquiryShelfBean.clearShelf(InquiryShelfBean.URGENT_SHELF_MAP_KEY);
         }
         }
 
 
         return ResultBean.newOkResult(resultMap);
         return ResultBean.newOkResult(resultMap);
@@ -961,8 +961,8 @@ public class QisdaDeviceController extends BaseController {
 
 
             }
             }
 
 
-            InquiryShelfBean.clearCutUrgentPackageShelf(InquiryShelfBean.CUT_SHELF_MAP_KEY);
-            InquiryShelfBean.clearCutUrgentPackageShelf(InquiryShelfBean.URGENT_SHELF_MAP_KEY);
+            //InquiryShelfBean.clearCutUrgentPackageShelf(InquiryShelfBean.CUT_SHELF_MAP_KEY);
+            //InquiryShelfBean.clearCutUrgentPackageShelf(InquiryShelfBean.URGENT_SHELF_MAP_KEY);
 
 
             Map<String,Object> resultMap = new HashMap<>();
             Map<String,Object> resultMap = new HashMap<>();
             resultMap.put("taskCount",taskCount+"");
             resultMap.put("taskCount",taskCount+"");