|
|
@@ -940,7 +940,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
Map<String,Object> orderMap = amsSaleOrderMapper.getSteelOrderMap(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
|
|
|
//判断该车序号对应的分录是否全部关闭
|
|
|
Integer flCount = amsSaleMaterialMapper.getAbleFlcount(DataChange.dataToBigDecimal(stringObjectMap.get("saleOrderMaterialId")));
|
|
|
- if(flCount == 0) {
|
|
|
+ if(flCount == 0 && !"取消".equals(stringObjectMap.get("capacityNumber")) && !"待定".equals(stringObjectMap.get("capacityNumber"))) {
|
|
|
+
|
|
|
throw new Exception("该运单下所有分录被关闭,无法派车");
|
|
|
}
|
|
|
if (orderMap != null) {
|
Redeem