|
@@ -65,7 +65,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
//给达兴发委托
|
|
//给达兴发委托
|
|
private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
|
|
private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
|
|
|
|
|
|
- private static final String judgeCoke = "一厂焦炭库";
|
|
|
|
|
|
+ //销售焦炭、化产品 判断一厂二厂委托
|
|
|
|
+ private static final String judgeCoke = "一厂";
|
|
|
|
|
|
//根据门来判断委托发送依据
|
|
//根据门来判断委托发送依据
|
|
public static final List<Integer> daGangGatepost = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 14);
|
|
public static final List<Integer> daGangGatepost = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 14);
|
|
@@ -141,7 +142,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
//获取当前订单是属于哪个厂区订单
|
|
//获取当前订单是属于哪个厂区订单
|
|
Map<String, Object> mesMap = tmstruckMeasureCommissionMapper.getShipperIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
|
|
Map<String, Object> mesMap = tmstruckMeasureCommissionMapper.getShipperIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
|
|
if(mesMap.get("saleWarehouse") != null){
|
|
if(mesMap.get("saleWarehouse") != null){
|
|
- if(judgeCoke.equals(map.get("saleWarehouse"))){ //如果是一厂焦炭库则向达钢发送委托
|
|
|
|
|
|
+ String saleWarehouse = String.valueOf(mesMap.get("saleWarehouse"));
|
|
|
|
+ if(saleWarehouse.contains(judgeCoke)){ //如果是一厂焦炭库则向达钢发送委托
|
|
map.put("isDG", "1"); //标识为老厂区
|
|
map.put("isDG", "1"); //标识为老厂区
|
|
return sendMeasureCommissionMes(map);
|
|
return sendMeasureCommissionMes(map);
|
|
}
|
|
}
|