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-06-22 09:25:36 +08:00
parent 5f7fae3d05
commit b791ef81a7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,6 +241,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
boolean isNew = true; boolean isNew = true;
EmisWaybill emisWaybillOld = null; EmisWaybill emisWaybillOld = null;
// 下单网点
String sendSiteCode=SecurityUtils.getLoginUser().getUser().getOwnerSiteCode();
emisWaybillSave.setSendSiteCode(sendSiteCode);
// 如果没有单号就生成单号，如果有单号需要判断是否重复 // 如果没有单号就生成单号，如果有单号需要判断是否重复
if( !StringUtils.isEmpty(emisWaybillSave.getBillCode()) ) { if( !StringUtils.isEmpty(emisWaybillSave.getBillCode()) ) {
boolean isExists = this.checkWaybillIsExists(emisWaybillSave.getBillCode()); boolean isExists = this.checkWaybillIsExists(emisWaybillSave.getBillCode());
@ -248,10 +252,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
throw new EmisBizError(EmisBizErrorType.EXISTS, "运单号重复"); throw new EmisBizError(EmisBizErrorType.EXISTS, "运单号重复");
} }
}else{ }else{
// 下单网点
String sendSiteCode=SecurityUtils.getLoginUser().getUser().getOwnerSiteCode();
emisWaybillSave.setSendSiteCode(sendSiteCode);
// 生成新的运单号 // 生成新的运单号
String waybillNo = emisElectronicSitePagService.realMatchWaybill(sendSiteCode,"T7080"); String waybillNo = emisElectronicSitePagService.realMatchWaybill(sendSiteCode,"T7080");
emisWaybillSave.setBillCode(waybillNo); emisWaybillSave.setBillCode(waybillNo);

1
emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
View File

@ -19,7 +19,6 @@
<result property="zipCode" column="zip_code" /> <result property="zipCode" column="zip_code" />
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num" />
<!-- <result property="countryName" column="country_name" />--> <!-- <result property="countryName" column="country_name" />-->
<association property="countryName" column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/> <association property="countryName" column="country_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>