From 10ab43dae7ab0d8ac07b7552545b7532f7c09819 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 20 Jul 2024 13:02:11 +0800 Subject: [PATCH] md --- .../xdadan/erp/web/emis/EmisCustomerAddressController.java | 2 +- .../emis/service/impl/EmisCustomerAddressServiceImpl.java | 6 +++--- .../erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java index 364a45f30..5d3ff0440 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerAddressController.java @@ -136,7 +136,7 @@ public class EmisCustomerAddressController extends EmisBaseController { String ownerSiteCode = getLoginUser().getUser().getOwnerSiteCode(); emisCustomerAddress.setUseSiteCode(ownerSiteCode); - emisCustomerAddress.setUseSite(getLoginUser().getUser().getOwnerSiteName()); + emisCustomerAddress.setUseSite(ownerSiteCode); return toAjax(emisCustomerAddressService.insertEmisCustomerAddress(emisCustomerAddress)); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java index 9e29d12ef..4487c01cb 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerAddressServiceImpl.java @@ -84,9 +84,9 @@ public class EmisCustomerAddressServiceImpl extends EmisBaseService implements I @Override public int updateEmisCustomerAddress(EmisCustomerAddress emisCustomerAddress) { - emisCustomerAddress.preUpdate(); - emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); - emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName()); +// emisCustomerAddress.preUpdate(); +// emisCustomerAddress.setUseSiteCode(getCurrentUser().getOwnerSiteCode()); +// emisCustomerAddress.setUseSite(getCurrentUser().getOwnerSiteName()); return emisCustomerAddressMapper.updateEmisCustomerAddress(emisCustomerAddress); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index ad08fa158..230ab9e6d 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -368,7 +368,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){ scanResultItem.setResult("fail"); scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); - scanResultItem.setErrorCode(EmisBizErrorType.SCAN_REPEAT.errorCode); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); itemList.add(scanResultItem); return itemList; } @@ -588,7 +588,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm if(emisWaybill.getProblemType() == 173 || emisWaybill.getProblemType() == 170){ scanResultItem.setResult("fail"); scanResultItem.setMessage(scanBillCode + "此单号是虚拟单，不允许扫描"); - scanResultItem.setErrorCode(EmisBizErrorType.SCAN_REPEAT.errorCode); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); itemList.add(scanResultItem); return itemList; }