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 05:09:40 +08:00
parent cd92821303
commit fc8e0fc04e
1 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,26 +184,32 @@ public class EmisBaseService {
}
Map<String,Object> order = new HashMap<>();
order.put("order_sn", waybill.getOrderSn());
// order.put("yd_sn", waybill.getBillCode());
order.put("yd_sn", billCode);
order.put("orderSn", waybill.getOrderSn());
order.put("ydSn", billCode);
order.put("kdgs", "TANEX");
order.put("pdfInfo", waybill.getThirdCode());
// order.put("pdf_info", "[山东淄博-胡志明][越南DN]");
order.put("pdf_info", waybill.getThirdCode());
String pdfInfo=waybill.getThirdCode();
pdfInfo=pdfInfo.replace("][","||");
String[] striparr = pdfInfo.split("||");
String packageWJC = striparr[1].replace("]", "");
String package3dm = striparr[0].replace("[", "");
order.put("packageWJC", packageWJC);
order.put("package3dm", package3dm);
// order.put("address", "上海市黄浦区河南南路1009弄3号902室上海市黄浦区河南南路1009弄3号902室上海市黄浦区河南南路1009弄3号902室");
order.put("address", waybill.getReceiveAddress());
order.put("company", waybill.getReceiveCompany());
order.put("mobile", waybill.getReceiveMobile());
order.put("consignee", waybill.getReceiveName());
// order.put("consigneeAndMobile", Convert.chineseNameFirst("张三"+" "+"13818228246"));
order.put("send_address", waybill.getSendAddress());
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("sendAddress", waybill.getSendAddress());
order.put("sendCompany", waybill.getSendCompany());
order.put("sendMobile", waybill.getSendMobile());
order.put("sendPerson", waybill.getSendName());
order.put("sendDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,waybill.getSendDate()));
JSONObject extData = new JSONObject();
extData.put("k1",waybill.getReceiveCountryName());
@ -213,59 +219,34 @@ public class EmisBaseService {
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("ext_data",extData.toJSONString());
order.put("goods_info", waybill.getGoodsInfo());
order.put("extData",extData.toJSONString());
order.put("qrCodeText",extData.toJSONString());
order.put("goodsInfo", 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", 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());
order.put("parcelQty", waybill.getParcelQty());
order.put("billWeight", waybill.getBillWeight());
order.put("totalVolume", waybill.getTotalVolume());
order.put("packType", DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType()) );
order.put("paymentType", DictUtils.getDictLabel("emis_payment_type",waybill.getPaymentType()));
order.put("printDay", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()));
order.put("printMan", getCurrentUser().getEmpName());
order.put("parcel_qty", waybill.getParcelQty());
order.put("create_day", "2023-12-30");
order.put("createDay",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,waybill.getCreateTime()));
if(StringUtils.isEmpty(waybill.getBlPrint())) {
order.put("print_status", "0");
order.put("printStatus", "0");
}else{
order.put("print_status", waybill.getBlPrint());
order.put("printStatus", waybill.getBlPrint());
}
//
// order.put("pdf_info","[12312321,123213]");
// order.put("order_sn",waybill.getOrderSn());
// order.put("yd_sn",waybill.getBillCode());
//
// order.put("mobile",waybill.getReceiveMobile());
// order.put("consignee",waybill.getReceiveName());
// order.put("company",waybill.getReceiveCompany());
// order.put("address",waybill.getReceiveAddress());
//
// order.put("send_person",waybill.getSendName());
// order.put("send_mobile",waybill.getSendName());
// order.put("send_company",waybill.getSendName());
// order.put("send_address",waybill.getSendName());
//
// order.put("goods_info",waybill.getSendName());
// order.put("parcel_qty",waybill.getSendName());
// order.put("create_day",waybill.getSendName());
//
// String extData="";
//
// order.put("ext_data",extData);
return order;
}
public int changeWaybillStatus(String billCode,String waybillStatus){
EmisWaybill emisWaybill = new EmisWaybill();
emisWaybill.setBillCode(billCode);