luobang преди 2 години
родител
ревизия
ca65921770
променени са 1 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 3 1
      src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

+ 3 - 1
src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -3867,7 +3867,8 @@
   <!-- 关闭未进厂的运单 -->
   <update id="closeOrderNotIn" parameterType="DECIMAL" >
     UPDATE OMSTRUCK_ORDER OO
-    SET OO.ORDER_STATUS = 7
+    SET OO.ORDER_STATUS = 7,
+        OO.INSERT_UPDATE_REMARK = '关闭销售订单,运单同步关闭'
     WHERE OO.ORDER_ID IN (
       SELECT OO.ORDER_ID "orderId"
       FROM AMS_SALE_ORDER_MATERIAL ASOM
@@ -3879,6 +3880,7 @@
                        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
       WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
         AND TER.RESULT_ENTRY_GATE_TIME IS NULL
+        AND OO.ORDER_TYPE IN (1,2)
         AND OO.ORDER_ID IS NOT NULL
         AND OO.ORDER_STATUS IN (4,5)
     )