|
@@ -246,15 +246,16 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
if(measureCommission == null)
|
|
|
return 0;
|
|
|
measureCommission.put("deliveryType", "计重");
|
|
|
- measureCommission.put("billType", "2");
|
|
|
measureCommission.put("crname", "admin");
|
|
|
//判断还没有净重的计量实绩
|
|
|
Integer weightResultCount = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(DataChange.dataToBigDecimal(map.get("resultTotalId")));
|
|
|
if(weightResultCount == 1){
|
|
|
//如果只剩一条未计量的数据则需要走金蝶(进厂卸货)
|
|
|
measureCommission.put("orderSource", measureCommission.get("chooseOrderSource"));
|
|
|
+ measureCommission.put("billType", "0");
|
|
|
}else {
|
|
|
measureCommission.put("orderSource", "0");
|
|
|
+ measureCommission.put("billType", "2");
|
|
|
}
|
|
|
measureCommission.put("ended", "0");
|
|
|
break;
|