西门子测试修改

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -79,6 +79,13 @@ public class StoragePosController {
     @GetMapping
     @GetMapping
     @PreAuthorize("@el.check('storagePos:list')")
     @PreAuthorize("@el.check('storagePos:list')")
     public PageData<StoragePosDto> query(StoragePosQueryCriteria criteria, Pageable pageable) {
     public PageData<StoragePosDto> query(StoragePosQueryCriteria criteria, Pageable pageable) {
+//        if(criteria.getBlurry().startsWith("test1")){
+//            String mid=criteria.getBlurry().replace("test1","");
+//            SiemensApi.getMaterialLot(1,"1","storage1",mid);
+//        }else  if(criteria.getBlurry().startsWith("test2")){
+//            String mid=criteria.getBlurry().replace("test2","");
+//            SiemensApi.processMaterialLot(1,"1","storage1",mid);
+//        }
 //        SiemensApi.getMaterialLot(1,"1","aaa","maid");
 //        SiemensApi.getMaterialLot(1,"1","aaa","maid");
         if (criteria.getStorageIdList() != null && criteria.getStorageIdList().contains("0")) {
         if (criteria.getStorageIdList() != null && criteria.getStorageIdList().contains("0")) {
             criteria.setStorageIdList(null);
             criteria.setStorageIdList(null);

src/main/java/com/neotel/smfcore/siemens/SiemensApi.java

@@ -142,7 +142,8 @@ public class SiemensApi {
                 + "<CallerId xmlns=\"http://siplace.com/facts\">8100449b-4b84-450b-aaab-48a419b13787</CallerId>"
                 + "<CallerId xmlns=\"http://siplace.com/facts\">8100449b-4b84-450b-aaab-48a419b13787</CallerId>"
                 + "<CallerName xmlns=\"http://siplace.com/facts\">Rojonic</CallerName>"
                 + "<CallerName xmlns=\"http://siplace.com/facts\">Rojonic</CallerName>"
                 + "<Signature xmlns=\"http://siplace.com/facts\">62C28B8F3033423c9286658A67D67674</Signature>"
                 + "<Signature xmlns=\"http://siplace.com/facts\">62C28B8F3033423c9286658A67D67674</Signature>"
-                + "<a:To s:mustUnderstand=\"1\">http://cnctu04053.cn104.local/FactsWebServices/MaterialLot.svc</a:To>"
+                + "<a:To s:mustUnderstand=\"1\">"+config.url+"</a:To>"
+//                + "<a:To s:mustUnderstand=\"1\">http://cnctu04053.cn104.local/FactsWebServices/MaterialLot.svc</a:To>"
                 + "</s:Header>"
                 + "</s:Header>"
                 + "<s:Body xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
                 + "<s:Body xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
                 + "<ProcessMaterialLotType xmlns=\"http://siplace.com/facts/materiallot/2010/01\" versionID=\"2.0.0.1642\" releaseID=\"2.0.0.1642\">"
                 + "<ProcessMaterialLotType xmlns=\"http://siplace.com/facts/materiallot/2010/01\" versionID=\"2.0.0.1642\" releaseID=\"2.0.0.1642\">"

src/main/java/com/neotel/smfcore/siemens/util/WSClientUtil.java

@@ -29,6 +29,7 @@ public class WSClientUtil {
 //                + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><soapenv:Body><ns1:GetNcgOnlineInfo soapenv:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:ns1=\"urn:ncg\"/></soapenv:Body></soapenv:Envelope>";
 //                + "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><soapenv:Body><ns1:GetNcgOnlineInfo soapenv:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\" xmlns:ns1=\"urn:ncg\"/></soapenv:Body></soapenv:Envelope>";
         Map<String, String> headers = new HashMap<String, String>();
         Map<String, String> headers = new HashMap<String, String>();
         headers.put("Content-Type", "application/soap+xml; charset=utf-8");
         headers.put("Content-Type", "application/soap+xml; charset=utf-8");
+        log.info(url+" send :\r\n"+soap);
         try {
         try {
             byte[] b = soap.getBytes("utf-8");
             byte[] b = soap.getBytes("utf-8");
 
 

src/main/resources/config/application.yml

@@ -8,7 +8,7 @@ hella:
 siemens:
 siemens:
   host: "127.0.0.1"
   host: "127.0.0.1"
   port: 3333
   port: 3333
-  # url: "http://cnctu04053.cn104.local/FactsWebServices/MaterialLot.svc"
+ # url: "http://cnctu041p059.cn104.local/Production/WebServices/MaterialLot.svc"
   action:
   action:
     GetMaterialLot: "http://siplace.com/facts/materiallot/2010/01/MaterialLot/GetMaterialLot"
     GetMaterialLot: "http://siplace.com/facts/materiallot/2010/01/MaterialLot/GetMaterialLot"
     ProcessMaterialLot: "http://siplace.com/facts/materiallot/2010/01/MaterialLot/ProcessMaterialLot"
     ProcessMaterialLot: "http://siplace.com/facts/materiallot/2010/01/MaterialLot/ProcessMaterialLot"