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-11-01 11:13:47 +08:00
parent 32bbd2a6a4
commit 6ab4368f49
2 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -301,6 +301,9 @@ public class EmisWaybill extends BaseEntity
private String blSpecialQuote;
/* 是否超长 */
private String blOverLong;
/* 是否虚拟单 */
private String blVirtual;
/* 是否付款 */
private String blBill;
/* 账单备注 */

57
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -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<String,Object> 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<String,Object> 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<Map<String,Object>> 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<String,Object> 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();
}
}