汽车衡报警、一次、洁净主键修改

src/main/java/com/steerinfo/baseinfo/meterbasehistaredata/service/impl/MeterBaseHisTareDataServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 
@@ -28,7 +29,7 @@ import java.util.List;
 @Service(value = "meterBaseHisTareDataService")
 public class MeterBaseHisTareDataServiceImpl extends BaseServiceImpl<MeterBaseHisTareData, String> implements IMeterBaseHisTareDataService {
 
-    @Autowired
+    @Resource
     private MeterBaseHisTareDataMapper meterBaseHisTareDataMapper;
 
     @Override
@@ -65,7 +66,7 @@ public class MeterBaseHisTareDataServiceImpl extends BaseServiceImpl<MeterBaseHi
         try {
             model.setId(model.getId());
             model.setValueFlag("1");
-            meterBaseHisTareDataMapper.updateByPrimaryKey(model);
+            meterBaseHisTareDataMapper.updateByPrimaryKeySelective(model);
         } catch (Exception ex) {
             ex.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -30,6 +30,7 @@ import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -339,9 +340,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualFirstNo, dataNo, predictionNo);
                 BeanUtils.copyProperties(mwca1, actualRow);
 
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                actualRow.setActualNo(sdf.format(new Date()) + no);
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//                actualRow.setActualNo(sdf.format(new Date()) + no);
+
+                String no = PublicMethod.IdCreate(3);
+                actualRow.setActualNo(no);
                 actualRow.setNetMode(DbConstants.TYPE);
                 actualRow.setValueFlag("1");
                 actualRow.setNote(note);
@@ -395,9 +399,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualFirstNo, dataNo, scale.getPredictionNo());
                         BeanUtils.copyProperties(mwca1, actualRow);
 
-                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-                        String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                        actualRow.setActualNo(sdf.format(new Date()) + no);
+//                        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//                        String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//                        actualRow.setActualNo(sdf.format(new Date()) + no);
+
+                        String no = PublicMethod.IdCreate(3);
+                        actualRow.setActualNo(no);
+
                         actualRow.setNetMode(DbConstants.TYPE);
                         actualRow.setValueFlag("1");
                         actualRow.setNote(note);
@@ -433,9 +441,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 MeterWorkCarActual mwca2 = meterWorkCarActualMapper.manualAdd(first1.getActualFirstNo(), first2.getActualFirstNo());
                 BeanUtils.copyProperties(mwca2, actualRow);
 
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                actualRow.setActualNo(sdf.format(new Date()) + no);
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//                actualRow.setActualNo(sdf.format(new Date()) + no);
+
+                String no = PublicMethod.IdCreate(3);
+                actualRow.setActualNo(no);
+
                 actualRow.setNetMode(DbConstants.TYPE);
                 actualRow.setValueFlag("1");
                 actualRow.setNote(note);
