aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-05 08:53:54 +08:00
parent 1a909479b5
commit 398b39760b
3 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -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());

61
emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
View File

@ -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;
}
}

4
emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml
View File

@ -18,7 +18,7 @@
</resultMap>
<sql id="selectEmisProblemTypeVo">
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
</sql>
<select id="selectEmisProblemTypeList" parameterType="EmisProblemType" resultMap="EmisProblemTypeResult">
@ -71,7 +71,7 @@
</select>
<select id="selectEmisProblemTypeById" parameterType="Long" resultMap="EmisProblemTypeResult">
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
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 a
where a.id = #{id}
</select>