Browse Source

更改生成主键方法

txf 3 năm trước cách đây
mục cha
commit
be0d417929
33 tập tin đã thay đổi với 47 bổ sung125 xóa
  1. 2 0
      src/main/java/com/steerinfo/dil/mapper/AmstruckPurplanMapper.java
  2. 2 0
      src/main/java/com/steerinfo/dil/mapper/AmstruckPurplanMaterialMapper.java
  3. 2 0
      src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java
  4. 2 0
      src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.java
  5. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.java
  6. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.java
  7. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.java
  8. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.java
  9. 5 1
      src/main/java/com/steerinfo/dil/mapper/TmstruckQualityResultMapper.java
  10. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckReceiptResultMapper.java
  11. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckTotalResultMapper.java
  12. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.java
  13. 2 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java
  14. 4 9
      src/main/java/com/steerinfo/dil/service/impl/AmstruckPurplanServiceImpl.java
  15. 4 12
      src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java
  16. 1 4
      src/main/java/com/steerinfo/dil/service/impl/TmstruckEnfactoryResultServiceImpl.java
  17. 2 9
      src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java
  18. 1 5
      src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java
  19. 1 8
      src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java
  20. 4 8
      src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java
  21. 1 4
      src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java
  22. 0 6
      src/main/resources/com/steerinfo/dil/mapper/AmstruckPurplanMapper.xml
  23. 0 6
      src/main/resources/com/steerinfo/dil/mapper/AmstruckPurplanMaterialMapper.xml
  24. 0 6
      src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml
  25. 0 5
      src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.xml
  26. 0 5
      src/main/resources/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.xml
  27. 0 5
      src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml
  28. 0 5
      src/main/resources/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.xml
  29. 0 6
      src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml
  30. 0 4
      src/main/resources/com/steerinfo/dil/mapper/TmstruckReceiptResultMapper.xml
  31. 0 6
      src/main/resources/com/steerinfo/dil/mapper/TmstruckTotalResultMapper.xml
  32. 0 6
      src/main/resources/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.xml
  33. 0 5
      src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/AmstruckPurplanMapper.java

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.AmstruckPurplan;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -19,6 +20,7 @@ public interface AmstruckPurplanMapper extends IBaseMapper<AmstruckPurplan, BigD
     int insertSelective(AmstruckPurplan amstruckPurplan);
 
     //查询最大ID值
