|
@@ -676,18 +676,16 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
//此处判断订单状态为反审核
|
|
|
if (closeStatus.equals("0")&&orderStatus.equals("5")) {
|
|
|
//删除销售订单以及销售订单分录(没有下游单据的)
|
|
|
+ int i=0;
|
|
|
List<Map<String, Object>> mapList = amsSaleOrderMapper.selectAmssaleOrderId(saleNumber);
|
|
|
BigDecimal selectAreadyUse = amsSaleOrderMapper.selectAreadyUse(saleNumber);
|
|
|
if (selectAreadyUse==null) {
|
|
|
for (Map<String, Object> IdMap : mapList) {
|
|
|
- BigDecimal saleOrderId = DataChange.dataToBigDecimal(IdMap.get("saleOrderId"));
|
|
|
- BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(IdMap.get("saleOrderMaterialId"));
|
|
|
- //删除销售订单id
|
|
|
- int i = amsSaleOrderMapper.deleteByPrimaryKey(saleOrderId);
|
|
|
- //删除销售订单
|
|
|
- i += amsSaleMaterialMapper.deleteByPrimaryKey(saleOrderMaterialId);
|
|
|
- return i;
|
|
|
+ BigDecimal saleMaterialId = DataChange.dataToBigDecimal(IdMap.get("saleMaterialId"));
|
|
|
+ i+= amsSaleMaterialMapper.deleteByPrimaryKey(saleMaterialId);
|
|
|
}
|
|
|
+ i+= amsSaleOrderMapper.deleteByPrimaryKey(saleOrderNumber);
|
|
|
+ return i;
|
|
|
}else {
|
|
|
return -1;
|
|
|
}
|