aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: TMS系统-运输管理-漏组批次订单全量扫描/实时扫描入库-针对从未组批次类型数据，起始网点编码、下一网点编码取运单表对应数据 TMS系统-小程序/OMS/TMS/APP系统下单/批量导入下单-寄件国家是缅甸和柬埔寨的自动获取的运单号/子单号 7080开头 不带T

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-10-21 11:45:17 +08:00
parent 4469eaf8fa
commit d2399db04f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -443,7 +443,7 @@ public class EmisWaybillController extends EmisBaseController
emisWaybillService.realSubmitOrder(emisWaybillSave); emisWaybillService.realSubmitOrder(emisWaybillSave);
JSONObject jObjOut = new JSONObject(); JSONObject jObjOut = new JSONObject();
jObjOut.put("billCode", waybillOrder.getBillCode()); jObjOut.put("billCode", emisWaybillSave.getBillCode());
// jObjOut.put("prodName", waybillOrder.getProductType()); // jObjOut.put("prodName", waybillOrder.getProductType());
return AjaxResult.success("下单成功", jObjOut); return AjaxResult.success("下单成功", jObjOut);

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

@ -3169,6 +3169,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
*/ */
private void addNewWaybill(EmisWaybill emisWaybillSave) throws EmisBizError { private void addNewWaybill(EmisWaybill emisWaybillSave) throws EmisBizError {
// 当寄件国家为0095或0855时，去除billCode和billCodeSub中的第一个T
modifyBillCode(emisWaybillSave);
// 获取运单号，判断是不是子单已存在 // 获取运单号，判断是不是子单已存在
boolean isExists = checkWaybillIsExists(emisWaybillSave.getBillCode()); boolean isExists = checkWaybillIsExists(emisWaybillSave.getBillCode());
if(isExists){ if(isExists){
@ -3181,9 +3184,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
// 校验产品类型与线路是否匹配 // 校验产品类型与线路是否匹配
checkLineWithProd(emisWaybillSave); checkLineWithProd(emisWaybillSave);
// 当寄件国家为0095或0855时，去除billCode和billCodeSub中的第一个T
modifyBillCode(emisWaybillSave);
// 子单号做扣减 // 子单号做扣减
if ("1".equals(emisWaybillSave.getBlGenSubbill())) { if ("1".equals(emisWaybillSave.getBlGenSubbill())) {
Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002"); Integer subBillCount = emisElectronicSitePagService.getTotalAvailablePagCount(emisWaybillSave.getSendSiteCode(), "T7080", "1002");