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-07-20 13:02:11 +08:00
parent 848656c645
commit 10ab43dae7
3 changed files with 6 additions and 6 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/EmisCustomerAddressController.java
View File

@ -136,7 +136,7 @@ public class EmisCustomerAddressController extends EmisBaseController
{ {
String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode(); String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode();
emisCustomerAddress.setUseSiteCode(ownerSiteCode); emisCustomerAddress.setUseSiteCode(ownerSiteCode);
emisCustomerAddress.setUseSite(getLoginUser().getUser().getOwnerSiteName()); emisCustomerAddress.setUseSite(ownerSiteCode);
return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress));
} }

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

@ -84,9 +84,9 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I
@Override @Override
public int updateEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) public int updateEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress)
{ {
emisCustomerAddress.preUpdate(); // emisCustomerAddress.preUpdate();
emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); // emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode());
emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName()); // emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName());
return emisCustomerAddressMapper.updateEmisCustomerAddress(emisCustomerAddress); return emisCustomerAddressMapper.updateEmisCustomerAddress(emisCustomerAddress);
} }

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -368,7 +368,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){ if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_REPEAT.errorCode); scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
itemList.add(scanResultItem); itemList.add(scanResultItem);
return itemList; return itemList;
} }
@ -588,7 +588,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){ if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){
scanResultItem.setResult("fail"); scanResultItem.setResult("fail");
scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描");
scanResultItem.setErrorCode(EmisBizErrorType.SCAN_REPEAT.errorCode); scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode);
itemList.add(scanResultItem); itemList.add(scanResultItem);
return itemList; return itemList;
} }