RequestGetPartInfo接口增加条码处理

src/main/java/com/neotel/smfcore/custom/hanwha/handler/HanwhaApiHandler.java

@@ -6,6 +6,8 @@ import com.neotel.smfcore.common.utils.DateUtil;
 import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.common.utils.JsonUtil;
 import com.neotel.smfcore.core.api.bean.CodeValidateParam;
 import com.neotel.smfcore.core.api.bean.CodeValidateParam;
 import com.neotel.smfcore.core.api.listener.BaseSmfApiListener;
 import com.neotel.smfcore.core.api.listener.BaseSmfApiListener;
+import com.neotel.smfcore.core.barcode.bean.BarcodeRule;
+import com.neotel.smfcore.core.barcode.bean.CodeBean;
 import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.manager.IComponentManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.barcode.service.po.Component;
@@ -67,8 +69,14 @@ public class HanwhaApiHandler extends BaseSmfApiListener {
 
 
     @Override
     @Override
     public Barcode canPutInBeforeResolve(String codeResolveUrl, CodeValidateParam params) throws ValidateException {
     public Barcode canPutInBeforeResolve(String codeResolveUrl, CodeValidateParam params) throws ValidateException {
-        log.info("barcode[" + params.getCode() + "] 解析条码，调用 RequestGetPartInfo");
-        List<TMSPart> result = tmsApis.RequestGetPartInfo(0, params.getCode());
+        log.info("barcode[" + params.getCode() + "] 解析条码");
+        CodeBean codeBean = BarcodeRule.splitCodeAndSize(params.getCode());
+        String fullCode = codeBean.getCodeStr();
+        if (fullCode.endsWith("##")) {
+            fullCode = fullCode.substring(0, fullCode.length() - 2);
+        }
+        log.info("barcode[" + params.getCode() + "] 解析条码到完整条码："+fullCode+"，调用 RequestGetPartInfo");
+        List<TMSPart> result = tmsApis.RequestGetPartInfo(0, fullCode);
         if (result.size() > 0) {
         if (result.size() > 0) {
             String pn = result.get(0).getPartName();
             String pn = result.get(0).getPartName();
             String code = result.get(0).getReelCode();
             String code = result.get(0).getReelCode();