|
@@ -58,11 +58,11 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
TmstrainWeightResultServiceImpl tmstrainWeightResultService;
|
|
TmstrainWeightResultServiceImpl tmstrainWeightResultService;
|
|
|
|
|
|
//属于采购订单的订单类型(先计毛后计皮)
|
|
//属于采购订单的订单类型(先计毛后计皮)
|
|
- final private List<Integer> judgeOrderTypeList = Arrays.asList(5, 6, 7, 8, 9, 12, 15, 17, 18);
|
|
|
|
|
|
+ final private List<Integer> judgeOrderTypeList = Arrays.asList(5, 6, 7, 8, 9, 12, 15, 17, 18,23,24);
|
|
|
|
|
|
|
|
|
|
//老厂区需要给金蝶回传的数据订单类型
|
|
//老厂区需要给金蝶回传的数据订单类型
|
|
- final private List<Integer> judgeToKDTypeList = Arrays.asList(5,6,7,8,17,18);
|
|
|
|
|
|
+ final private List<Integer> judgeToKDTypeList = Arrays.asList(5,6,7,8,17,18,23);
|
|
|
|
|
|
/**
|
|
/**
|
|
* 接收达钢计量实绩信息
|
|
* 接收达钢计量实绩信息
|
|
@@ -543,6 +543,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
mesMap = tmstruckWeightResultMapper.getPurOrderMesToKD(orderNumber);
|
|
mesMap = tmstruckWeightResultMapper.getPurOrderMesToKD(orderNumber);
|
|
break;
|
|
break;
|
|
case 20:
|
|
case 20:
|
|
|
|
+ case 23:
|
|
mesMap = tmstruckWeightResultMapper.get20PurOrderMesToKD(orderNumber);
|
|
mesMap = tmstruckWeightResultMapper.get20PurOrderMesToKD(orderNumber);
|
|
}
|
|
}
|
|
//将map数据全放进mesMap中
|
|
//将map数据全放进mesMap中
|
|
@@ -579,7 +580,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
return map.get("ArrivalBillNo") + "系统没有此订单号!失败";
|
|
return map.get("ArrivalBillNo") + "系统没有此订单号!失败";
|
|
}
|
|
}
|
|
mesMap.put("orderNumber", map.get("orderNumber"));
|
|
mesMap.put("orderNumber", map.get("orderNumber"));
|
|
- if(orderType == 20){
|
|
|
|
|
|
+ if(orderType == 20 || orderType == 23){
|
|
//20订单修改的表不一样呀
|
|
//20订单修改的表不一样呀
|
|
tmstruckWeightResultMapper.updatePurchaseInwordAPOId(mesMap);
|
|
tmstruckWeightResultMapper.updatePurchaseInwordAPOId(mesMap);
|
|
tmstruckWeightResultMapper.updateOmsTruckMaterialId(mesMap);
|
|
tmstruckWeightResultMapper.updateOmsTruckMaterialId(mesMap);
|