dfsak

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

@@ -688,9 +688,6 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         }
         //根据订单ID查找需求里面的承运范围和物资
         Map<String,Object>priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
-        if(priceMap.get("rangeId") ==null){
-            priceMap.put("rangeId",new BigDecimal(1));
-        }
         Map<String,Object>priceValueMap = null;
         try {
             priceValueMap = amsFeign.getInwardPriceBy(priceMap);

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

@@ -575,13 +575,18 @@ 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("lineSqe")).intValue() > 1){
+            throw new Exception("撤单失败");
+        }
         BigDecimal orderPlanId = DataChange.dataToBigDecimal(mesMap.get("orderPlanId"));
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("resultTotalId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
         omstruckOrder.setOrderStatus(new BigDecimal(8));
-        omstruckOrder.setInsertUpdateRemark("司机撤销订单将订单删除");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD HH:mm:ss");
+        String dateStr = sdf.format(new Date());
+        omstruckOrder.setInsertUpdateRemark(map.get("capacityNumber") + "司机撤销订单将订单删除," + "撤销时间:" + dateStr + "撤销时路段顺序号为:" + mesMap.get("lineSqe"));
         //讲路段顺序号设为空，适应进厂以后扫码
         omstruckOrder.setOrderLineSequence(new BigDecimal(0));
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
@@ -630,7 +635,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderSeparateMapper.updateTranTimes(orderPlanId, transTimes.intValue() - 1);
             }
         }
-        System.out.println(orderId + "撤单成功");
+        System.out.println(map.get("capacityNumber") + "司机撤销订单将订单删除" + "撤销时间:" + dateStr + "撤销订单号为:" + orderId);
         return result;
     }
    //修改运力

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

@@ -750,7 +750,8 @@
         select OO.ORDER_TYPE    "orderType",
                OO.ORDER_PLAN_ID "orderPlanId",
                TTR.RESULT_TOTAL_ID  "resultTotalId",
-               OO.INSERT_UPDATE_REMARK  "insertUpdateRemark"
+               OO.INSERT_UPDATE_REMARK  "insertUpdateRemark",
+               OO.ORDER_LINE_SEQUENCE   "lineSqe"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
         where OO.ORDER_ID = #{orderId}
@@ -779,7 +780,8 @@
         ARM.MATERIAL_ID "materialId",
         AIR.LINE_ID     "rangeId",
         AIR.REQUIREMENT_TYPE    "requirementType",
-        AIR.IS_MINERAL  "isMineral"
+        AIR.IS_MINERAL  "isMineral",
+        RMT.MATERIAL_TYPE_ID    "materialTypeId"
         from OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
@@ -789,7 +791,12 @@
         ON ARP.REQUIREMENT_ID = AIR.REQUIREMENT_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
         ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ARM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL_TYPE RMT
+        ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         where oo.ORDER_ID = #{orderId}
+        and RMT.MATERIAL_ISINWARD = 1
     </select>
 
     <select id="getTwoDateMes" parameterType="java.math.BigDecimal" resultType="java.util.Map">