Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -959,7 +959,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);

src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -920,7 +920,7 @@
         and actp.LINE_ID = #{rangeId}
       </if>
       <if test="materialId != null">
-        and acpm.MATERIAL_ID = #{materialId}
+        and acpm.MATERIAL_ID = #{materialTypeId}
       </if>
       <if test="capacityTypeId != null">
         and actp.CAPACITY_TYPE_ID = #{capacityTypeId}