update soap ws user

src/main/java/com/i1/erp/barcode/service/BarcodeGenService.java

@@ -2,10 +2,12 @@ package com.i1.erp.barcode.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDtlDto;
 import com.i1.srm.purchaseOrder.web.dto.PoBarcodeDto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -16,6 +18,9 @@ import java.util.Objects;
 public class BarcodeGenService implements IBarcodeGenService {
     private static final Logger logger = LoggerFactory.getLogger(BarcodeGenService.class);
 
+    @Autowired
+    private IAccountService accountService;
+
     @Override
     public Request genXml(PoBarcodeDto input) throws IOneServiceException {
 
@@ -23,7 +28,7 @@ public class BarcodeGenService implements IBarcodeGenService {
         String pmm01 = Objects.requireNonNull(input.getPurchaseOrderUid());
         List<PoBarcodeDtlDto> dtls = Objects.requireNonNull(input.getDtl());
 
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/barcode/service/BarcodeGetStatusService.java

@@ -2,7 +2,9 @@ package com.i1.erp.barcode.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -10,13 +12,16 @@ import java.util.List;
 
 @Service
 public class BarcodeGetStatusService implements IBarcodeGetStatusService {
+    @Autowired
+    private IAccountService accountService;
+
     @Override
     public Request getRequestXml(String organization, String barcode) throws IOneServiceException {
         if (StringUtils.isBlank(organization) || StringUtils.isBlank(barcode)) {
             throw new IOneServiceException("防伪码状态查询参数为空");
         }
 
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/barcode/service/BarcodePrintService.java

@@ -2,7 +2,9 @@ package com.i1.erp.barcode.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -10,6 +12,8 @@ import java.util.List;
 
 @Service
 public class BarcodePrintService implements IBarcodePrintService {
+    @Autowired
+    private IAccountService accountService;
 
     @Override
     public Request getRequestXml(String organization, String docno, String seq, String barcode, String type) throws IOneServiceException {
@@ -17,7 +21,7 @@ public class BarcodePrintService implements IBarcodePrintService {
             throw new IOneServiceException("防伪码打印参数为空");
         }
 
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/barcode/service/BarcodeVoidService.java

@@ -2,7 +2,9 @@ package com.i1.erp.barcode.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -10,13 +12,16 @@ import java.util.List;
 
 @Service
 public class BarcodeVoidService implements IBarcodeVoidService {
+    @Autowired
+    private IAccountService accountService;
+
     @Override
     public Request getRequestXml(String organization, String barcode) throws IOneServiceException {
 
         if (StringUtils.isBlank(organization)|| StringUtils.isBlank(barcode)) {
             throw new IOneServiceException("防伪码作废参数为空");
         }
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/base/service/SupplierCheckService.java

@@ -2,9 +2,11 @@ package com.i1.erp.base.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -14,6 +16,8 @@ import java.util.List;
 public class SupplierCheckService implements ISupplierCheckService {
     private Logger logger = LoggerFactory.getLogger(SupplierCheckService.class);
 
+    @Autowired
+    private IAccountService accountService;
     @Override
     public Request supplierCheckXml(String supplierUid, String abbrName, String supplierName, String type, String plant) throws IOneServiceException {
         // if (StringUtils.isBlank(plant)) {
@@ -33,7 +37,7 @@ public class SupplierCheckService implements ISupplierCheckService {
         }
 
         //<Access>
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(plant),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/base/service/SupplierSendService.java

@@ -2,6 +2,7 @@ package com.i1.erp.base.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import com.i1.srm.base.dao.entity.BaseSupplierFile;
 import com.i1.srm.base.service.IBaseSupplierFileService;
 import org.apache.commons.lang3.StringUtils;
@@ -23,6 +24,9 @@ public class SupplierSendService implements ISupplierSendService {
     @Autowired
     private IBaseSupplierFileService baseSupplierFileService;
 
+    @Autowired
+    private IAccountService accountService;
+
     @Override
     public Request supplierSendXml(String supplierUid, String plant) throws IOneServiceException {
         if (StringUtils.isBlank(plant)) {
@@ -36,7 +40,7 @@ public class SupplierSendService implements ISupplierSendService {
             throw new IOneServiceException("供应商更新ERP接口：找不到供应商" + supplierUid);
         }
         //<Access>
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(plant),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/deo/service/DeliveryOrderSendService.java

@@ -3,6 +3,7 @@ package com.i1.erp.deo.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import com.i1.srm.base.dao.entity.BaseProductFile;
 import com.i1.srm.deliveryOrder.dao.IDoDtlFileDao;
 import com.i1.srm.deliveryOrder.dao.IDoDtlProductLabelFileDao;
@@ -35,6 +36,8 @@ public class DeliveryOrderSendService implements IDeliveryOrderSendService {
     private IDoDtlFileDao doDtlFileDao;
     @Autowired
     private IDoDtlProductLabelFileDao doDtlProductLabelFileDao;
+    @Autowired
+    private IAccountService accountService;
 
     @Override
     public Request sendDoXml(List<Long> doMstIdList) throws IOneServiceException {
@@ -158,7 +161,7 @@ public class DeliveryOrderSendService implements IDeliveryOrderSendService {
         requestContent.setParameter(Parameter.of(Record.of(null)));
 
         //<Access>
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/deo/service/DeliveryOrderWithdrawService.java

 package com.i1.erp.deo.service;
 
 
+import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import com.i1.srm.deliveryOrder.dao.IDoMstFileDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -15,13 +17,14 @@ import java.util.List;
 public class DeliveryOrderWithdrawService implements IDeliveryOrderWithdrawService {
     private Logger logger = LoggerFactory.getLogger(DeliveryOrderWithdrawService.class);
 
+    @Autowired
+    private IAccountService accountService;
 
     @Override
-    public Request withdrawDoXml(String organization, String deliveryOrderUid) {
-
+    public Request withdrawDoXml(String organization, String deliveryOrderUid) throws IOneServiceException {
 
         //<Access>
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/deo/service/IDeliveryOrderWithdrawService.java

 package com.i1.erp.deo.service;
 
 
+import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.Request;
 
 public interface IDeliveryOrderWithdrawService {
 
-    Request withdrawDoXml(String organization, String deliveryOrderUid);
+    Request withdrawDoXml(String organization, String deliveryOrderUid) throws IOneServiceException;
 
 }

src/main/java/com/i1/erp/deo/soap/DeliveryOrderSendClient.java

@@ -62,6 +62,7 @@ public class DeliveryOrderSendClient extends WebServiceClient {
     /**
      * Send released delivery orders to ERP every one min.
      */
+    // accountService.getCurrentUser()排程会抓不到
     // @Scheduled(fixedDelay = 3600000)
     @Transactional
     public void autoSend() throws IOneServiceException {

src/main/java/com/i1/erp/invoice/service/InvoiceSendService.java

@@ -3,6 +3,7 @@ package com.i1.erp.invoice.service;
 
 import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import com.i1.srm.invoice.dao.IInvoiceDtlFileDao;
 import com.i1.srm.invoice.dao.IInvoiceMstFileDao;
 import com.i1.srm.invoice.dao.IInvoiceOpDtlFileDao;
@@ -31,6 +32,8 @@ public class InvoiceSendService implements IInvoiceSendService {
     private IInvoiceDtlFileDao invoiceDtlFileDao;
     @Autowired
     private IInvoiceMstFileDao invoiceMstFileDao;
+    @Autowired
+    private IAccountService accountService;
 
     @Override
     public Request sendInvoiceXml(List<Long> invoiceMstIdList) throws IOneServiceException {
@@ -100,7 +103,7 @@ public class InvoiceSendService implements IInvoiceSendService {
         requestContent.setParameter(Parameter.of(Record.of(null)));
 
         //<Access>
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of(accountService.getCurrentUser(), "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(organization),
                 Locale.of("zh_cn"));

src/main/java/com/i1/erp/poChg/service/IPoChgSendService.java

 package com.i1.erp.poChg.service;
 
 
+import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.Request;
 import com.i1.srm.poChg.dao.entity.PoChgMstFile;
 
 public interface IPoChgSendService {
 
-    Request sendPoChgXml(PoChgMstFile poChgMstFile);
+    Request sendPoChgXml(PoChgMstFile poChgMstFile) throws IOneServiceException;
 
 }

src/main/java/com/i1/erp/poChg/service/PoChgSendService.java

 package com.i1.erp.poChg.service;
 
+import com.i1.base.exception.IOneServiceException;
 import com.i1.erp.entity.request.*;
+import com.i1.srm.am.service.IAccountService;
 import com.i1.srm.poChg.dao.entity.PoChgMstFile;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -14,13 +17,15 @@ import java.util.List;
 @Service
 public class PoChgSendService implements IPoChgSendService {
     private Logger logger = LoggerFactory.getLogger(PoChgSendService.class);
+    @Autowired
+    private IAccountService accountService;
 
     @Override
     @Transactional
-    public Request sendPoChgXml(PoChgMstFile poChgMstFile) {
+    public Request sendPoChgXml(PoChgMstFile poChgMstFile) throws IOneServiceException {
 
         //<Access>
-        Access access = Access.of(Authentication.of("017552", "tiptop"),
+        Access access = Access.of(Authentication.of("tiptop", "tiptop"),
                 Connection.of("SRM", "192.168.1.1"),
                 Organization.of(poChgMstFile.getFactory().getFactoryUid()),
                 Locale.of("zh_cn"));