|
@@ -630,6 +630,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
}
|
|
|
//校验是否成功删除,失败则不允许撤单
|
|
|
if(jsonObject==null || "false".equals(jsonObject.getString("success"))){
|
|
|
+
|
|
|
throw new Exception("计量委托删除失败!");
|
|
|
}
|
|
|
}
|
|
@@ -958,6 +959,22 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
throw new RuntimeException("委托发送失败!");
|
|
|
}
|
|
|
}
|
|
|
+ //判断该订单里面的路线有没有出厂
|
|
|
+ try {
|
|
|
+ int isHaveEnFactoryResult = omstruckOrderSeparateMapper.IsHaveEnFactoryResult(DataChange.dataToBigDecimal(orderMessage.get("lineId")));
|
|
|
+ if (isHaveEnFactoryResult == 0) {
|
|
|
+ //即没有进厂实绩,则接单的时候发委托
|
|
|
+ //看线路名称是否包含达钢
|
|
|
+ orderMessage.put("orderId", orderId);
|
|
|
+ orderMessage.put("asd", 1);
|
|
|
+ Map<String, Object> mcMap = tmsTruckFeign.sendMeasureCommission(orderMessage);
|
|
|
+ if (!"200".equals(mcMap.get("code"))) {
|
|
|
+ throw new RuntimeException("委托发送失败!");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (RuntimeException e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
}
|
|
|
//判断订单是否是一车多单
|
|
|
if (orderType ==12 || orderType ==13 || orderType ==14 || orderType ==19) {
|