tjhsjk

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

@@ -57,9 +57,11 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         amstruckInwardPlan.setPlanId(planId);
         //获取承运商id，车数
         BigDecimal carrierId=new BigDecimal(mapValue.get("carrierId").toString());
-        BigDecimal planTruckNumber=new BigDecimal(mapValue.get("planTruckNumber").toString());
+        BigDecimal planTruckNumber = DataChange.dataToBigDecimal(mapValue.get("planTruckNumber"));
+        if(planTruckNumber.intValue() != 0){
+            amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
+        }
         amstruckInwardPlan.setCarrierId(carrierId);
-        amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
         amstruckInwardPlan.setPlanNumber(DataChange.generateEightDigitsNumber("YSJH",planId.intValue()));
         //设置计划状态为未下发
         amstruckInwardPlan.setPlanStatus(new BigDecimal(0));

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

@@ -76,10 +76,14 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         }
         amstruckInwardRequirement.setRequirementType(requirementType);
         amstruckInwardRequirement.setRequirementTruckTime(new Date(requirementTruckTime));
-        amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
+        if(requirementWorkType != null){
+            amstruckInwardRequirement.setRequirementWorkType(requirementWorkType);
+        }
         amstruckInwardRequirement.setRequirementWorkContent(requirementWorkContent);
         amstruckInwardRequirement.setRequirementWorkEnvironment(requirementWorkEnvironment);
-        amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
+        if(requirementEstimatedDuration != null){
+            amstruckInwardRequirement.setRequirementEstimatedDuration(new BigDecimal(requirementEstimatedDuration));
+        }
         amstruckInwardRequirement.setRequirementOverlimit(requirementOverlimit);
         //用车单位
         amstruckInwardRequirement.setRequirementShipperId(new BigDecimal(requirementShipperId));

src/main/resources/application-dev.yml

@@ -15,7 +15,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.162:8018}