+    @Select("select seq_amstruck_purplan.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过ID查询运输计划

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/AmstruckPurplanMaterialMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.AmstruckPurplanMaterial;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -20,6 +21,7 @@ public interface AmstruckPurplanMaterialMapper extends IBaseMapper<AmstruckPurpl
     List<Map<String, Object>> getWeight(Integer planId);
 
     //查询最大主键Id
+    @Select("select seq_amstruck_purplan_material.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过运输计划Id查询计划子表主键ID

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.apache.poi.ss.formula.functions.T;
 
 import java.math.BigDecimal;
@@ -20,6 +21,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     int insertSelective(OmstruckOrder omstruckOrder);
 
     //查询最大主键Id
+    @Select("select seq_omstruck_order.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过运输订单Id查询运输订单号

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.java

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 
@@ -16,6 +17,7 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     int updateByPrimaryKeySelective(OmstruckOrder omstruckOrder);
 
     //查询最大主键Id
+    @Select("select seq_omstruck_order_material.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过订单Id

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,6 +15,7 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map);
 
     //查询最大主键Id
+    @Select("select seq_tmstruck_enfactory_result.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过车牌号和 运输订单 查询 与运输订单关联的实绩总表ID

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.Map;
 @Mapper
 public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLeaveFactoryResult, BigDecimal> {
     //查询最大ID
+    @Select("select seq_tmstruck_leavefactory.nextval from dual")
     BigDecimal selectMaxId();
 
     //查询所有的出厂实绩、

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.java

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -18,6 +19,7 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     int insertSelective(TmstruckLoadResult tmstruckLoadResult);
 
     //查询最大ID值
+    @Select("select seq_tmstruck_load_result.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过Id获取装车实绩 数据 用于修改

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -15,6 +16,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map);
 
     //查询最大主键Id
+    @Select("select seq_measure_commission.nextval from dual")
     BigDecimal selectMaxId();
 
 }

+ 5 - 1
src/main/java/com/steerinfo/dil/mapper/TmstruckQualityResultMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckQualityResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,7 +15,10 @@ public interface TmstruckQualityResultMapper extends IBaseMapper<TmstruckQuality
     //查询所有的质检作业
     List<Map<String, Object>> getQualityResult(Map<String, Object> map);
 
-
     //通过ID查询质检作业
     List<Map<String, Object>> getQualityResultById(Integer resultId);
+
+    //获取主键
+    @Select("select seq_tmstruck_quality.nextval from dual")
+    BigDecimal selectMaxId();
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckReceiptResultMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -11,6 +12,7 @@ import java.util.Map;
 @Mapper
 public interface TmstruckReceiptResultMapper extends IBaseMapper<TmstruckReceiptResult, BigDecimal> {
     //查询最大ID值
+    @Select("select seq_tmstruck_receipt.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过总实绩Id查询主键Id

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckTotalResultMapper.java

@@ -3,11 +3,13 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckTotalResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 
 @Mapper
 public interface TmstruckTotalResultMapper extends IBaseMapper<TmstruckTotalResult, BigDecimal> {
     //查询最大ID值
+    @Select("select seq_tmstruck_total_result.nextval from dual")
     BigDecimal selectMaxId();
 }

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckUnloadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -14,6 +15,7 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
     List<Map<String, Object>> getUnloadResult(Map<String, Object> map);
 
     //查询最大ID值
+    @Select("select seq_tmstruck_unload_result.nextval from dual")
     BigDecimal selectMaxId();
 
     // 通过总实绩id查询卸货实绩id

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -4,6 +4,7 @@ import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.Map;
 @Mapper
 public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightResult, Short> {
     //查询最大主键Id
+    @Select("select seq_tmstruck_weight_result.nextval from dual")
     BigDecimal selectMaxId();
 
     //通过订单号查询实绩总表Id

+ 4 - 9
src/main/java/com/steerinfo/dil/service/impl/AmstruckPurplanServiceImpl.java

@@ -66,12 +66,10 @@ public class AmstruckPurplanServiceImpl implements IAmstruckPurplanService {
     @Transactional
     public int addPurPlan(AmstruckPurplan amstruckPurplan) {
         //生成主键Id
-        long id;
         BigDecimal maxId = amstruckPurplanMapper.selectMaxId();
-        id = maxId == null ? 1 : maxId.longValue() + 1;
-        BigDecimal planId = new BigDecimal(id);
-        amstruckPurplan.setPlanId(planId);
+        amstruckPurplan.setPlanId(maxId);
         //生成运输计划号
+        int id = maxId.intValue();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         String planNumber = "WYSJF" + sdf.format(new Date());
         planNumber += id < 10 ? "0000000" + id : id < 100 ? "000000" + id : id < 1000 ? "00000" + id : id < 10000 ?
@@ -84,12 +82,9 @@ public class AmstruckPurplanServiceImpl implements IAmstruckPurplanService {
         //生成子表数据
         AmstruckPurplanMaterial amstruckPurplanMaterial = new AmstruckPurplanMaterial();
         //生成主键
-        long childId;
-        BigDecimal selectMaxId = amstruckPurplanMaterialMapper.selectMaxId();
-        childId = selectMaxId == null? 1 :selectMaxId.longValue() + 1;
-        amstruckPurplanMaterial.setPurplanPlanMaterialId(new BigDecimal(childId));
+        amstruckPurplanMaterial.setPurplanPlanMaterialId(amstruckPurplanMaterialMapper.selectMaxId());
         //设置父表主键
-        amstruckPurplanMaterial.setPlanId(planId);
+        amstruckPurplanMaterial.setPlanId(maxId);
         //设置子表未分配数量重量 = 总重量
         amstruckPurplanMaterial.setMaterialUnallocatedWeight(amstruckPurplan.getMaterialTotalWeight());
         //设置已分配重量 初始为 0

+ 4 - 12
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -68,12 +68,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     public OmstruckOrder generateOmsTruckOrder(Map<String, Object> map){
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         //生成订单主键Id
-        long id;
         BigDecimal maxId = omstruckOrderMapper.selectMaxId();
-        id = maxId == null ? 1 : maxId.longValue() + 1;
-        BigDecimal orderId = new BigDecimal(id);
-        omstruckOrder.setOrderId(orderId);
+        omstruckOrder.setOrderId(maxId);
         //生成运输订单号
+        int id = maxId.intValue();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         String orderNumber = "WYSDD" + sdf.format(new Date());
         orderNumber +=
@@ -135,10 +133,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     public int addTotalResult(BigDecimal orderId){
         TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
-        BigDecimal selectMaxId = tmstruckTotalResultMapper.selectMaxId();
-        long totalId;
-        totalId = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        tmstruckTotalResult.setResultTotalId(new BigDecimal(totalId));
+        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectMaxId());
         tmstruckTotalResult.setOrderId(orderId);
         tmstruckTotalResult.setInsertTime(new Date());
         tmstruckTotalResult.setInsertUsername("admin");
@@ -154,10 +149,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //新增运输订单子表
         OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
         //生成子表主键
-        long childId;
-        BigDecimal selectMaxId = omstruckOrderMaterialMapper.selectMaxId();
-        childId = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        omstruckOrderMaterial.setOrderMaterialId(new BigDecimal(childId));
+        omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
         omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         omstruckOrderMaterial.setOrderId(orderId);
         Object orderMaterialWeight = map.get("orderMaterialWeight"); // 采购辅料没有物资重量

+ 1 - 4
src/main/java/com/steerinfo/dil/service/impl/TmstruckEnfactoryResultServiceImpl.java

@@ -61,11 +61,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     public int addEnFactoryResult(Map<String, Object> map) {
         TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
         //生成进厂作业主键Id
-        long id;
-        BigDecimal maxId = tmstruckEnfactoryResultMapper.selectMaxId();
-        id = maxId == null ? 1 : maxId.longValue() + 1;
         //添加主键
-        tmstruckEnfactoryResult.setResultId(new BigDecimal(id));
+        tmstruckEnfactoryResult.setResultId(tmstruckEnfactoryResultMapper.selectMaxId());
         //添加门岗ID 路线起点就是进厂门岗
         tmstruckEnfactoryResult.setGatepostId(DataChange.dataToBigDecimal(map.get("lineStartNodeId")));
         //添加实绩总表Id

+ 2 - 9
src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -67,10 +67,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     public int addLeaveFactoryResult(Map<String, Object> map) {
         TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
         //查询最大主键ID
-        long id;
-        BigDecimal selectMaxId = tmstruckLeaveFactoryResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        tmstruckLeaveFactoryResult.setId(new BigDecimal(id));
+        tmstruckLeaveFactoryResult.setId(tmstruckLeaveFactoryResultMapper.selectMaxId());
         //获取运输订单号
         String orderNumber = (String) map.get("orderNumber");
         //获取车牌号
@@ -136,12 +133,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     @Override
     public int addLeaveFactory(Map<String, Object> map) {
         TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
-        //查询最大主键ID
-        long id;
-        BigDecimal selectMaxId = tmstruckLeaveFactoryResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
         //添加主键
-        tmstruckLeaveFactoryResult.setId(new BigDecimal(id));
+        tmstruckLeaveFactoryResult.setId(tmstruckLeaveFactoryResultMapper.selectMaxId());
         //添加总实绩ID
         tmstruckLeaveFactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         //添加门岗ID 出厂门岗为线路的终点

+ 1 - 5
src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -74,14 +74,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         // 新增装车实绩
         TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //添加主键Id
-        long id;
-        BigDecimal selectMaxId = tmstruckLoadResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
         //新增计量吨位 装车所装的重量
         BigDecimal resultMeasuredTonnage = DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage"));
         tmstruckLoadResult.setResultMeasuredTonnage(resultMeasuredTonnage);
         tmstruckLoadResult.setStatus(new BigDecimal(0));
-        tmstruckLoadResult.setResultId(new BigDecimal(id));
         tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
         String resultIsclear = (String) (map.get("resultIsclear"));
         tmstruckLoadResult.setResultIsclear(resultIsclear);
@@ -102,7 +99,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         changeMap.put("capacityId", capacityId);
         changeMap.put("capacityStatus", 0);
         int i2 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeMap);
-
         //新增出库实绩 并修改实时库存
         BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
         if(portId != null){

+ 1 - 8
src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -48,14 +48,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     public int addMeasureCommission(BigDecimal totalId, Integer type) {
         TmstruckMeasureCommission tmstruckMeasureCommission = new TmstruckMeasureCommission();
         //生成主键Id
-        long id;
-        BigDecimal selectMaxId = tmstruckMeasureCommissionMapper.selectMaxId();
-        if (selectMaxId == null){
-            id = 1;
-        }else {
-            id = selectMaxId.longValue() + 1;
-        }
-        tmstruckMeasureCommission.setCommssionId(new BigDecimal(id));
+        tmstruckMeasureCommission.setCommssionId(tmstruckMeasureCommissionMapper.selectMaxId());
 
         //添加实绩总表Id
         tmstruckMeasureCommission.setResultTotalId(totalId);

+ 4 - 8
src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -66,11 +66,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     public int addUnloadResult(Map<String, Object> map) {
         TmstruckUnloadResult tmstruckUnloadResult = new TmstruckUnloadResult();
         //生成主键ID
-        long id;
-        BigDecimal selectMaxId = tmstruckUnloadResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        tmstruckUnloadResult.setId(new BigDecimal(id));
+        BigDecimal maxId = tmstruckUnloadResultMapper.selectMaxId();
+        tmstruckUnloadResult.setId(maxId);
         //生成卸货实绩编号
+        int id = maxId.intValue();
         StringBuilder resultNumber = new StringBuilder("DW");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         String timeFormat = sdf.format(new Date());
@@ -122,10 +121,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 
         //新增完卸车实绩后新增一条收货实绩
         TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-        long id2;
-        BigDecimal selectMaxId2 = tmstruckReceiptResultMapper.selectMaxId();
-        id2 = selectMaxId2 == null ? 1 : selectMaxId2.longValue() + 1;
-        tmstruckReceiptResult.setId(new BigDecimal(id2));//添加主键
+        tmstruckReceiptResult.setId(tmstruckReceiptResultMapper.selectMaxId());//添加主键
         tmstruckReceiptResult.setResultTotalId(resultTotalId);//添加总实绩Id
         tmstruckReceiptResult.setStatus(new BigDecimal(0)); // 卸货完成后添加的为虚拟收货实绩
         int i2 = tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);

+ 1 - 4
src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -52,10 +52,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     public int addWeightResult(Map<String, Object> map) {
         TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
         //生成最大主键ID
-        long id;
-        BigDecimal selectMaxId = tmstruckWeightResultMapper.selectMaxId();
-        id = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
-        tmstruckWeightResult.setWeightTaskResultId(new BigDecimal(id));
+        tmstruckWeightResult.setWeightTaskResultId(tmstruckWeightResultMapper.selectMaxId());
         tmstruckWeightResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         // 添加计皮计毛作业点ID
         tmstruckWeightResult.setResultGrossPlaceId(DataChange.dataToBigDecimal(map.get("truckCalculateIdMao")));

+ 0 - 6
src/main/resources/com/steerinfo/dil/mapper/AmstruckPurplanMapper.xml

@@ -584,11 +584,5 @@
         where PLAN_ID = #{planId}
     </select>
 
-    <!--  获取最大ID值  -->
-    <select id="selectMaxId" resultType="java.math.BigDecimal">
-        select max(PLAN_ID)
-        from AMSTRUCK_PURPLAN
-    </select>
-
 
 </mapper>

+ 0 - 6
src/main/resources/com/steerinfo/dil/mapper/AmstruckPurplanMaterialMapper.xml

@@ -525,12 +525,6 @@
         where APM.PLAN_ID = #{planId}
     </select>
 
-    <!--  获取最大ID值  -->
-    <select id="selectMaxId" resultType="java.math.BigDecimal">
-        select max(APM.PURPLAN_PLAN_MATERIAL_ID)
-        from AMSTRUCK_PURPLAN_MATERIAL APM
-    </select>
-
 <!--  通过计划Id查询子表主键ID -->
     <select id="getChildIdByPlanId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
         select PURPLAN_PLAN_MATERIAL_ID

+ 0 - 6
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -740,12 +740,6 @@
         </if>
     </select>
 
-    <!--  获取最大ID值  -->
-    <select id="selectMaxId" resultType="java.math.BigDecimal">
-        select max(OO.ORDER_ID)
-        from OMSTRUCK_ORDER OO
-    </select>
-
     <!--  通过运输订单Id查询运输订单号 -->
     <select id="getOrderNumberByOrderId" parameterType="int" resultType="string">
         select OO.ORDER_NUMBER "orderNumber"

+ 0 - 5
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMaterialMapper.xml

@@ -349,11 +349,6 @@
     </if>
   </sql>
 
-  <!--  获取最大ID值  -->
-  <select id="selectMaxId" resultType="java.math.BigDecimal">
-    select max(OOM.ORDER_MATERIAL_ID)
-    from OMSTRUCK_ORDER_MATERIAL OOM
-  </select>
 
 <!--  通过orderId获取子表主键 -->
   <select id="getOrderMaterialIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">

+ 0 - 5
src/main/resources/com/steerinfo/dil/mapper/TmstruckEnfactoryResultMapper.xml

@@ -531,11 +531,6 @@
     <include refid="orderByEnterTime"></include>
   </select>
 
-  <!--  获取最大ID值  -->
-  <select id="selectMaxId" resultType="java.math.BigDecimal">
-    select max(TER.RESULT_ID)
-    from TMSTRUCK_ENFACTORY_RESULT TER
-  </select>
   
 <!--  通过车牌号并且状态不为2 或 运输订单 或运输订单ID  查询关联的实绩总表ID -->
   <select id="selectOrderIdByCpAndOn" parameterType="java.util.Map" resultType="int">

+ 0 - 5
src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -426,11 +426,6 @@
     </delete>
     <!-- 友情提示!!!-->
     <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-    <!--  获取最大ID值  -->
-    <select id="selectMaxId" resultType="java.math.BigDecimal">
-        select max(TLFR.RESULT_ID)
-        from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-    </select>
 
     <sql id="orderByOutTime">
         <if test="orderField != null and orderField != ''">

+ 0 - 5
src/main/resources/com/steerinfo/dil/mapper/TmstruckLoadResultMapper.xml

@@ -651,11 +651,6 @@
     <include refid="orderByResultLoadStartTime"></include>
   </select>
 
-  <!--  获取最大ID值  -->
-  <select id="selectMaxId" resultType="java.math.BigDecimal">
-    select max(RESULT_ID)
-    from TMSTRUCK_LOAD_RESULT
-  </select>
 
 <!--  通过Id获取装车实绩 数据 用于修改-->
   <select id="getLoadResultById" parameterType="int" resultType="java.util.LinkedHashMap">

+ 0 - 6
src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml

@@ -289,12 +289,6 @@
   <!-- 友情提示!!!-->
   <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 
-  <!--  获取最大ID值  -->
-  <select id="selectMaxId" resultType="java.math.BigDecimal">
-    select max(TMC.COMMSSION_ID)
-    from TMSTRUCK_MEASURE_COMMISSION TMC
-  </select>
-
 <!--  排序 -->
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">

+ 0 - 4
src/main/resources/com/steerinfo/dil/mapper/TmstruckReceiptResultMapper.xml

@@ -395,10 +395,6 @@
   <!-- 友情提示!!!-->
   <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
   <!--  获取最大ID值  -->
-  <select id="selectMaxId" resultType="java.math.BigDecimal">
-    select max(TRR.RESULT_ID)
-    from TMSTRUCK_RECEIPT_RESULT TRR
-  </select>
 
 <!--  通过总实绩ID 查询签收实绩ID -->
   <select id="getIdByTotalResultId" parameterType="int" resultType="int">

+ 0 - 6
src/main/resources/com/steerinfo/dil/mapper/TmstruckTotalResultMapper.xml

@@ -341,10 +341,4 @@
   <!-- 友情提示!!!-->
   <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 
-  <!--  获取最大ID值  -->
-  <select id="selectMaxId" resultType="java.math.BigDecimal">
-    select max(RESULT_TOTAL_ID)
-    from TMSTRUCK_TOTAL_RESULT
-  </select>
-  
 </mapper>

+ 0 - 6
src/main/resources/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.xml

@@ -479,12 +479,6 @@
     <!-- 友情提示!!!-->
     <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 
-    <!--  获取最大ID值  -->
-    <select id="selectMaxId" resultType="java.math.BigDecimal">
-        select max(TUR.RESULT_ID)
-        from TMSTRUCK_UNLOAD_RESULT TUR
-    </select>
-
     <!--  排序 -->
     <sql id="orderBy">
         <if test="orderField != null and orderField != ''">

+ 0 - 5
src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -538,11 +538,6 @@
     </if>
   </sql>
 
-  <!--  获取最大ID值  -->
-  <select id="selectMaxId" resultType="java.math.BigDecimal">
-    select max(TWR.WEIGHT_TASK_RESULT_ID)
-    from TMSTRUCK_WEIGHT_RESULT TWR
-  </select>
 
   <!--  通过运输订单号 查询实绩Id、总实绩ID -->
   <select id="selectTotalIdByOrderNo" parameterType="java.lang.String" resultType="java.util.Map">