From f60709d822c8ea9fc0004d6bc98fcc2f61e3c7df Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 14 Sep 2024 11:01:46 +0800 Subject: [PATCH] md --- .../erp/oms/web/Oms2cCommonController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java index 77e8cab..2a43fc5 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java @@ -97,6 +97,7 @@ public class Oms2cCommonController extends BaseController extBillInfo.put("destinationName",""); extBillInfo.put("estimateDate",""); extBillInfo.put("productTypeName",""); + extBillInfo.put("waybillStatus",""); try { AjaxResult ar = this.iRpcWaybillSvc.getWaybillDetailByOms(mailno, ""); @@ -113,10 +114,28 @@ public class Oms2cCommonController extends BaseController Date estimateDate = DateUtils.parseDate(estimateDateStr); String productTypeName = jobjData.getString("productTypeName"); + String blSign= jobjData.getString("blSign"); + String waybillStatus= jobjData.getString("waybillStatus"); + String waybillStatusStr = "运输中"; + if("1".equals(blSign)){ + waybillStatusStr="已签收"; + }else{ + if("10".equals(waybillStatus)){ + waybillStatusStr="已揽收"; + } + else if("40".equals(waybillStatus)){{ + waybillStatusStr="派送中"; + } + else{ + waybillStatusStr="运输中"; + } + } + extBillInfo.put("sendSiteName",sendSiteName); extBillInfo.put("destinationName",destinationName); extBillInfo.put("estimateDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,estimateDate)); extBillInfo.put("productTypeName",productTypeName); + extBillInfo.put("waybillStatus",waybillStatusStr); } }