|
@@ -39,11 +39,18 @@ public class BackgroundProcessingServiceImpl implements IBackgroundProcessServic
|
|
public int deleteErrorResult(String orderNumber) {
|
|
public int deleteErrorResult(String orderNumber) {
|
|
Map<String, Object> orderMes = backgroundProcessingMapper.getOrderMesByOrderNum(orderNumber);
|
|
Map<String, Object> orderMes = backgroundProcessingMapper.getOrderMesByOrderNum(orderNumber);
|
|
int orderType = DataChange.dataToBigDecimal(orderMes.get("orderType")).intValue();
|
|
int orderType = DataChange.dataToBigDecimal(orderMes.get("orderType")).intValue();
|
|
- List<Integer> arrayList = Arrays.asList(11, 15, 16, 21); //没有固定路线不支持此操作
|
|
|
|
|
|
+ List<Integer> arrayList = Arrays.asList(15, 16, 21); //没有固定路线不支持此操作
|
|
if(arrayList.contains(orderType)){
|
|
if(arrayList.contains(orderType)){
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMes.get("resultTotalId"));
|
|
BigDecimal resultTotalId = DataChange.dataToBigDecimal(orderMes.get("resultTotalId"));
|
|
|
|
+ if(orderType==11){
|
|
|
|
+ //如果是内转计重,删除多余计量和装卸货实绩
|
|
|
|
+ backgroundProcessingMapper.deleteExtraWeight(resultTotalId);
|
|
|
|
+ backgroundProcessingMapper.deleteExtraLoad(resultTotalId);
|
|
|
|
+ backgroundProcessingMapper.deleteExtraUnload(resultTotalId);
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
List<Integer> enFactoryList = backgroundProcessingMapper.enFactoryCheck(resultTotalId);
|
|
List<Integer> enFactoryList = backgroundProcessingMapper.enFactoryCheck(resultTotalId);
|
|
if(enFactoryList != null && enFactoryList.size() != 0){
|
|
if(enFactoryList != null && enFactoryList.size() != 0){
|
|
//查询出当前顺序号中所有的实绩
|
|
//查询出当前顺序号中所有的实绩
|