diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 340bb8aa1..dddcf307c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -301,6 +301,9 @@ public class EmisWaybill extends BaseEntity private String blSpecialQuote; /* 是否超长 */ private String blOverLong; + /* 是否虚拟单 */ + private String blVirtual; + /* 是否付款 */ private String blBill; /* 账单备注 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 471b5e9a7..cead21217 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -857,6 +857,14 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb } } + if (!StringUtils.isEmpty(emisWaybillSave.getBlVirtual())) { + if ("是".equals(emisWaybillSave.getBlVirtual())) { + emisWaybillSave.setBlVirtual("1"); + } else { + emisWaybillSave.setBlVirtual("0"); + } + } + // 计算目的地 EmisDestination destination=calcDestSiteByBase(receiveCountryCode,transLine.getLineCode(),rcvProviceCode,rcvCityCode,rcvDistrictCode,emisWaybillSave.getReceiveAddress()); if(destination==null){ @@ -2501,15 +2509,16 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb dispatchOrSendManCode=emisWaybillSave.getTakePieceEmployeeCode(); } - Map scanDateItem = new HashMap<>(); - scanDateItem.put("billCode",emisWaybillSave.getBillCode()); - scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode); - scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate())); - scanDateItem.put("scanWeight", "0.0"); - scanDataList.add(scanDateItem); - scanInfo.setScanData(scanDataList); + try { + Map scanDateItem = new HashMap<>(); + scanDateItem.put("billCode",emisWaybillSave.getBillCode()); + scanDateItem.put("dispatchOrSendManCode",dispatchOrSendManCode); + scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate())); + scanDateItem.put("scanWeight", "0.0"); + scanDataList.add(scanDateItem); + scanInfo.setScanData(scanDataList); emisTmsScanRecordService.scan(scanInfo,dispatchOrSendManCode,emisWaybillSave.getSendSiteCode()); } catch (Exception e) { e.printStackTrace(); @@ -2522,6 +2531,40 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb e.printStackTrace(); } + // 是否是虚拟问题件 + try { + if (!StringUtils.isEmpty(emisWaybillSave.getBlVirtual())) { + if ("1".equals(emisWaybillSave.getBlVirtual())) { + // 做问题件录入 + // 插入揽收记录 + ScanInfo scanInfoProm = new ScanInfo(); + List> scanDataPromList = new ArrayList<>(); + scanInfoProm.setOpType(2); + scanInfoProm.setScanType(ScanType.ISSUE.opCode); + + // "billCode": "T001,T002,T002", +// "problemType": "问题件类型", +// "notifySite": "寄件或收件网点编码", +// "picUrl": "问题件图片", +// "remark": "问题备注", +// "scanDate": "2024-05-02 12:03:05", +// "scanWeight": "0.2" + + Map scanDatePromItem = new HashMap<>(); + scanDatePromItem.put("billCode",emisWaybillSave.getBillCode()); + scanDatePromItem.put("problemType","173"); + scanDatePromItem.put("notifySite",emisWaybillSave.getSendSiteCode()); + scanDatePromItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillSave.getSendDate())); + scanDatePromItem.put("scanWeight", "0.0"); + scanDataPromList.add(scanDatePromItem); + scanInfoProm.setScanData(scanDataPromList); + emisTmsScanRecordService.scan(scanInfoProm,dispatchOrSendManCode,emisWaybillSave.getSendSiteCode()); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + }