入库MES验证NG处理

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -10,6 +10,7 @@ import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.Constants;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
 import com.neotel.smfcore.common.utils.ReelLockPosUtil;
+import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.bean.PosInfo;
 import com.neotel.smfcore.core.device.bean.PosInfo;
@@ -55,6 +56,9 @@ public class DeviceController {
     private CodeResolve codeResolve;
     private CodeResolve codeResolve;
 
 
     @Autowired
     @Autowired
+    protected SmfApi smfApi;
+
+    @Autowired
     private IStoragePosManager storagePosManager;
     private IStoragePosManager storagePosManager;
 
 
     private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
     private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
@@ -155,6 +159,12 @@ public class DeviceController {
 
 
                 try {
                 try {
                     Barcode barcode = codeResolve.resolveOneValideBarcode(code);
                     Barcode barcode = codeResolve.resolveOneValideBarcode(code);
+                    //从API验证
+                    Barcode barcodeFromApi = smfApi.canPutInAfterResolve(barcode);
+                    if (barcodeFromApi != null) {
+                        barcode = barcodeFromApi;
+                    }
+
                     if(barcode==null) {
                     if(barcode==null) {
                         throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{code});
                         throw new ValidateException("smfcore.error.barcode.invalid", "{0}不是有效的条码", new String[]{code});
                     }
                     }

src/main/java/com/neotel/smfcore/custom/neotelApi/NeotelApi.java

@@ -193,7 +193,7 @@ public class NeotelApi extends BaseSmfApiListener {
                 barcode = barcodeManager.saveBarcode(barcode);
                 barcode = barcodeManager.saveBarcode(barcode);
                 return barcode;
                 return barcode;
             } else {
             } else {
-                return null;
+                throw new ValidateException("smfcore.mesApi.inCheck.mesError", "MES验证出错:[" + apiResult.getCode()+"]"+apiResult.getMsg());
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("入库验证接口出错:" + e.getMessage());
             log.error("入库验证接口出错:" + e.getMessage());
@@ -206,6 +206,7 @@ public class NeotelApi extends BaseSmfApiListener {
 
 
     }
     }
 
 
+    @Override
     public LiteOrder fetchOrder(String fetchOrderUrl, String orderNumber, String username) {
     public LiteOrder fetchOrder(String fetchOrderUrl, String orderNumber, String username) {
         return null;
         return null;
     }
     }