|
@@ -893,6 +893,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
String selfMention = amsSaleOrderMapper.findSelfMention(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
|
|
String selfMention = amsSaleOrderMapper.findSelfMention(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
|
|
//如果这个车序号下面有运单,则证明已经派了
|
|
//如果这个车序号下面有运单,则证明已经派了
|
|
Map<String,Object> orderMap = amsSaleOrderMapper.getSteelOrderMap(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
|
|
Map<String,Object> orderMap = amsSaleOrderMapper.getSteelOrderMap(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
|
|
|
|
+ //判断该车序号对应的分录是否全部关闭
|
|
|
|
+ Integer flCount = amsSaleMaterialMapper.getAbleFlcount(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
|
|
|
|
+ if(flCount == 0) {
|
|
|
|
+ throw new Exception("该运单下所有分录被关闭,无法派车");
|
|
|
|
+ }
|
|
if (orderMap != null) {
|
|
if (orderMap != null) {
|
|
throw new Exception("该订单已派发,无法重复派车");
|
|
throw new Exception("该订单已派发,无法重复派车");
|
|
}
|
|
}
|
|
@@ -2056,6 +2061,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
if (mapValue.get("orderId") == null) {
|
|
if (mapValue.get("orderId") == null) {
|
|
throw new Exception("还未派车,不允许修改车牌号");
|
|
throw new Exception("还未派车,不允许修改车牌号");
|
|
}
|
|
}
|
|
|
|
+ //判断该车序号对应的分录是否全部关闭
|
|
|
|
+ if(mapValue.get("saleOrderMaterialId") != null && DataChange.dataToBigDecimal(mapValue.get("capacityId")).compareTo(new BigDecimal(35128)) != 0) {
|
|
|
|
+ Integer flCount = amsSaleMaterialMapper.getAbleFlcount(DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId")));
|
|
|
|
+ if(flCount == 0) {
|
|
|
|
+ throw new Exception("该运单下所有分录被关闭,无法派车");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
//查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
|
|
//查询输入进来的车牌号是否与原有车牌号一致,如果一致则退出
|
|
BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
|
|
BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
|
|
if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0) {
|
|
if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0) {
|