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

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

@@ -1067,11 +1067,12 @@
   </update>
   <select id="selectPreviousOrderNumber" resultType="java.util.Map">
     SELECT DISTINCT
-           ASOM.SALE_ORDER_ID "saleOrderId",
-           ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
-           ASOM.PREVIOUS_ORDER_NUMBER "orderNumber"
+      ASOM.SALE_ORDER_ID "saleOrderId",
+      ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+      ASOM.PREVIOUS_ORDER_NUMBER "orderNumber"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
-    WHERE ASOM.PREVIOUS_ORDER_NUMBER IS NOT NULL
+           LEFT JOIN OMSTRUCK_ORDER OO ON OO .ORDER_PLAN_ID = ASOM .SALE_ORDER_MATERIAL_ID AND OO .ORDER_TYPE=1
+    WHERE ASOM.PREVIOUS_ORDER_NUMBER IS NOT NULL AND OO.ORDER_ID IS NULL
     AND ASOM.SALE_ORDER_ID =  #{saleOrderId}
   </select>
   <select id="selectOrderDetails" resultType="java.util.Map">