From 843458c100faa4db8339f8015522c40f180ae7ef Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 6 Jun 2024 12:17:47 +0800
Subject: [PATCH] md

---
 .../erp/emis/service/EmisBaseService.java     |  6 ++---
 .../emis/service/IEmisProblemTypeService.java |  2 +-
 .../impl/EmisProblemTypeServiceImpl.java      |  2 +-
 .../xdadan/erp/emis/utils/WaybillHelper.java  | 22 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index ecb72a48a..6b7f9058a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -841,8 +841,8 @@ public class EmisBaseService {
       * @param problemType
       * @return
       */
-     public EmisProblemType getEmisProblemTypeByType(String problemType){
-         return emisProblemTypeMapper.selectEmisProblemTypeById(Long.valueOf(problemType));
+     public EmisProblemType getEmisProblemTypeByType(Integer problemType){
+         return emisProblemTypeMapper.selectEmisProblemTypeById(problemType);
      }
 
      /**
@@ -852,7 +852,7 @@ public class EmisBaseService {
       * @param problemCause
       * @return
       */
-     public int changeWaybillProblemInfo(String billCode,String problemType,String problemCause){
+     public int changeWaybillProblemInfo(String billCode,Integer problemType,String problemCause){
          EmisWaybill emisWaybill = new EmisWaybill();
          emisWaybill.setBlIsQuestion("1");
          emisWaybill.setProblemType(problemType);
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisProblemTypeService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisProblemTypeService.java
index 373de1ac3..11536b821 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisProblemTypeService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisProblemTypeService.java
@@ -25,7 +25,7 @@ public interface IEmisProblemTypeService
      * @param id
      * @return 
      */
-    public EmisProblemType selectEmisProblemTypeById(Long id);
+    public EmisProblemType selectEmisProblemTypeById(Integer id);
 
     /**
      * 查询问题件类型列表
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisProblemTypeServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisProblemTypeServiceImpl.java
index f6e35287e..164f53e88 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisProblemTypeServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisProblemTypeServiceImpl.java
@@ -36,7 +36,7 @@ public class EmisProblemTypeServiceImpl implements IEmisProblemTypeService
      * @return 问题件类型
      */
     @Override
-    public EmisProblemType selectEmisProblemTypeById(Long id)
+    public EmisProblemType selectEmisProblemTypeById(Integer id)
     {
         return emisProblemTypeMapper.selectEmisProblemTypeById(id);
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
index 67ee4944e..6dd66a101 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -208,11 +208,7 @@ public class WaybillHelper {
     public static String formatQueryValue(String str) {
         if(!StringUtils.isEmpty(str)){
             str=str.replaceAll("\\n", ",");
-            if(str.lastIndexOf(",")!=-1) {
-                StringBuilder sb = new StringBuilder(str);
-                sb.deleteCharAt(sb.lastIndexOf(","));
-                return sb.toString();
-            }
+            str=StringUtils.removeEnd(str, ",");
         }
 
         return str;
@@ -260,12 +256,16 @@ public class WaybillHelper {
 //            System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"4"));
 
 //            System.out.println(removeUnSeeChar(" Phuc)"));
-            String input=" Phuc)";
-            for (char c : input.toCharArray()) {
-                if (Character.isISOControl(c)) {
-                    System.out.println("包含不可见字符：" + c);
-                }
-            }
+//            String input=" Phuc)";
+//            for (char c : input.toCharArray()) {
+//                if (Character.isISOControl(c)) {
+//                    System.out.println("包含不可见字符：" + c);
+//                }
+//            }
+
+            String str="T123213\n1231232,";
+            str=WaybillHelper.formatQueryValue(str);
+            System.out.print(str);
 
         } catch (Exception e) {
             e.printStackTrace();