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 233278633..833d6a172 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 @@ -184,7 +184,8 @@ public class EmisBaseService { Map order = new HashMap<>(); order.put("order_sn", waybill.getOrderSn()); - order.put("yd_sn", waybill.getBillCode()); +// order.put("yd_sn", waybill.getBillCode()); + order.put("yd_sn", billCode); order.put("kdgs", "TANEX"); // order.put("pdf_info", "[山东淄博-胡志明][越南DN]"); @@ -201,10 +202,32 @@ public class EmisBaseService { order.put("send_company", waybill.getSendCompany()); order.put("send_mobile", waybill.getSendMobile()); order.put("send_person", waybill.getSendName()); - order.put("ext_data", "{\"k1\":\"阿尔巴尼亚\",\"k2\":\"阿尔巴尼亚快递\",\"k3\":\"阿尔巴尼亚国际特快\",\"k4\":\"1-10工作日\",\"k5\":\"阿尔AL\",\"k6\":\"山东淄博-阿尔巴尼亚地拉那\"}"); + order.put("send_date",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate())) + + JSONObject extData = new JSONObject(); + extData.put("k1",waybill.getReceiveCountryName()); + extData.put("k2",waybill.getTransLineTypeName()); + extData.put("k3",waybill.getProductTypeName()); + extData.put("k4",waybill.getTimeType()); + extData.put("k5","目的网点二字码"); + extData.put("k6","山东淄博-阿尔巴尼亚地拉那"); + +// order.put("ext_data", "{\"k1\":\""+waybill.getReceiveCountryName()+"\",\"k2\":\""+waybill.getTransLineTypeName()+"\",\"k3\":\""+waybill.getProductTypeName()+"\",\"k4\":\""+waybill.getTimeType()+"\",\"k5\":\"目的网点二字码\",\"k6\":\"山东淄博-阿尔巴尼亚地拉那\"}"); // order.put("sendPersonAndMobile", "Vancouver"+" "+"1604-683-1088"); - order.put("goods_info", "日常用品"); - order.put("parcel_qty", 1); + order.put("ext_data",extData.toJSONString()); + order.put("goods_info", waybill.getGoodsInfo()); + order.put("remark", waybill.getRemark()); + + 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("print_day", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date())); + order.put("print_man", getCurrentUser().getEmpName()); + + + order.put("parcel_qty", waybill.getParcelQty()); order.put("create_day", "2023-12-30"); if(StringUtils.isEmpty(waybill.getBlPrint())) {