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 16:58:09 +08:00
parent a36ec5f74a
commit 99728b9e93
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java
View File

@ -54,7 +54,7 @@ public class EmisTransProduct extends BaseEntity
private String transType; private String transType;
/* 时效描述 */ /* 时效描述 */
private String agingDesc; private String agingDesc;
/* 失效标识 */ /* 时效标识 */
private String agingFlag; private String agingFlag;
/* 最小时效 */ /* 最小时效 */
private Integer minAging; private Integer minAging;

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

@ -402,6 +402,12 @@ public class EmisBaseService {
// 派送方式 // 派送方式
order.put("dispatchType", dispatchType); order.put("dispatchType", dispatchType);
EmisTransProduct emisTransProduct=getTransProductByCode(waybill.getProductType());
String agingFlag="";
if(emisTransProduct!=null) {
order.put("agingFlag", emisTransProduct.getAgingFlag());
}
order.put("kdgs", "TANEX"); order.put("kdgs", "TANEX");
order.put("pdfInfo", waybill.getThirdCode()); order.put("pdfInfo", waybill.getThirdCode());
@ -424,6 +430,11 @@ public class EmisBaseService {
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());