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

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

@@ -65,6 +65,8 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         String requirementWorkEnvironment = (String) mapValue.get("requirementWorkEnvironment");
         String requirementEstimatedDuration = (String) mapValue.get("requirementEstimatedDuration");
         String requirementOverlimit = (String) mapValue.get("requirementOverlimit");
+        //提取车型
+        BigDecimal capacityTypeId=DataChange.dataToBigDecimal(mapValue.get("capacityTypeId"));
         String InsertUpdateRemark = (String) mapValue.get("remark");
         String isMineral    = (String)mapValue.get("isMineral");
         Long dueTime =(Long) mapValue.get("DueTime");
@@ -80,6 +82,8 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         }
         amstruckInwardRequirement.setRequirementNumber(DataChange.generateEightDigitsNumber("YSXQ",amstruckInwardRequirementMapper.selectOtherId().intValue()));
         amstruckInwardRequirement.setRequirementStatus(new BigDecimal(0));
+        //新增车型
+        amstruckInwardRequirement.setCapacityTypeId(capacityTypeId);
         if(purchaseOrderId != null){
             amstruckInwardRequirement.setPurchaseOrderId(new BigDecimal(purchaseOrderId));
         }