浏览代码

xiugai luobang bug

txf 3 年之前
父节点
当前提交
01d0a98275

+ 18 - 16
src/main/java/com/steerinfo/dil/service/impl/AmstruckInwardPlanServiceImpl.java

@@ -51,19 +51,8 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
     @Transactional
     @Transactional
     @Override
     @Override
     public int insert(Map<String,Object> mapValue) {
     public int insert(Map<String,Object> mapValue) {
-        BigDecimal requirementId=new BigDecimal(mapValue.get("requirementId").toString());
-        AmstruckRequirementPlan amstruckRequirementPlan = new AmstruckRequirementPlan();
-        BigDecimal planId=amstruckInwardPlanMapper.selectOtherId();
-        BigDecimal requirementPlanId = amstruckRequirementPlanMapper.selectOtherId();
-        amstruckRequirementPlan.setRequirementPlanId(requirementPlanId);
-        amstruckRequirementPlan.setPlanId(planId);
-        amstruckRequirementPlan.setRequirementId(requirementId);
-        amstruckRequirementPlan.setInsertTime(new Date());
-        amstruckRequirementPlan.setInsertUsername("admin");
-        amstruckRequirementPlan.setInsertUpdateRemark("无");
-        //在中间表中将需求与计划绑定
-        amstruckRequirementPlanMapper.insertSelective(amstruckRequirementPlan);
-        AmstruckInwardPlan amstruckInwardPlan=new AmstruckInwardPlan();
+        AmstruckInwardPlan amstruckInwardPlan = new AmstruckInwardPlan();
+        BigDecimal planId = amstruckInwardPlanMapper.selectOtherId();
         //设置主键
         //设置主键
         amstruckInwardPlan.setPlanId(planId);
         amstruckInwardPlan.setPlanId(planId);
         //获取承运商id,车数
         //获取承运商id,车数
@@ -71,8 +60,7 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         BigDecimal planTruckNumber=new BigDecimal(mapValue.get("planTruckNumber").toString());
         BigDecimal planTruckNumber=new BigDecimal(mapValue.get("planTruckNumber").toString());
         amstruckInwardPlan.setCarrierId(carrierId);
         amstruckInwardPlan.setCarrierId(carrierId);
         amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
         amstruckInwardPlan.setPlanTruckNumber(planTruckNumber);
-        DataChange dataChange=new DataChange();
-        amstruckInwardPlan.setPlanNumber(dataChange.generateEightDigitsNumber("YSJH",amstruckInwardPlanMapper.selectOtherId().intValue()));
+        amstruckInwardPlan.setPlanNumber(DataChange.generateEightDigitsNumber("YSJH",planId.intValue()));
         //设置计划状态为未下发
         //设置计划状态为未下发
         amstruckInwardPlan.setPlanStatus(new BigDecimal(0));
         amstruckInwardPlan.setPlanStatus(new BigDecimal(0));
         // 设置常规字段
         // 设置常规字段
@@ -80,7 +68,21 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
         amstruckInwardPlan.setInsertUsername("admin");
         amstruckInwardPlan.setInsertUsername("admin");
         amstruckInwardPlan.setInsertUpdateRemark("无");
         amstruckInwardPlan.setInsertUpdateRemark("无");
         amstruckInwardPlan.setDeleted(new BigDecimal(0));
         amstruckInwardPlan.setDeleted(new BigDecimal(0));
-        return amstruckInwardPlanMapper.insertSelective(amstruckInwardPlan);
+        int i = amstruckInwardPlanMapper.insertSelective(amstruckInwardPlan);
+        //新增需求计划中间表
+        AmstruckRequirementPlan amstruckRequirementPlan = new AmstruckRequirementPlan();
+        //xu qiu ID
+        BigDecimal requirementId = new BigDecimal(mapValue.get("requirementId").toString());
+        BigDecimal requirementPlanId = amstruckRequirementPlanMapper.selectOtherId();
+        amstruckRequirementPlan.setRequirementPlanId(requirementPlanId);
+        amstruckRequirementPlan.setPlanId(planId);
+        amstruckRequirementPlan.setRequirementId(requirementId);
+        amstruckRequirementPlan.setInsertTime(new Date());
+        amstruckRequirementPlan.setInsertUsername("admin");
+        amstruckRequirementPlan.setInsertUpdateRemark("无");
+        //在中间表中将需求与计划绑定
+        i += amstruckRequirementPlanMapper.insertSelective(amstruckRequirementPlan);
+        return i;
     }
     }
 
 
     @Override
     @Override

+ 2 - 2
src/main/resources/bootstrap.yml

@@ -65,6 +65,6 @@ mybatis:
 
 
 server:
 server:
 #  正式
 #  正式
-#  port: 8079
+  port: 8079
 #  测试
 #  测试
-  port: 8015
+#  port: 8015