长泰分段扫码问题

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -688,7 +688,7 @@ public class CtqyyClient extends CommonHttpClient {
 
     public String getUserName(IoOrderEntity orderEntity) {
 
-        return "黄跃祥/177";
+        return "王欣/L164";
 //        String userName = null;
 //        //创建人非供应商
 //        if (StrUtil.isNotEmpty(orderEntity.getCheckUser())) {
@@ -847,9 +847,15 @@ public class CtqyyClient extends CommonHttpClient {
                     thrInvResultResponse.setType("1");
                     thrInvResultResponse.setOutCount("1");
                     thrInvResultResponse.setReCount("1");
-                    IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, ptxhInvResponse.getBarcode()).last("limit 1"));
+
+                    String barCode = ptxhInvResponse.getBarcode();
+                    if (!barCode.contains(ptxhInvResponse.getDictBarcode())) {
+                        barCode = "01" + barCode + ptxhInvResponse.getDictBarcode();
+                    }
+                    //获取完整UDI码
+                    IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, barCode).last("limit 1"));
                     if (codeEntity == null) {
-                        codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1"));
+                        codeEntity = codeDao.selectOne(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, barCode).last("limit 1"));
                     }
                     if (codeEntity != null)
                         thrInvResultResponse.setUdiCode(codeEntity.getCode());
@@ -1268,6 +1274,10 @@ public class CtqyyClient extends CommonHttpClient {
 //                                code = code.replace("\u001D", "zysoft");  智业无法识别GS1符号
                                 code = code.replace("\u001D", "");
                             }
+                            if (!code.startsWith("MA")) {
+                                code = code.replace(codeDetaiEntity.getNameCode(), "");
+                                code = code.substring(1, code.length() - 1);
+                            }
                             itemDTO.setCode(code);
                             itemDTO.setNameCode(codeDetaiEntity.getNameCode());
 

src/main/java/com/glxp/mipsdl/util/TestUtils.java

@@ -0,0 +1,22 @@
+package com.glxp.mipsdl.util;
+
+public class TestUtils {
+
+    public static void main(String[] args) {
+
+        String code = "0106902139350503112101011725010110001\u001D21001";
+        if (code.contains("\u001D")) {
+//                                code = code.replace("\u001D", "zysoft");  智业无法识别GS1符号
+            code = code.replace("\u001D", "");
+        }
+        if (!code.startsWith("MA")) {
+            code = code.replace("06902139350503", "");
+            code = code.substring(1, code.length() - 1);
+        }
+
+
+
+
+        System.out.println("Hello World!" + code);
+    }
+}