das

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

@@ -582,9 +582,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
-        //if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
-        //    throw new Exception("钢材订单不允许撤销!");
-        //}
+        if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4){
+            throw new Exception("钢材订单不允许撤销!");
+        }
         if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1){
             throw new Exception("撤单失败");
         }

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

@@ -2039,6 +2039,7 @@
         FROM AMS_SALE_ORDER_MATERIAL ASOM
         LEFT JOIN OMSTRUCK_ORDER OO
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        AND NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
         LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM