锡膏料仓NG出库bug修改

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -286,7 +286,7 @@ public class StatusBean {
     /**
     /**
      * 入库时添加仓位及料盘大小信息(posId库位编号，plateW:料盘宽度,plateH:料盘高度,singleOut:是否出库到料仓门口)
      * 入库时添加仓位及料盘大小信息(posId库位编号，plateW:料盘宽度,plateH:料盘高度,singleOut:是否出库到料仓门口)
      */
      */
-    public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,String ngMsg,int usedCount){
+    public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,String ngMsg,int usedCount) {
         String originalPosId = data.get("posId");
         String originalPosId = data.get("posId");
         String originalPlateW = data.get("plateW");
         String originalPlateW = data.get("plateW");
         String originalPlateH = data.get("plateH");
         String originalPlateH = data.get("plateH");
@@ -296,34 +296,33 @@ public class StatusBean {
         String plateWStr = plateW + "";
         String plateWStr = plateW + "";
         String plateHStr = plateH + "";
         String plateHStr = plateH + "";
         String barcodeStr = barcode + "";
         String barcodeStr = barcode + "";
-        if(!Strings.isNullOrEmpty(originalPosId)){
+        if (!Strings.isNullOrEmpty(originalPosId)) {
             posIdStr = originalPosId + "|" + posId;
             posIdStr = originalPosId + "|" + posId;
         }
         }
 
 
-        if(!Strings.isNullOrEmpty(originalPlateW)){
+        if (!Strings.isNullOrEmpty(originalPlateW)) {
             plateWStr = originalPlateW + "|" + plateW;
             plateWStr = originalPlateW + "|" + plateW;
         }
         }
 
 
-        if(!Strings.isNullOrEmpty(originalPlateH)){
+        if (!Strings.isNullOrEmpty(originalPlateH)) {
             plateHStr = originalPlateH + "|" + plateH;
             plateHStr = originalPlateH + "|" + plateH;
         }
         }
 
 
-        if(!Strings.isNullOrEmpty(originalBarcode)){
+        if (!Strings.isNullOrEmpty(originalBarcode)) {
             barcodeStr = originalBarcode + "|" + barcodeStr;
             barcodeStr = originalBarcode + "|" + barcodeStr;
         }
         }
-        data.put("posId",posIdStr);
-        data.put("plateW",plateWStr);
-        data.put("plateH",plateHStr);
-        data.put("barcode",barcodeStr);
-        data.put("singleOut", isSingleOut+"");
-        data.put("ngReel",isNgReel+"");
-        if(ObjectUtil.isNotEmpty(ngMsg)){
-            data.put("ngMsg",ngMsg);
+        data.put("posId", posIdStr);
+        data.put("plateW", plateWStr);
+        data.put("plateH", plateHStr);
+        data.put("barcode", barcodeStr);
+        data.put("singleOut", isSingleOut + "");
+        data.put("ngReel", isNgReel + "");
+        if (ObjectUtil.isNotEmpty(ngMsg)) {
+            data.put("ngMsg", ngMsg);
+        } else if (isNgReel) {
+            data.put("ngMsg", "Repeat Inbound");
         }
         }
-        if(isNgReel){
-            data.put("ngMsg","Repeat Inbound");
-        }
-        data.put("usedCount",usedCount+"" );
+        data.put("usedCount", usedCount + "");
     }
     }
 
 
     /**
     /**

src/main/java/com/neotel/smfcore/core/solder/rest/SpBoxController.java

@@ -375,8 +375,8 @@ public class SpBoxController {
                 outMsg = "回库验证失败";
                 outMsg = "回库验证失败";
             }
             }
         } catch (ValidateException ex) {
         } catch (ValidateException ex) {
-            log.info("库位【" + storagePos.getPosName() + "】" + barcode.getBarcode() + " 回库验证失败：" + ex.toString() + ",直接出库");
-            outMsg = "回库验证失败：" + ex.toString();
+            log.info("库位【" + storagePos.getPosName() + "】" + barcode.getBarcode() + " 回库验证失败：" + ex.getDefaultMsg() + ",直接出库");
+            outMsg = ex.getDefaultMsg() ;
         }
         }
         try {
         try {
             if (ObjectUtil.isNotEmpty(outMsg)) {
             if (ObjectUtil.isNotEmpty(outMsg)) {