@@ -1124,9 +1136,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwca.setNetTime(mwca.getTareTime());
             }
             mwca.setNetMode(DbConstants.TYPE);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            mwca.setActualNo(sdf.format(new Date()) + no);
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            mwca.setActualNo(sdf.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            mwca.setActualNo(no);
+
             mwca.setUploadFlag("1");
             mwca.setNetWeight(mwcaf1.getMeterWeight().subtract(mbttd.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(mwca);
@@ -1265,7 +1281,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             model.setNetManNo(userId);
             model.setNetManName(userName);
             model.setNetWeight(model.getGrossWeight().subtract(model.getTareWeight()));
-            model.setActualNo(sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(sdf.format(new Date())));
+//            model.setActualNo(sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(sdf.format(new Date())));
+            String no = PublicMethod.IdCreate(3);
+            model.setActualNo(no);
+
         }
     }
 
@@ -1471,9 +1490,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         scale.setUploadFlag("1");
         preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-        carActual.setActualNo(sdf.format(new Date()) + no);
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//        String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//        carActual.setActualNo(sdf.format(new Date()) + no);
+
+        String no = PublicMethod.IdCreate(3);
+        carActual.setActualNo(no);
+
         carActual.setActualFirst1No(railwayActual.getActualNo()); //汽车毛重编号，存火车实绩z编号
         carActual.setActualFirst2No(""); //皮重编号
         carActual.setUploadFlag("1");
@@ -1545,8 +1568,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             trackScale.setUploadFlag("1");
             preTrackScaleMapper.insertSelective(trackScale);
 
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actual.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actual.setActualNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            actual.setActualNo(no);
+
             actual.setActualFirst1No("Z" + actual.getActualNo());
             actual.setNetManNo(userId);
             actual.setNetManName(userName);
@@ -1613,9 +1639,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             preTrackScaleMapper.updateByPrimaryKeySelective(trackScale);
 
             BeanUtils.copyProperties(trackScale, actual); //相同的实体类进行转换
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actual.setActualNo(sdf.format(new Date()) + no);
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actual.setActualNo(sdf.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            actual.setActualNo(no);
             actual.setActualFirst1No("D" + actual.getActualNo());
             actual.setNetManNo(userId);
             actual.setNetManName(userName);
@@ -1786,7 +1815,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             String afl = sdf.format(new Date());
             if(predictionNo == "" || "".equals(predictionNo)){
                 //添加毛重一次计量数据
-                String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//                String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+                String actualFirstNo = PublicMethod.IdCreate(3);
                 mwcaf1.setActualFirstNo(actualFirstNo);
                 mwcaf1.setValueFlag("2");
                 mwcaf1.setCreateTime(new Date());
@@ -1799,7 +1829,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcaf1.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.insertSelective(mwcaf1);
                 //添加皮重一次计量数据
-                String dataNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//                String dataNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//                mwcaf2.setActualFirstNo(dataNo);
+                String dataNo = PublicMethod.IdCreate(3);
                 mwcaf2.setActualFirstNo(dataNo);
                 mwcaf2.setValueFlag("2");
                 mwcaf2.setCreateTime(new Date());
@@ -1812,7 +1844,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcaf2.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.insertSelective(mwcaf2);
                 //添加净重重一次计量数据
-                String ActualNo = sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(afl);
+//                String ActualNo = sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(afl);
+//                model.setActualNo(ActualNo);
+
+                String ActualNo = PublicMethod.IdCreate(3);
                 model.setActualNo(ActualNo);
                 model.setValueFlag("2");
                 model.setActualFirst1No(actualFirstNo);
@@ -1844,7 +1879,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 preTrackScale.setUpdateManName("计量洁净数据手动录入");
                 preTrackScaleMapper.updateByPrimaryKey(preTrackScale);
                 //添加毛重一次计量数据
-                String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//                String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+                String actualFirstNo = PublicMethod.IdCreate(3);
                 BeanUtils.copyProperties(preTrackScale,mwcaf1);
                 mwcaf1.setActualFirstNo(actualFirstNo);
                 mwcaf1.setIsPreScale("1");
@@ -1858,7 +1894,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcaf1.setMeterMode("3");
                 meterWorkCarActualFirstMapper.insertSelective(mwcaf1);
                 //添加皮重一次计量数据
-                String dataNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//                String dataNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+                String dataNo = PublicMethod.IdCreate(3);
                 BeanUtils.copyProperties(preTrackScale, mwcaf2,predictionNo);
                 mwcaf2.setActualFirstNo(dataNo);
                 mwcaf2.setIsPreScale("1");
@@ -1872,7 +1909,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcaf2.setMeterMode("3");
                 meterWorkCarActualFirstMapper.insertSelective(mwcaf2);
                 //添加净重重一次计量数据
-                String ActualNo = sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(afl);
+//                String ActualNo = sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(afl);
+                String ActualNo = PublicMethod.IdCreate(3);
                 BeanUtils.copyProperties(preTrackScale, model);
                 model.setActualNo(ActualNo);
                 model.setIsPreScale("1");
@@ -1922,7 +1960,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             String userName = payload.getUserName();*/
 
             //毛重
-            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+            String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf1.setActualFirstNo(actualFirstNo);
             mwcaf1.setCarNo(model.getCarNo());
             mwcaf1.setMeterWeight(model.getGrossWeight());
@@ -1939,7 +1978,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwcaf1.setIsPreScale("0");
             meterWorkCarActualFirstMapper.insertSelective(mwcaf1);
             //皮重
-            String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+            String actualSecondNo = PublicMethod.IdCreate(3);
             mwcaf2.setActualFirstNo(actualSecondNo);
             mwcaf2.setCarNo(model.getCarNo());
             mwcaf2.setMeterWeight(model.getTareWeight());
@@ -1985,8 +2025,10 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAdd(actualFirstNo, actualSecondNo);
                 BeanUtils.copyProperties(mwca1, actualRow);
             }
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow.setActualNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            actualRow.setActualNo(no);
             actualRow.setNetTime(model.getNetTime());
             actualRow.setNetMode(DbConstants.TYPE);
             actualRow.setNote("手动录入");

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -20,6 +20,7 @@ import com.steerinfo.meterwork.meterworkcaractualfirst.service.IMeterWorkCarActu
 import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
+import com.steerinfo.util.PublicMethod;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -191,8 +192,11 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            model.setActualFirstNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            model.setActualFirstNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            model.setActualFirstNo(no);
+
             model.setValueFlag("1");
             model.setCreateTime(new Date());
             String userId = null;

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -55,10 +55,7 @@ import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayAct
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
-import com.steerinfo.util.AESUtil;
-import com.steerinfo.util.FieldsCollector;
-import com.steerinfo.util.HttpRequest;
-import com.steerinfo.util.StringUtils;
+import com.steerinfo.util.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -173,8 +170,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             ckeck1(model);
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            model.setActualFirstNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            model.setActualFirstNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            model.setActualFirstNo(no);
 
             if(StringUtils.isNotEmpty(model.getPredictionNo())){
                 PreTrackScale pre = new PreTrackScale();
@@ -253,8 +252,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            model.setActualFirstNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            model.setActualFirstNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            model.setActualFirstNo(no);
             model.setValueFlag("1");
             model.setCreateTime(new Date());
             String userId = "";
@@ -1044,8 +1045,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //1、存储一次计量信息
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(oci.getCreateTime());
-        String no = meterWorkCarActualFirstMapper.getNewID(afl);
-        oci.setActualFirstNo(formatter.format(new Date()) + no);
+//        String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//        oci.setActualFirstNo(formatter.format(new Date()) + no);
+
+        String no = PublicMethod.IdCreate(3);
+        oci.setActualFirstNo(no);
         oci.setValueFlag("1");
         /*//
         if(oci.getWeightType().equals("0")){
@@ -1108,8 +1112,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //1、存储当前计量的数据
             SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
             String afl = formatter.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            secondDb.setActualFirstNo(no);
+
             secondDb.setValueFlag("2");//洁净
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
@@ -1160,8 +1168,13 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 //                }
 //            }
 
-            String no1 = meterWorkCarActualMapper.getNewID(afl);
-            netDb.setActualNo(afl + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(afl);
+//            netDb.setActualNo(afl + no1);
+
+
+            String no1 = PublicMethod.IdCreate(3);
+            netDb.setActualNo(no1);
+
             if (netDb != null && netDb.getNetWeight() != null) {
                 //2021年3月7日 净重保留两位小数；
                 BigDecimal net;
@@ -1189,8 +1202,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
                 //补充数据
                 String afl1 = formatter.format(new Date());
-                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-                imTare.setActualFirstNo(afl1 + imTareNO);
+//                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+//                imTare.setActualFirstNo(afl1 + imTareNO);
+
+                String imTareNO = PublicMethod.IdCreate(3);
+                imTare.setActualFirstNo(no);
+
                 imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
                 imTare.setMeterTypeName(secondDb.getMeterTypeName());
                 imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
@@ -1311,8 +1328,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //1、存储当前计量的数据
             SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
             String afl = formatter.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            secondDb.setActualFirstNo(no);
+
             secondDb.setValueFlag("2");//洁净
             secondDb.setUpdateManNo("system");
             secondDb.setUpdateManName("混装洁净更新");
@@ -1323,8 +1344,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //1、存储当前计量的数据
             SimpleDateFormat formatterHZ = new SimpleDateFormat("yyyyMMdd");
             String aflHZ = formatterHZ.format(new Date());
-            String noHZ = meterWorkCarActualFirstMapper.getNewID(aflHZ);
-            once.setActualFirstNo(formatter.format(new Date()) + noHZ);
+//            String noHZ = meterWorkCarActualFirstMapper.getNewID(aflHZ);
+//            once.setActualFirstNo(formatter.format(new Date()) + noHZ);
+
+            String noHZ = PublicMethod.IdCreate(3);
+            once.setActualFirstNo(noHZ);
             once.setValueFlag("2");//洁净
             once.setUpdateManNo("system");
             once.setUpdateManName("混装洁净更新");
@@ -1332,8 +1356,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             once.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
             meterWorkCarActualFirstMapper.insertSelective(once);
 
-            String no1 = meterWorkCarActualMapper.getNewID(afl);
-            netDb.setActualNo(afl + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(afl);
+//            netDb.setActualNo(afl + no1);
+
+            String no1 = PublicMethod.IdCreate(3);
+            secondDb.setActualFirstNo(no1);
+
             netDb.setActualFirst2No(formatter.format(new Date()) + no);
             netDb.setActualFirst1No(formatter.format(new Date()) + noHZ);
             if (netDb != null && netDb.getNetWeight() != null) {
@@ -1444,8 +1472,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //1、存储一次计量信息
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(oci.getCreateTime());
-        String no = meterWorkCarActualFirstMapper.getNewID(afl);
-        oci.setActualFirstNo(afl + no);
+//        String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//        oci.setActualFirstNo(afl + no);
+
+        String no = PublicMethod.IdCreate(3);
+        oci.setActualFirstNo(no);
+
         oci.setValueFlag("1");
         //计算卸货截止时间
         Map<String, Object> obj = new HashMap<>();
@@ -1659,8 +1691,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             } else {
                 MeterWorkCarActualFirst mwaf = new MeterWorkCarActualFirst();
                 String two = formatter.format(secondDb.getCreateTime());
-                String twoNo = meterWorkCarActualFirstMapper.getNewID(two);
-                mwaf.setActualFirstNo(two + twoNo);
+//                String twoNo = meterWorkCarActualFirstMapper.getNewID(two);
+//                mwaf.setActualFirstNo(two + twoNo);
+
+                String twoNo = PublicMethod.IdCreate(3);
+                mwaf.setActualFirstNo(twoNo);
+
                 //非互锁式 value_flag：1未使用 2已使用状态
                 PreTrackScale ptsQ = new PreTrackScale();
                 ptsQ.setValueFlag("1");
@@ -1890,8 +1926,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
         //5、存储当前计量的数据
         String afl = formatter.format(secondDb.getCreateTime());
-        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
-        secondDb.setActualFirstNo(afl + iActualNo);
+//        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
+//        secondDb.setActualFirstNo(afl + iActualNo);
+
+        String iActualNo = PublicMethod.IdCreate(3);
+        secondDb.setActualFirstNo(iActualNo);
+
         meterWorkCarActualFirstMapper.insertSelective(secondDb);
         if (!secondDb.getPredictionNo().equals(netDb.getPredictionNo())) {
             //杨秀东2021-3-22；一车联运检化验处理;
@@ -1902,9 +1942,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
 
         //6、存储洁净数据
-        String afl1 = formatter.format(netDb.getNetTime());
-        String no = meterWorkCarActualMapper.getNewID(afl1);
-        netDb.setActualNo(afl + no); //注意：此处生成的编号是下一次的编号；如果是一车联运不能直接返回给客户端这个编号
+//        String afl1 = formatter.format(netDb.getNetTime());
+//        String no = meterWorkCarActualMapper.getNewID(afl1);
+//        netDb.setActualNo(afl + no); //注意：此处生成的编号是下一次的编号；如果是一车联运不能直接返回给客户端这个编号
+
+        String no = PublicMethod.IdCreate(3);
+        netDb.setActualNo(no);
 
         if (secondDb.getMeterWeight().equals(netDb.getTareWeight())) {
             //二次指哪个了如果跟皮重一样
@@ -2141,8 +2184,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //1、新增一次数据
         //存储当前计量的数据
         String afl = formatter.format(oci.getCreateTime());
-        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
-        oci.setActualFirstNo(afl + iActualNo);
+//        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
+//        oci.setActualFirstNo(afl + iActualNo);
+
+        String iActualNo = PublicMethod.IdCreate(3);
+        oci.setActualFirstNo(iActualNo);
+
         oci.setValueFlag("2");
         meterWorkCarActualFirstMapper.insertSelective(oci);
         //2、补充期限皮重的数据
@@ -2150,8 +2197,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
         //补充数据
         String afl1 = formatter.format(new Date());
-        String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-        imTare.setActualFirstNo(afl1 + imTareNO);
+//        String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+//        imTare.setActualFirstNo(afl1 + imTareNO);
+
+        String imTareNO = PublicMethod.IdCreate(3);
+        imTare.setActualFirstNo(imTareNO);
+
         imTare.setMeterTypeNo(oci.getMeterTypeNo());
         imTare.setMeterTypeName(oci.getMeterTypeName());
         imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
@@ -2166,9 +2217,13 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         meterWorkCarActualFirstMapper.insertSelective(imTare);
 
         //3、新增洁净数据
-        String afl2 = formatter.format(netDb.getNetTime());
-        String no = meterWorkCarActualMapper.getNewID(afl2);
-        netDb.setActualNo(afl + no);
+//        String afl2 = formatter.format(netDb.getNetTime());
+//        String no = meterWorkCarActualMapper.getNewID(afl2);
+//        netDb.setActualNo(afl + no);
+
+        String no = PublicMethod.IdCreate(3);
+        netDb.setActualNo(no);
+
         netDb.setActualFirst2No(imTare.getActualFirstNo());
         netDb.setActualFirst1No(oci.getActualFirstNo());
         if (netDb != null && netDb.getNetWeight() != null) {
@@ -2384,8 +2439,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //1、存储一次计量信息
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(oci.getCreateTime());
-        String no = meterWorkCarActualFirstMapper.getNewID(afl);
-        oci.setActualFirstNo(afl + no);
+//        String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//        oci.setActualFirstNo(afl + no);
+
+        String no = PublicMethod.IdCreate(3);
+        oci.setActualFirstNo(no);
+
         oci.setValueFlag("1");
         meterWorkCarActualFirstMapper.insertSelective(oci);
 
@@ -2448,8 +2507,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
         //5、存储当前计量的数据
         String afl = formatter.format(secondDb.getCreateTime());
-        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
-        secondDb.setActualFirstNo(afl + iActualNo);
+//        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
+//        secondDb.setActualFirstNo(afl + iActualNo);
+
+        String iActualNo = PublicMethod.IdCreate(3);
+        secondDb.setActualFirstNo(iActualNo);
+
         meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
 
@@ -2457,9 +2520,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
 
         //6、存储洁净数据
-        String afl1 = formatter.format(netDb.getNetTime());
-        String no = meterWorkCarActualMapper.getNewID(afl1);
-        netDb.setActualNo(afl + no); //注意：此处生成的编号是下一次的编号；如果是一车联运不能直接返回给客户端这个编号
+//        String afl1 = formatter.format(netDb.getNetTime());
+//        String no = meterWorkCarActualMapper.getNewID(afl1);
+//        netDb.setActualNo(afl + no); //注意：此处生成的编号是下一次的编号；如果是一车联运不能直接返回给客户端这个编号
+
+        String no = PublicMethod.IdCreate(3);
+        netDb.setActualNo(no);
 
         if (secondDb.getMeterWeight().equals(netDb.getTareWeight())) {
             //二次指哪个了如果跟皮重一样
@@ -2539,8 +2605,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //2、存储三条一次计量数据
         // 第一条洁净数据的二次重量数据
         String afl = formatter.format(secondDb.getCreateTime());
-        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
-        secondDb.setActualFirstNo(afl + iActualNo);
+//        String iActualNo = meterWorkCarActualFirstMapper.getNewID(afl);
+//        secondDb.setActualFirstNo(afl + iActualNo);
+
+        String iActualNo = PublicMethod.IdCreate(3);
+        secondDb.setActualFirstNo(iActualNo);
         if (netDb1.getActualFirst1No() == null || "".equals(netDb1.getActualFirst1No())) {
             netDb1.setActualFirst1No(secondDb.getActualFirstNo());
         } else {
@@ -2556,9 +2625,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
 
         //6、存储洁净数据
-        String afl1 = formatter.format(netDb1.getNetTime());
-        String no = meterWorkCarActualMapper.getNewID(afl1);
-        netDb1.setActualNo(afl + no); //注意：此处生成的编号是下一次的编号；如果是一车联运不能直接返回给客户端这个编号
+//        String afl1 = formatter.format(netDb1.getNetTime());
+//        String no = meterWorkCarActualMapper.getNewID(afl1);
+//        netDb1.setActualNo(afl + no); //注意：此处生成的编号是下一次的编号；如果是一车联运不能直接返回给客户端这个编号
+
+        String no = PublicMethod.IdCreate(3);
+        netDb1.setActualNo(no);
 
         if (secondDb.getMeterWeight().equals(netDb1.getTareWeight())) {
             //二次指哪个了如果跟皮重一样
@@ -2626,8 +2698,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //1、存储一次计量信息
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(oci.getCreateTime());
-        String no = meterWorkCarActualFirstMapper.getNewID(afl);
-        oci.setActualFirstNo(afl + no);
+//        String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//        oci.setActualFirstNo(afl + no);
+        String no = PublicMethod.IdCreate(3);
+        oci.setActualFirstNo(no);
         oci.setValueFlag("1");
         meterWorkCarActualFirstMapper.insertSelective(oci);
 
@@ -2678,14 +2752,21 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //1、存储一次计量信息
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(oci.getCreateTime());
-        String no = meterWorkCarActualFirstMapper.getNewID(afl);
-        oci.setActualFirstNo(afl + no);
+//        String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//        oci.setActualFirstNo(afl + no);
+
+        String no = PublicMethod.IdCreate(3);
+        oci.setActualFirstNo(no);
+
         oci.setValueFlag("2");
         meterWorkCarActualFirstMapper.insertSelective(oci);
 
         netDB.setActualFirst2No(oci.getActualFirstNo());
-        String no1 = meterWorkCarActualMapper.getNewID(afl);
-        netDB.setActualNo(afl + no1);
+//        String no1 = meterWorkCarActualMapper.getNewID(afl);
+//        netDB.setActualNo(afl + no1);
+
+        String no1 = PublicMethod.IdCreate(3);
+        netDB.setActualNo(no1);
 
         //2、将原有的一次数据洁净
         MeterWorkCarActualFirst firstDb=new MeterWorkCarActualFirst();
@@ -2743,8 +2824,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String afl = sdf.format(new Date());
 
             //存储当前计量的数据
-            String firstNo01 = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String firstNo01 = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            first02.setActualFirstNo(firstNo01);
+            String firstNo01 = PublicMethod.IdCreate(3);
             first02.setActualFirstNo(firstNo01);
+
             meterWorkCarActualFirstMapper.insertSelective(first02);
 
             MeterWorkCarActual actualRow = new MeterWorkCarActual();
@@ -2795,8 +2879,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(first02.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(mwca1, actualRow);
                 //保存洁净
-                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                actualRow.setActualNo(sdf.format(new Date()) + no);
+//                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//                actualRow.setActualNo(sdf.format(new Date()) + no);
+
+                String no = PublicMethod.IdCreate(3);
+                actualRow.setActualNo(no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
                 actualRow.setNote("混装匹配洁净");
@@ -2860,8 +2947,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 BeanUtils.copyProperties(mwca1, actualRow);
 
                 //保存洁净
-                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                actualRow.setActualNo(sdf.format(new Date()) + no);
+//                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//                actualRow.setActualNo(sdf.format(new Date()) + no);
+
+                String no = PublicMethod.IdCreate(3);
+                actualRow.setActualNo(no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
                 actualRow.setNote("混卸匹配洁净");
@@ -2886,8 +2976,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             //存储当前计量的数据
             if(first03 != null) {
-                String fristNo03 = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//                String fristNo03 = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//                first03.setActualFirstNo(fristNo03);
+                String fristNo03 = PublicMethod.IdCreate(3);
                 first03.setActualFirstNo(fristNo03);
+
                 first03.setIsPreScale("0");
                 meterWorkCarActualFirstMapper.insertSelective(first03);
             }
@@ -2923,8 +3016,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             String afl = sdf.format(new Date());
 
             //存储当前计量的数据
-            String firstNo01 = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String firstNo01 = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            one.setActualFirstNo(firstNo01);
+
+            String firstNo01 = PublicMethod.IdCreate(3);
             one.setActualFirstNo(firstNo01);
+
             meterWorkCarActualFirstMapper.insertSelective(one);
 
             MeterWorkCarActualFirst model01 = new MeterWorkCarActualFirst();
@@ -3002,8 +3099,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model02.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model02);
             //添加第一次毛重数据库
-            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            model03.setActualFirstNo(actualFirstNo);
+            String actualFirstNo = PublicMethod.IdCreate(3);
             model03.setActualFirstNo(actualFirstNo);
+
             model03.setValueFlag(DbConstants.NET);
             model03.setUpdateManName("system");
             model03.setUpdateManName("双委托洁净更新");
@@ -3015,8 +3115,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             meterWorkCarActualFirstMapper.insertSelective(model03);
             //添加第二次皮重数据库
-            String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            model04.setActualFirstNo(actualSecondNo);
+            String actualSecondNo = PublicMethod.IdCreate(3);
             model04.setActualFirstNo(actualSecondNo);
+
             model04.setValueFlag(DbConstants.NET);
             model04.setUpdateManName("system");
             model04.setUpdateManName("双委托洁净更新");
@@ -3035,8 +3138,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             BeanUtils.copyProperties(mwca2, actualRow2);
 
             //添加结净数据
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow1.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow1.setActualNo(sdf.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            actualRow1.setActualNo(no);
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
             actualRow1.setNote("双委托匹配洁净");
@@ -3059,8 +3165,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
-            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+
+            String no1 = PublicMethod.IdCreate(3);
+            actualRow2.setActualNo(no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
             actualRow2.setNote("双委托匹配洁净");
@@ -3216,8 +3325,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //添加第二次皮重数据
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
-            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            mwcaf3.setActualFirstNo(actualFirstNo);
+            String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf3.setActualFirstNo(actualFirstNo);
+
+
             mwcaf3.setValueFlag(DbConstants.NET);
             mwcaf3.setUpdateManName("system");
             mwcaf3.setUpdateManName("混装洁净更新");
@@ -3244,8 +3357,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             BeanUtils.copyProperties(mwca2,actualRow2);
 
             //添加结净数据
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow1.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow1.setActualNo(sdf.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            actualRow1.setActualNo(no);
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
             actualRow1.setNote("混装匹配结净");
@@ -3261,8 +3377,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setNetWeight(mwcaf2.getMeterWeight().subtract(mwcaf1.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
-            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+
+            String no1 = PublicMethod.IdCreate(3);
+            actualRow2.setActualNo(no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
             actualRow2.setNote("混装匹配结净");
@@ -3396,8 +3515,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //添加第二次毛重数据
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
-            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            mwcaf3.setActualFirstNo(actualFirstNo);
+            String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf3.setActualFirstNo(actualFirstNo);
+
             mwcaf3.setValueFlag(DbConstants.NET);
             mwcaf3.setUpdateManNo("system");
             mwcaf3.setUpdateManName("混卸洁净更新");
@@ -3424,8 +3546,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             BeanUtils.copyProperties(mwca2,actualRow2);
 
             //添加结净数据
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow1.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow1.setActualNo(sdf.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            actualRow1.setActualNo(no);
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
             actualRow1.setNote("混卸匹配结净");
@@ -3441,8 +3566,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
-            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+
+            String no1 = PublicMethod.IdCreate(3);
+            actualRow2.setActualNo(no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
             actualRow2.setNote("混卸匹配结净");
@@ -3591,8 +3719,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //添加第一次毛重数据库
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
-            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+//            mwcaf03.setActualFirstNo(actualFirstNo);
+            String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf03.setActualFirstNo(actualFirstNo);
+
             mwcaf03.setValueFlag(DbConstants.NET);
             mwcaf03.setUpdateManName("system");
             mwcaf03.setUpdateManName("双委托洁净更新");
@@ -3605,8 +3736,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //添加第二次皮重数据库
             SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
             String afl01 = sdf01.format(new Date());
-            String actualSecondNo = sdf01.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl01);
+//            String actualSecondNo = sdf01.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl01);
+//            mwcaf04.setActualFirstNo(actualSecondNo);
+            String actualSecondNo = PublicMethod.IdCreate(3);
             mwcaf04.setActualFirstNo(actualSecondNo);
+
             mwcaf04.setValueFlag(DbConstants.NET);
             mwcaf04.setUpdateManName("system");
             mwcaf04.setUpdateManName("双委托洁净更新");
@@ -3624,8 +3758,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             BeanUtils.copyProperties(mwca2,actualRow2);
 
             //添加结净数据
-            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow1.setActualNo(sdf.format(new Date()) + no);
+//            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow1.setActualNo(sdf.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            actualRow1.setActualNo(no);
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
             actualRow1.setNote("双委托匹配洁净");
@@ -3639,8 +3775,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
-            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//            actualRow2.setActualNo(sdf.format(new Date()) + no1);
+            String no1 = PublicMethod.IdCreate(3);
+            actualRow2.setActualNo(no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
             actualRow2.setNote("双委托匹配洁净");
@@ -3686,13 +3824,18 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //1、存储当前计量的数据
             SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
             String afl = formatter.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            secondDb.setActualFirstNo(no);
+
             secondDb.setValueFlag("2");//洁净
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
-            String no1 = meterWorkCarActualMapper.getNewID(afl);
-            netDb.setActualNo(afl + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(afl);
+//            netDb.setActualNo(afl + no1);
+            String no1 = PublicMethod.IdCreate(3);
+            netDb.setActualNo(no1);
             if (netDb != null && netDb.getNetWeight() != null) {
                 //2021年3月7日 净重保留两位小数；
                 BigDecimal net;
@@ -3719,8 +3862,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
             //补充数据
             String afl1 = formatter.format(new Date());
-            String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-            String actualNo = afl1 + imTareNO;
+//            String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+//            String actualNo = afl1 + imTareNO;
+            String actualNo = PublicMethod.IdCreate(3);
+            imTare.setActualFirstNo(no);
             imTare.setActualFirstNo(actualNo);
             imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
             imTare.setMeterTypeName(secondDb.getMeterTypeName());
@@ -3745,7 +3890,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             //皮重数据匹配委托
             MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo, netDb.getPredictionNo());
-            String nomwcaf2 = meterWorkCarActualFirstMapper.getNewID(afl);
+//            String nomwcaf2 = meterWorkCarActualFirstMapper.getNewID(afl);
+            String nomwcaf2 = PublicMethod.IdCreate(3);
             mwcaf2.setIsPreScale("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(mwcaf2);
 
@@ -3823,8 +3969,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     }
                 }
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
-                String afl = formatter.format(new Date());
-                String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//                String afl = formatter.format(new Date());
+//                String no = meterWorkCarActualFirstMapper.getNewID(afl);
+                String no = PublicMethod.IdCreate(3);
                 if(StringUtils.isEmpty(model.getActualFirstNo())){
                     model.setActualFirstNo(formatter.format(new Date()) + no);
                 }
@@ -3905,8 +4052,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 //存储当前皮重的数据
                 SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
                 String afl = formatter.format(new Date());
-                String no = meterWorkCarActualFirstMapper.getNewID(afl);
-                actualFirst.setActualFirstNo(formatter.format(new Date()) + no);
+//                String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//                actualFirst.setActualFirstNo(formatter.format(new Date()) + no);
+                String no = PublicMethod.IdCreate(3);
+                actualFirst.setActualFirstNo(no);
+
                 actualFirst.setValueFlag("2");//未洁净
                 int i = meterWorkCarActualFirstMapper.insertSelective(actualFirst);
 
@@ -3926,8 +4076,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(model.getActualFirstNo(), actualFirst.getActualFirstNo(), model.getPredictionNo());
                 BeanUtils.copyProperties(mwca1, meterWorkCarActual);
 
-                String noActual = meterWorkCarActualFirstMapper.getNewID(afl);
-                meterWorkCarActual.setActualNo(formatter.format(new Date()) + noActual);
+//                String noActual = meterWorkCarActualFirstMapper.getNewID(afl);
+//                meterWorkCarActual.setActualNo(formatter.format(new Date()) + noActual);
+                String noActual = PublicMethod.IdCreate(3);
+                meterWorkCarActual.setActualNo(noActual);
                 meterWorkCarActual.setNetTime(new Date());
                 meterWorkCarActual.setNetMode(DbConstants.TYPE);
                 meterWorkCarActual.setNote("计量数据结净");
@@ -3981,8 +4133,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //1、存储当前计量的数据
             SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
             String afl = formatter.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+            String no = PublicMethod.IdCreate(3);
+            secondDb.setActualFirstNo(no);
             secondDb.setValueFlag("2");//洁净
             meterWorkCarActualFirstMapper.insertSelective(secondDb);
 
@@ -4016,8 +4170,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
             }
 
-            String no1 = meterWorkCarActualMapper.getNewID(afl);
-            netDb.setActualNo(afl + no1);
+//            String no1 = meterWorkCarActualMapper.getNewID(afl);
+//            netDb.setActualNo(afl + no1);
+            String no1 = PublicMethod.IdCreate(3);
+            netDb.setActualNo(no1);
             if (netDb != null && netDb.getNetWeight() != null) {
                 //2021年3月7日 净重保留两位小数；
                 BigDecimal net;
@@ -4045,8 +4201,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
                 //补充数据
                 String afl1 = formatter.format(new Date());
-                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-                imTare.setActualFirstNo(afl1 + imTareNO);
+//                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+//                imTare.setActualFirstNo(afl1 + imTareNO);
+                String imTareNO = PublicMethod.IdCreate(3);
+                imTare.setActualFirstNo(no);
                 imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
                 imTare.setMeterTypeName(secondDb.getMeterTypeName());
                 imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
@@ -4132,16 +4290,20 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 if(mg == null){
                     SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
                     String afl1 = formatter.format(new Date());
-                    String no1 = meterWorkCarActualFirstMapper.getNewID(afl1);
-                    grossModel.setActualFirstNo(formatter.format(new Date()) + no1);
+//                    String no1 = meterWorkCarActualFirstMapper.getNewID(afl1);
+//                    grossModel.setActualFirstNo(formatter.format(new Date()) + no1);
+                    String no1 = PublicMethod.IdCreate(3);
+                    grossModel.setActualFirstNo(no1);
                     grossModel.setValueFlag("2");//洁净
                     meterWorkCarActualFirstMapper.insertSelective(grossModel);
                 }
                 else {
                     SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
                     String afl1 = formatter.format(new Date());
-                    String no1 = meterWorkCarActualFirstMapper.getNewID(afl1);
-                    tareModel.setActualFirstNo(formatter.format(new Date()) + no1);
+//                    String no1 = meterWorkCarActualFirstMapper.getNewID(afl1);
+//                    tareModel.setActualFirstNo(formatter.format(new Date()) + no1);
+                    String no1 = PublicMethod.IdCreate(3);
+                    tareModel.setActualFirstNo(no1);
                     tareModel.setValueFlag("2");//洁净
                     meterWorkCarActualFirstMapper.insertSelective(tareModel);
                 }
@@ -4181,10 +4343,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(mwca1, model);
                 //更新洁净数据状态
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-                String afl = sdf.format(new Date());
-                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                model.setActualNo(sdf.format(new Date()) + no);
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//                String afl = sdf.format(new Date());
+//                String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//                model.setActualNo(sdf.format(new Date()) + no);
+                String no = PublicMethod.IdCreate(3);
+                model.setActualNo(no);
                 model.setNetTime(new Date());
                 model.setNetMode(DbConstants.TYPE);
                 model.setNote("期限皮匹配洁净");
@@ -4261,8 +4425,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             SimpleDateFormat formatter1 = new SimpleDateFormat("yyyyMMdd");
             //补充数据
             String afl1 = formatter1.format(new Date());
-            String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-            String actualNo = afl1 + imTareNO;
+//            String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+//            String actualNo = afl1 + imTareNO;
+            String actualNo = PublicMethod.IdCreate(3);
             imTare.setActualFirstNo(actualNo);
             imTare.setMeterTypeNo(tareModel.getMeterTypeNo());
             imTare.setMeterTypeName(tareModel.getMeterTypeName());
@@ -4350,8 +4515,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //将皮重数据新增
             SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
             String afl = formatter.format(new Date());
-            String no = meterWorkCarActualFirstMapper.getNewID(afl);
-            tare.setActualFirstNo(formatter.format(new Date()) + no);
+//            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+//            tare.setActualFirstNo(formatter.format(new Date()) + no);
+
+            String no = PublicMethod.IdCreate(3);
+            tare.setActualFirstNo(no);
+
             tare.setValueFlag("0");//洁净
             tare.setWeightType("1");
             meterWorkCarActualFirstMapper.insertSelective(tare);
@@ -4410,8 +4579,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 SimpleDateFormat formatter1 = new SimpleDateFormat("yyyyMMdd");
                 //补充数据
                 String afl1 = formatter1.format(new Date());
-                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-                String actualNo = afl1 + imTareNO;
+//                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+//                String actualNo = afl1 + imTareNO;
+                String actualNo = PublicMethod.IdCreate(3);
+
                 imTare.setActualFirstNo(actualNo);
                 imTare.setMeterTypeNo(tare.getMeterTypeNo());
                 imTare.setMeterTypeName(tare.getMeterTypeName());
@@ -4434,10 +4605,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 //将委托信息插入洁净数据
                 MeterWorkCarActual mwca = meterWorkCarActualMapper.manualAddPre(model.getActualFirstNo(), imTare.getActualFirstNo(), model.getPredictionNo());
                 //更新洁净数据状态
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-                String aflActual = sdf.format(new Date());
-                String noActual = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                mwca.setActualNo(aflActual + noActual);
+//                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//                String aflActual = sdf.format(new Date());
+//                String noActual = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
+//                mwca.setActualNo(aflActual + noActual);
+                String noActual = PublicMethod.IdCreate(3);
+                mwca.setActualNo(noActual);
                 mwca.setNetTime(new Date());
                 mwca.setNetMode(DbConstants.TYPE);
                 mwca.setNote("期限皮匹配洁净");

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/service/impl/MeterWorkScheduledHelpServiceImpl.java

@@ -10,6 +10,7 @@ import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkscheduledhelp.mapper.MeterWorkScheduledHelpMapper;
 import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
 import com.steerinfo.meterwork.meterworkscheduledhelp.service.IMeterWorkScheduledHelpService;
+import com.steerinfo.util.PublicMethod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mail.MailParseException;
 import org.springframework.stereotype.Service;
@@ -127,10 +128,13 @@ public class MeterWorkScheduledHelpServiceImpl extends BaseServiceImpl<MeterWork
         try{
             RESTfulResult rm = new RESTfulResult();
             rm.setCode("200");
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            String afl = sdf.format(new Date());
-            String no = meterWorkScheduledHelpMapper.getNewID(afl);
-            model.setHelpId(sdf.format(new Date()) + no);
+//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+//            String afl = sdf.format(new Date());
+//            String no = meterWorkScheduledHelpMapper.getNewID(afl);
+//            model.setHelpId(sdf.format(new Date()) + no);
+
+            String no =  PublicMethod.IdCreate(3);
+            model.setHelpId(no);
             model.setCreateTime(new Date());
             model.setValueFlag("0");
             meterWorkScheduledHelpMapper.insertSelective(model);