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-20 04:47:51 +08:00
parent f9eaafd0f1
commit cd92821303
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());