测试环境 对接进取接口

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -203,10 +203,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseFLDXMeasure(map);
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "0");
-                measureCommission.put("planQuantity", 0);
                 measureCommission.put("crname", "admin");
-                measureCommission.put("orderSource", 1);
-                measureCommission.put("ended", 0);
+                measureCommission.put("orderSource", "0");
+                measureCommission.put("ended", "0");
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);
@@ -251,9 +250,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      */
     public int sendMesToDXMeasure(Map<String, Object> map){
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("data", map);
-
-        String url = "http://223.85.163.87:8121/daXingWeight/orderBusiness.do?addOrder";
+        jsonObject.putAll(map);
+        String url = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
         String jsonData = null;
         try {
             jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
@@ -263,7 +261,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         if(!"null".equals(jsonData)){
             System.out.println(jsonData);
             HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
-            String code =(String) map.get("code");
+            String code = (String) map.get("code");
             System.out.println(hashMap.get("msg"));
             if("0".equals(code)){
                 return 1;

src/main/resources/bootstrap.yml

@@ -15,25 +15,45 @@ spring:
 
 #feign设置
 openfeign:
+  #正式环境
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8083}
   BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8021}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8076}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:172.16.33.162:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:172.16.33.162:8095}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:172.16.33.162:8066}
   QmsFeign:
-    url: ${QMSFEIGN_URL:172.16.33.162:8017}
+    url: ${QMSFEIGN_URL:172.16.33.162:8047}
   ImFeign:
-    url: ${IMFEIGN_URL:172.16.33.162:8018}
+    url: ${IMFEIGN_URL:172.16.33.162:8055}
 
+#    测试环境
+#  ColumnDataFeign:
+#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+#    BmsShipFeign:
+#      url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+#    BmsTruckFeign:
+#      url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+#    WmshBoundFeign:
+#      url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+#    WMSFeign:
+#      url: ${WMSFEIGN_URL:172.16.33.162:8012}
+#    OmsFeign:
+#      url: ${OMSFEIGN_URL:172.16.33.162:8016}
+#    JoinFeign:
+#      url: ${JOINFEIGN_URL:172.16.33.162:8006}
+#    QmsFeign:
+#      url: ${QMSFEIGN_URL:172.16.33.162:8017}
+#    ImFeign:
+#      url: ${IMFEIGN_URL:172.16.33.162:8018}
 
 #eureka设置
 eureka:
@@ -102,7 +122,8 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8008
+#  port: 8008
+  port: 8088
 
 
 

src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml

@@ -787,18 +787,28 @@
 
 <!--   采购辅料查询计量委托(达兴) -->
     <select id="purchaseFLDXMeasure" parameterType="map" resultType="java.util.Map">
-        select
-            APO.PURCHASE_ORDER_NO   "purchaseOrder",
-            OO.ORDER_NUMBER         "orderId",
-            RC.CAPACITY_NUMBER      "carNumber",
-            RTC.TRUCK_CALCULATE_NUMBER "regionName",
-            RS.SUPPLIER_NAME            "sendUnit",
-            RS.SUPPLIER_DUTY_PARAGRAPH   "providerNo",
-            RSH.SHIPPER_NAME            "receiver",
-            RSH.SHIPPER_PARTITION_CODE  "receiverNo",
-            RM.MATERIAL_ID              "item",
-            RM.MATERIAL_CODE            "goodsNo",
-            CONCAT(RM.MATERIAL_NAME ,CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL)) "goodsName"
+        select APO.PURCHASE_ORDER_NO                                                          "purchaseOrder",
+               OO.ORDER_NUMBER                                                                "orderId",
+               RC.CAPACITY_NUMBER                                                             "carNumber",
+               RTC.TRUCK_CALCULATE_NUMBER                                                     "regionName",
+               RS.SUPPLIER_NAME                                                               "provider",
+               RS.SUPPLIER_DUTY_PARAGRAPH                                                     "providerNo",
+               RSH.SHIPPER_NAME                                                               "receiver",
+               (case
+                    when RSH.SHIPPER_PARTITION_CODE is null
+                        then ' '
+                    else RSH.SHIPPER_PARTITION_CODE
+                   end
+                   )                                                                          "receiverNo",
+               RM.MATERIAL_ID || ''                                                                "item",
+               RM.MATERIAL_CODE                                                               "goodsNo",
+               CONCAT(RM.MATERIAL_NAME, CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL)) "goodsName",
+               (case
+                   when OOM.ORDER_MATERIAL_WEIGHT  is null
+                    then 0
+                   else OOM.ORDER_MATERIAL_WEIGHT
+                   end
+                )             || ''                                                           "planQuantity"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on TTR.ORDER_ID = OO.ORDER_ID