Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -24,10 +24,7 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 //import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 
@@ -722,10 +719,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             return failed("匹配不到车牌号！");
         }
         else {
-            for (Map<String, Object> map : mapList) {
                 // 调用EAS接口将车牌号传给金蝶
-                BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
-                Map<String,Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+                Map<String,Object> input = joinFeign.findCarNumberByOrderList(mapList);
                 Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
                 totalMap.put("input",input);
                 System.out.println(totalMap);
@@ -736,7 +731,6 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                     throw new Exception("登录金蝶失败");
                 }
                 System.out.println(s);
-            }
             return success(result);
         }
     }
@@ -1178,8 +1172,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         else {
             // 调用EAS接口将车牌号传给金蝶
-            BigDecimal saleOrderMaterialId = new BigDecimal((Integer) mapValue.get("saleOrderMaterialId"));
-            Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+            List<Map<String,Object>> mapList = new ArrayList<>();
+            mapList.add(mapValue);
+            Map<String, Object> input = joinFeign.findCarNumberByOrderList(mapList);
             Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
             totalMap.put("input", input);
             System.out.println(totalMap);

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,4 +34,8 @@ public interface JoinFeign {
     // 查询车牌号和金蝶分录
     @PostMapping("/api/v1/join/amssaleorder/findCarNumberByOrderId")
     Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    //根据数组查询车牌号、承运商和金蝶分录
+    @PostMapping("/api/v1/join/amssaleorder/findCarNumberByOrderList")
+    Map<String, Object> findCarNumberByOrderList(@RequestBody List<Map<String, Object>> mapList);
 }

src/main/java/com/steerinfo/dil/util/EASTestUtil.java

@@ -27,7 +27,7 @@ public class EASTestUtil {
     public final String dbType = "1";
     public final String userName = "user";
     // context
-    public final String command = "saveSaleOrderBillHandler";
+    public final String command = "updateSaleOrderCarNumHandler";
 
     /**
      * 得到context的map

src/main/resources/application-dev.yml

@@ -15,11 +15,11 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   JoinFeign:
-    url: ${JOINFEIGN_URL:localhost:8006}
+    url: ${JOINFEIGN_URL:172.16.33.166:8006}
 
 
   #测试环境端口

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

@@ -4476,7 +4476,8 @@
                         RAS.ARRIVAL_ID                                          "toTheStationId",
                         ASM.IS_POUND_SALE                                       "isPoundSale",
                         ASM.SALE_MATERIAL_ID                                    "saleMaterialId",
-                        TPAR.RESULT_ID                                          "approveId"
+                        TPAR.RESULT_ID                                          "approveId",
+                        ASM.IS_POUND_SALE                                       "isPoundSale"
                       FROM AMS_SALE_ORDER ASO
                         LEFT JOIN AMS_SALE_MATERIAL ASM
                       ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID