tiaji

src/main/java/com/steerinfo/dil/controller/AmstruckInwardRequirementController.java

@@ -211,6 +211,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
     }
 
 
+
     @ApiModelProperty(value = "展示批次信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

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

@@ -944,7 +944,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         Map<String,Object> map = new HashMap<>();
         map.put("saleOrderId",saleOrderId);
         List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(map);
-        if (amsSaleMaterials != null && amsSaleMaterials.get(0).getSaleWarehouse().equals("副产品库")) {
+        if (amsSaleMaterials != null && amsSaleMaterials.get(0).getSaleWarehouse() != null && amsSaleMaterials.get(0).getSaleWarehouse().equals("副产品库")) {
             result += amsSaleOrderMapper.closeOrderNotIn(saleOrderId);
         }
         result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);