完善Neotel接口安波福调试

src/main/java/com/neotel/smfcore/core/api/SmfApi.java

@@ -24,11 +24,18 @@ public class SmfApi {
     @Autowired
     @Autowired
     protected DataCache dataCache;
     protected DataCache dataCache;
 
 
+
     /**
     /**
      * 入库验证
      * 入库验证
      */
      */
     @Value("${api.inCheckUrl:}")
     @Value("${api.inCheckUrl:}")
     protected String inCheckUrl = "";
     protected String inCheckUrl = "";
+
+    /**
+     * 扫码后,条码解析前进行入库验证
+     */
+    @Value("${api.codeResolveUrl:}")
+    protected String codeResolveUrl = "";
     /**
     /**
      * 入库通知
      * 入库通知
      */
      */
@@ -60,6 +67,7 @@ public class SmfApi {
         apiName = dataCache.getConfigCache("api.name",apiName);
         apiName = dataCache.getConfigCache("api.name",apiName);
         log.info("apiName:" + apiName);
         log.info("apiName:" + apiName);
         inCheckUrl = dataCache.getConfigCache("api.inCheckUrl",inCheckUrl);
         inCheckUrl = dataCache.getConfigCache("api.inCheckUrl",inCheckUrl);
+        codeResolveUrl = dataCache.getConfigCache("api.codeResolveUrl",codeResolveUrl);
         inNotifyUrl = dataCache.getConfigCache("api.inNotifyUrl",inNotifyUrl);
         inNotifyUrl = dataCache.getConfigCache("api.inNotifyUrl",inNotifyUrl);
         outNotifyUrl = dataCache.getConfigCache("api.outNotifyUrl",outNotifyUrl);
         outNotifyUrl = dataCache.getConfigCache("api.outNotifyUrl",outNotifyUrl);
         orderNotifyUrl = dataCache.getConfigCache("api.orderNotifyUrl",orderNotifyUrl);
         orderNotifyUrl = dataCache.getConfigCache("api.orderNotifyUrl",orderNotifyUrl);
@@ -110,10 +118,10 @@ public class SmfApi {
      * @throws ValidateException
      * @throws ValidateException
      */
      */
     public Barcode canPutInBeforeResolve(CodeValidateParam params) throws ValidateException{
     public Barcode canPutInBeforeResolve(CodeValidateParam params) throws ValidateException{
-        if(isUrlExist(inCheckUrl)){
+        if(isUrlExist(codeResolveUrl)){
             for (ISmfApiListener apiListener : apiListenerList) {
             for (ISmfApiListener apiListener : apiListenerList) {
                 if(apiListener.isForThisApi(apiName)){
                 if(apiListener.isForThisApi(apiName)){
-                    Barcode responseBarcode = apiListener.canPutInBeforeResolve(inCheckUrl, params);
+                    Barcode responseBarcode = apiListener.canPutInBeforeResolve(codeResolveUrl, params);
                     if(responseBarcode != null){
                     if(responseBarcode != null){
                         return responseBarcode;
                         return responseBarcode;
                     }
                     }

src/main/java/com/neotel/smfcore/core/api/listener/BaseSmfApiListener.java

@@ -75,7 +75,7 @@ public abstract class BaseSmfApiListener implements ISmfApiListener {
     }
     }
 
 
     @Override
     @Override
-    public Barcode canPutInBeforeResolve(String inCheckUrl, CodeValidateParam params) throws ValidateException {
+    public Barcode canPutInBeforeResolve(String codeResolveUrl, CodeValidateParam params) throws ValidateException {
         return null;
         return null;
     }
     }
 }
 }

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

@@ -139,7 +139,7 @@ public class NeotelApi extends BaseSmfApiListener {
 //    }
 //    }
 
 
     @Override
     @Override
-    public Barcode canPutInBeforeResolve(String inCheckUrl, CodeValidateParam params) throws ValidateException {
+    public Barcode canPutInBeforeResolve(String codeResolveUrl, CodeValidateParam params) throws ValidateException {
         try {
         try {
             CodeBean codeBean = BarcodeRule.splitCodeAndSize(params.getCode());
             CodeBean codeBean = BarcodeRule.splitCodeAndSize(params.getCode());
             String reelId = codeBean.getCodeStr();
             String reelId = codeBean.getCodeStr();
@@ -149,7 +149,7 @@ public class NeotelApi extends BaseSmfApiListener {
             paramMap.put("fullCode", reelId);
             paramMap.put("fullCode", reelId);
 
 
             log.info(reelId + "入库验证,参数" + JsonUtil.toJsonStr(paramMap));
             log.info(reelId + "入库验证,参数" + JsonUtil.toJsonStr(paramMap));
-            String result = HttpHelper.postJson(inCheckUrl, paramMap);
+            String result = HttpHelper.postJson(codeResolveUrl, paramMap);
             System.out.println(result);
             System.out.println(result);
             log.info(reelId + "入库验证返回" + result);
             log.info(reelId + "入库验证返回" + result);
             ApiResult apiResult = JsonUtil.toObj(result, ApiResult.class);
             ApiResult apiResult = JsonUtil.toObj(result, ApiResult.class);
@@ -262,6 +262,7 @@ public class NeotelApi extends BaseSmfApiListener {
                 String partNum = getData(dataMap, "partNum");
                 String partNum = getData(dataMap, "partNum");
                 if (Strings.isNotBlank(partNum)) {
                 if (Strings.isNotBlank(partNum)) {
                     barcode.setPartNumber(partNum);
                     barcode.setPartNumber(partNum);
+                    resolveComponent(barcode);
                 }
                 }
 
 
                 String vendor = getData(dataMap, "vendor");
                 String vendor = getData(dataMap, "vendor");