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-01 14:30:14 +08:00
parent 0f04b8962c
commit 3191b29c31
3 changed files with 54 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
View File

@ -33,6 +33,7 @@ import com.xdadan.erp.emis.domain.vo.Reciever;
import com.xdadan.erp.emis.domain.vo.Sender;
import com.xdadan.erp.emis.domain.vo.WaybillOrder;
import com.xdadan.erp.emis.service.*;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -233,6 +234,7 @@ public class EmisCommonController extends BaseController
}
@RequestMapping("/getPrintDataByPrinter")
public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response, String billCode, String billCodeRange,String tplCode, String lang, String printType)
{
@ -249,9 +251,7 @@ public class EmisCommonController extends BaseController
printItem.put("billCode",billCode);
if(order!=null) {
// 将对象中为空的字段 不忽略，value从null转换为""
String billDetail = JSON.toJSONString(order,SerializerFeature.WriteNullStringAsEmpty);
logger.debug("==>PrintBillDetail"+billDetail);
String billDetail = WaybillHelper.cvtBillToJsonString(order);
printItem.put("billDetail", Base64.getEncoder().encodeToString(billDetail.getBytes(Charset.forName("UTF-8"))));
printItem.put("isEncrpt",false);
printItem.put("printCount",1);

45
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -13,7 +13,12 @@ package com.xdadan.erp.emis.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.PropertyFilter;
import com.alibaba.fastjson.serializer.SerializeFilter;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.serializer.ValueFilter;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdadan.erp.common.core.domain.entity.SysUser;
import com.xdadan.erp.common.utils.DateUtils;
@ -35,6 +40,7 @@ package com.xdadan.erp.emis.service;
import com.xdadan.erp.emis.utils.WaybillHelper;
import com.xdadan.erp.emis.utils.sensitive.Convert;
import com.xdadan.erp.system.mapper.SysUserMapper;
import jdk.nashorn.internal.runtime.Undefined;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -1151,19 +1157,36 @@ public class EmisBaseService {
String mainBillCode="T70803005000020002";
boolean isSubBill=false;
// 判断是否是子单
String queryBillCode="";
if(mainBillCode.startsWith("T7080") && mainBillCode.length()>14 ){
isSubBill = true;
queryBillCode=mainBillCode.substring(0,14);
String subBillSuffix=mainBillCode.substring(14);
System.out.println(mainBillCode);
System.out.println(queryBillCode);
System.out.println(Integer.valueOf(subBillSuffix));
}
// boolean isSubBill=false;
// // 判断是否是子单
// String queryBillCode="";
// if(mainBillCode.startsWith("T7080") && mainBillCode.length()>14 ){
// isSubBill = true;
// queryBillCode=mainBillCode.substring(0,14);
// String subBillSuffix=mainBillCode.substring(14);
// System.out.println(mainBillCode);
// System.out.println(queryBillCode);
// System.out.println(Integer.valueOf(subBillSuffix));
// }
Map order = new HashMap();
order.put("s1","123");
order.put("s2",null);
// JSONObject result = JSON.parseObject(JSON.toJSONString(order,new BigDecimalValueFilter(),SerializerFeature.WriteMapNullValue,SerializerFeature.WriteNullStringAsEmpty,SerializerFeature.WriteNullNumberAsZero))
// String billDetail = JSON.toJSONString(order, serializerFeatures);
String billDetail = cvtBillToJsonString(order);
System.out.println(billDetail);
}
}

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

@ -2,7 +2,10 @@ package com.xdadan.erp.emis.utils;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.serializer.ValueFilter;
import com.xdadan.erp.common.utils.DBUtil;
import com.xdadan.erp.common.utils.HTTPHelperV3;
import com.xdadan.erp.common.utils.StringUtils;
@ -215,4 +218,18 @@ public class WaybillHelper {
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);
}
}