From 1a6b271ec3fec122559c4a3ff2a15cfc90aaee06 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 24 Sep 2024 14:06:37 +0800 Subject: [PATCH] md --- .../com/xdadan/erp/oms/web/Oms2cCommonController.java | 8 ++++++++ 1 file changed, 8 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 fbd231a..e5d0318 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 @@ -113,12 +113,19 @@ public class Oms2cCommonController extends BaseController String estimateDateStr = jobjData.getString("estimateDate"); Date estimateDate = DateUtils.parseDate(estimateDateStr); String productTypeName = jobjData.getString("productTypeName"); + String billPicDispatchRmk = jobjData.getString("billPicDispatchRmk"); String signDateStr = jobjData.getString("signDate"); Date signDate = DateUtils.parseDate(signDateStr); String blSign= jobjData.getString("blSign"); + String blBillPicDispatchRmk= "0"; + if(!StringUtils.isEmpty(billPicDispatchRmk)){ + blBillPicDispatchRmk= "1"; + } + + String waybillStatus= jobjData.getString("waybillStatus"); String waybillStatusStr = "运输中"; if("1".equals(blSign)){ @@ -140,6 +147,7 @@ public class Oms2cCommonController extends BaseController extBillInfo.put("estimateDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,estimateDate)); extBillInfo.put("productTypeName",productTypeName); extBillInfo.put("waybillStatus",waybillStatusStr); + extBillInfo.put("blBillPicDispatchRmk",blBillPicDispatchRmk); extBillInfo.put("blSign",blSign); extBillInfo.put("signDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,signDate)); }