From 99728b9e931e0b8f174f637b0f68bf2fdc411077 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 24 May 2024 16:58:09 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/emis/domain/EmisTransProduct.java | 2 +- .../com/xdadan/erp/emis/service/EmisBaseService.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java index 93e2e1798..4a9b4116e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java @@ -54,7 +54,7 @@ public class EmisTransProduct extends BaseEntity private String transType; /* 时效描述 */ private String agingDesc; - /* 失效标识 */ + /* 时效标识 */ private String agingFlag; /* 最小时效 */ private Integer minAging; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index a22524071..3163de54a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -402,6 +402,12 @@ public class EmisBaseService { // 派送方式 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("pdfInfo", waybill.getThirdCode()); @@ -424,6 +430,11 @@ public class EmisBaseService { + + + + + String custName=waybill.getReceiveCompany(); if ( "2".equals(waybill.getPaymentType()) || "4".equals(waybill.getPaymentType()) || "5".equals(waybill.getPaymentType()) ) { EmisCustomerUser custUser=getCustomerUserByMonthlyPayCode(waybill.getCustNo());