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-05-24 15:15:09 +08:00
parent c7c1d3a9c9
commit a7eab6ea5b
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,6 +389,19 @@ public class EmisBaseService {
order.put("orderSn", waybill.getOrderSn()); order.put("orderSn", waybill.getOrderSn());
order.put("ydSn", billCode); order.put("ydSn", billCode);
order.put("logisticNo", billCode); order.put("logisticNo", billCode);
String mainBillCode=waybill.getBillCode();
String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6);
// 短号,运单号后6位
order.put("shortLogisticNo", shortLogisticNo);
String dispatchType="派送";
if("2".equals(waybill.getDispatchMethod())){
dispatchType="自提";
}
// 派送方式
order.put("dispatchType", dispatchType);
order.put("kdgs", "TANEX"); order.put("kdgs", "TANEX");
order.put("pdfInfo", waybill.getThirdCode()); order.put("pdfInfo", waybill.getThirdCode());
@ -409,6 +422,8 @@ public class EmisBaseService {
order.put("mobile", waybill.getReceiveMobile()); order.put("mobile", waybill.getReceiveMobile());
order.put("consignee", waybill.getReceiveName()); order.put("consignee", waybill.getReceiveName());
String custName=waybill.getReceiveCompany(); String custName=waybill.getReceiveCompany();
if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType()) || "5".equals(waybill.getPaymentType()) ) { if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType()) || "5".equals(waybill.getPaymentType()) ) {
EmisCustomerUser custUser=getCustomerUserByMonthlyPayCode(waybill.getCustNo()); EmisCustomerUser custUser=getCustomerUserByMonthlyPayCode(waybill.getCustNo());
@ -883,17 +898,21 @@ public class EmisBaseService {
// System.out.println(startDate); // System.out.println(startDate);
// System.out.println(endDate); // System.out.println(endDate);
String pdfInfo="[南京市场部-越南胡志明][越HCM]"; // String pdfInfo="[南京市场部-越南胡志明][越HCM]";
pdfInfo=pdfInfo.replace("][","||"); // pdfInfo=pdfInfo.replace("][","||");
//
// String[] striparr = pdfInfo.split("\\|\\|");
//
// System.out.println(striparr[1]);
// System.out.println(striparr[0]);
// String packageWJC = striparr[1].replace("]", "");
// String package3dm = striparr[0].replace("[", "");
// System.out.println(packageWJC);
// System.out.println(package3dm);
String[] striparr = pdfInfo.split("\\|\\|"); String mainBillCode="T7080300000379";
String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6);
System.out.println(striparr[1]); System.out.println(shortLogisticNo);
System.out.println(striparr[0]);
String packageWJC = striparr[1].replace("]", "");
String package3dm = striparr[0].replace("[", "");
System.out.println(packageWJC);
System.out.println(package3dm);
} }