diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 49568f61f..b5ab11d2f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -740,10 +740,10 @@ public class WaybillOrder implements Serializable {
// dbWaybill.setPrintSite(this.getPrintSite());
// dbWaybill.setPrintDate(this.getPrintDate());
// dbWaybill.setPrintCount(this.getPrintCount());
- dbWaybill.setBlDispFd(this.getBlDispFd());
- dbWaybill.setTransferCode(this.getTransferCode());
- dbWaybill.setTransferBillcode(this.getTransferBillcode());
- dbWaybill.setDispFdDate(this.getDispFdDate());
+// dbWaybill.setBlDispFd(this.getBlDispFd());
+// dbWaybill.setTransferCode(this.getTransferCode());
+// dbWaybill.setTransferBillcode(this.getTransferBillcode());
+// dbWaybill.setDispFdDate(this.getDispFdDate());
// dbWaybill.setDispFdReason(this.getDispFdReason());
// dbWaybill.setCurrentSiteCode(this.getCurrentSiteCode());
// dbWaybill.setNextSiteCode(this.getNextSiteCode());
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 bb1d7b096..8783806f1 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
@@ -175,6 +175,32 @@ public class WaybillHelper {
}
}
+
+ /**
+ * 保留运单的所有字段
+ * @param obj
+ * @return
+ */
+ public static String cvtBillToJsonString(Object obj) {
+ return JSON.toJSONString(obj, (ValueFilter) (object, name, value) -> {
+ if(value == null){
+ return "";
+ }
+ return value;
+ }, SerializerFeature.WriteMapNullValue);
+ }
+
+
+ public static String removeUnSeeChar(String str) {
+ if(!StringUtils.isEmpty(str)){
+ return str.replaceAll("\\p{C}+", "");
+ }
+
+ return str;
+ }
+
+
+
public static void main(String[] args) {
//1: 1.02 1.1 1.11
@@ -209,37 +235,22 @@ public class WaybillHelper {
// 6000 167
// 3333 300
// 5000 0.1
- float volumeWeight=166.667f;
- System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"3"));
- System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"4"));
+// float volumeWeight=166.667f;
+// System.out.println(WaybillHelper.calcSettledWeight(volumeWeight,"3"));
+// 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);
+ }
+ }
} catch (Exception e) {
e.printStackTrace();
}
}
- /**
- * 保留运单的所有字段
- * @param obj
- * @return
- */
- public static String cvtBillToJsonString(Object obj) {
- return JSON.toJSONString(obj, (ValueFilter) (object, name, value) -> {
- if(value == null){
- return "";
- }
- return value;
- }, SerializerFeature.WriteMapNullValue);
- }
-
-
- public static String removeUnSeeChar(String str) {
- if(!StringUtils.isEmpty(str)){
- return str.replaceAll("\\p{C}+", "");
- }
-
- return str;
- }
}
diff --git a/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml b/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml
index b1101767d..b60042040 100644
--- a/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml
@@ -18,7 +18,7 @@
- select id, type_code, type_name, type_name_en, is_send_sms, object_type, delay_day, status, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_problem_type
+ select id, type_code, type_name, type_name_en, is_send_sms, object_type, delay_day, status, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time,create_site,update_site from emis_problem_type