'同步车号'

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

@@ -31,6 +31,6 @@ public interface JoinFeign {
     Map<String,Object> pushCarNumberToEas(@RequestBody Map<String, Object> map);
 
     // 查询车牌号和金蝶分录
-    @PostMapping("/api/v1/join/wsface/findCarNumberByOrderId")
+    @PostMapping("/api/v1/join/amssaleorder/findCarNumberByOrderId")
     Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
 }

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

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

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

@@ -1983,9 +1983,9 @@
     </select>
 
     <select id="selectTransportOrderForSale1" parameterType="java.util.Map" resultType="java.util.Map">
-        SELECT * FROM (
-        SELECT *from(
-        select
+        SELECT  * FROM (
+        SELECT  *from(
+        select DISTINCT
         OO.ORDER_NUMBER "orderNumber",
         ASO.SALE_NUMBER "saleNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
@@ -2013,7 +2013,8 @@
         ASM.EAS_PRIMARY_ID "easId",
         ASM.SALE_WAREHOUSE "warehouse",
         ASM.MATERIAL_WEIGHT "materialWeight",
-        TWR.RESULT_NET_WEIGHT "netWeight"
+        TWR.RESULT_NET_WEIGHT "netWeight",
+        OO.ORDER_LINE_SEQUENCE "lineSequence"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
@@ -3879,7 +3880,7 @@
     </select>
 
     <select id="getDriverInfoForSale2" parameterType="java.util.Map" resultType="java.util.Map" >
-        SELECT OO.ORDER_NUMBER AS "orderNumber",
+        SELECT DISTINCT OO.ORDER_NUMBER AS "orderNumber",
         RCC.CAPACITY_NUMBER AS "capacityNumber",
         TWR.RESULT_NET_WEIGHT AS "netWeight",
         TWR.RESULT_TARE_WEIGHT AS "tareWeight",
@@ -3897,7 +3898,8 @@
         RGE.GATEPOST_NAME AS "enGatepost",
         RGL.GATEPOST_NAME AS "outGatepost",
         OO.ORDER_STATUS AS "orderStatus",
-        ASO.DELETED AS "deleted"
+        ASO.DELETED AS "deleted",
+        OO.ORDER_LINE_SEQUENCE AS "lineSequence"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID