From cd928213037d7d747691510b6bac103dc012b713 Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 20 May 2024 04:47:51 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/emis/service/EmisBaseService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 833d6a172..27bcaa216 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 @@ -16,6 +16,7 @@ package com.xdadan.erp.emis.service; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.common.core.domain.entity.SysUser; import com.xdadan.erp.common.utils.DateUtils; + import com.xdadan.erp.common.utils.DictUtils; import com.xdadan.erp.common.utils.SecurityUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; @@ -202,7 +203,7 @@ public class EmisBaseService { order.put("send_company", waybill.getSendCompany()); order.put("send_mobile", waybill.getSendMobile()); order.put("send_person", waybill.getSendName()); - order.put("send_date",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate())) + order.put("send_date",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate())); JSONObject extData = new JSONObject(); extData.put("k1",waybill.getReceiveCountryName()); @@ -221,8 +222,8 @@ public class EmisBaseService { order.put("parcel_qty", waybill.getParcelQty()); order.put("bill_weight", waybill.getBillWeight()); order.put("total_volume", waybill.getTotalVolume()); - order.put("pack_type", waybill.getPackType()); - order.put("payment_type", waybill.getPaymentType()); + order.put("pack_type", DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType()) ); + order.put("payment_type", DictUtils.getDictLabel("emis_payment_type",waybill.getPaymentType())); order.put("print_day", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date())); order.put("print_man", getCurrentUser().getEmpName());