tijiao

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

@@ -859,19 +859,19 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public  int driverReceiveOrRefuse(Map<String, Object> map) throws RuntimeException {
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
+        //通过订单ID查询信息
+        Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
+        int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
         if((Integer) map.get("orderReceiveStatus") == 1) {
             List<Integer> orderIdList = omstruckOrderMapper.getReceiveOrderIdListByCapacityNum((String) map.get("capacityNumber"));
             if (orderIdList.size() > 0) {
                 throw  new RuntimeException("已有接收的订单！");
             }
             omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
-            //通过订单ID查询信息
-            Map<String, Object> orderMessage = omstruckOrderSeparateMapper.getOrderMessagge(orderId);
             int orderStatus = DataChange.dataToBigDecimal(orderMessage.get("orderStatus")).intValue();
             if(orderStatus == 5 || orderStatus == 6) {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
-            int orderType = DataChange.dataToBigDecimal(orderMessage.get("orderType")).intValue();
             if(orderType == 1){
                 //订阅车辆 查询车牌号
                 String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
@@ -941,6 +941,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 }
             }
         } else { //其他状态都视为 拒绝接单
+            if(orderType == 1){
+                throw  new RuntimeException("钢材不允许撤销订单！");
+            }
             omstruckOrder.setOrderStatus(new BigDecimal(6));
             //添加拒绝原因
             omstruckOrder.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));

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

@@ -3012,6 +3012,7 @@
         ON AMS.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         WHERE OOM.ORDER_ID=#{orderId}
         and AMS.SALE_MATERIAL_ID IS NOT NULL
+        and AMS.DELETED IS NULL
     </select>
     <!-- 内转原料司机接单 -->
     <select id="getInwardOrderMap" parameterType="DECIMAL" resultType="java.util.Map">