dssd

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -153,7 +153,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         // 是否整单
         Object wholeOrder = mapVal.get("wholeOrder");
         // 关闭副产品整个订单
-        if (closeStatus.equals("-1") && "1".equals(wholeOrder)) {
+        if (closeStatus.equals("-1") && "1".equals(wholeOrder) && amsSaleOrders.size() != 0 && amsSaleOrders.get(0) != null) {
             AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
             amsSaleOrder.setDeleted(new BigDecimal(2));
             if (reason != null) {
@@ -162,7 +162,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             result += amsSaleMaterialMapper.closeAllSaleMaterial(amsSaleOrder.getSaleOrderId());
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
             List<Map<String, Object>> warehouseList = amsSaleOrderMapper.getWareHouse(amsSaleOrder.getSaleOrderId());
-            if (warehouseList != null && warehouseList.size() != 0) {
+            if (warehouseList != null && warehouseList.size() != 0 && warehouseList.get(0) != null) {
                 Object warehouse = warehouseList.get(0).get("warehouse");
                 if (warehouse != null && "副产品库".equals(warehouse)) {
                     result += amsSaleOrderMapper.closeOrderNotIn(amsSaleOrder.getSaleOrderId());