修改销售订单

src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -58,4 +58,5 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     List<Map<String, Object>> selectOrderList(BigDecimal saleOrderId);
 
+    int reverseApprovalOrder(BigDecimal saleOrderId);
 }

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

@@ -260,6 +260,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
             amsSaleOrder.setDeleted(new BigDecimal(1));
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
+            //反审的订单需将下面的运输订单关闭
+            try {
+                amsSaleOrderMapper.reverseApprovalOrder(amsSaleOrder.getSaleOrderId());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         if (orderStatus.equals("4") && closeStatus.equals("1")){
             AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);

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

@@ -933,7 +933,6 @@
              LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
                        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_ID IS NOT NULL
         AND OO.ORDER_STATUS BETWEEN 4 AND 5
         AND OO.ORDER_TYPE BETWEEN 1 AND 2
@@ -1065,6 +1064,7 @@
         AND OO.CAN_WORK = 1
         AND ASOM.SALE_ORDER_ID = #{saleOrderId})
   </update>
+
   <select id="selectPreviousOrderNumber" resultType="java.util.Map">
     SELECT DISTINCT
       ASOM.SALE_ORDER_ID "saleOrderId",
@@ -1098,6 +1098,23 @@
     and oo.order_type = 1
     and ASOM.SALE_ORDER_ID = #{saleOrderId}
   </select>
-
+  <update id="reverseApprovalOrder" parameterType="java.math.BigDecimal">
+    UPDATE OMSTRUCK_ORDER OO
+    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
+             LEFT JOIN OMSTRUCK_ORDER OO
+                       ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+             LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                       ON TTR.ORDER_ID = OO.ORDER_ID
+             LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                       ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+      WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+        AND OO.ORDER_ID IS NOT NULL
+        AND OO.ORDER_STATUS BETWEEN 4 AND 5
+        AND OO.ORDER_TYPE BETWEEN 1 AND 2)
+  </update>
 
 </mapper>