修改

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

@@ -390,7 +390,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 BeanUtils.copyProperties(first2, mwcaf2);
 
                 mwcaf1.setValueFlag(DbConstants.NET);
-                mwcaf1.setUpdateManName(userId);
+                mwcaf1.setUpdateManNo(userId);
                 mwcaf1.setUpdateManName(userName);
                 mwcaf1.setUpdateTime(new Date());
                 mwcaf1.setNote("网页手动计量结净");
@@ -401,7 +401,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                 // 皮重数据处理
                 mwcaf2.setValueFlag(DbConstants.NET);
-                mwcaf2.setUpdateManName(userId);
+                mwcaf2.setUpdateManNo(userId);
                 mwcaf2.setUpdateManName(userName);
                 mwcaf2.setUpdateTime(new Date());
                 mwcaf2.setNote("网页手动计量结净");
@@ -489,7 +489,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         BeanUtils.copyProperties(first2, mwcaf2);
 
                         mwcaf1.setValueFlag(DbConstants.NET);
-                        mwcaf1.setUpdateManName(userId);
+                        mwcaf1.setUpdateManNo(userId);
                         mwcaf1.setUpdateManName(userName);
                         mwcaf1.setUpdateTime(new Date());
                         mwcaf1.setNote("网页手动计量结净");
@@ -500,7 +500,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                         // 皮重数据处理
                         mwcaf2.setValueFlag(DbConstants.NET);
-                        mwcaf2.setUpdateManName(userId);
+                        mwcaf2.setUpdateManNo(userId);
                         mwcaf2.setUpdateManName(userName);
                         mwcaf2.setUpdateTime(new Date());
                         mwcaf2.setNote("网页手动计量结净");
@@ -580,7 +580,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(dataNo);
 
                 first1.setValueFlag(DbConstants.NET);
-                mwcaf1.setUpdateManName(userId);
+                mwcaf1.setUpdateManNo(userId);
                 mwcaf1.setUpdateManName(userName);
                 mwcaf1.setUpdateTime(new Date());
                 mwcaf1.setNote("网页手动计量结净");
@@ -589,7 +589,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
                 // 皮重数据处理
                 first2.setValueFlag(DbConstants.NET);
-                first2.setUpdateManName(userId);
+                first2.setUpdateManNo(userId);
                 first2.setUpdateManName(userName);
                 first2.setUpdateTime(new Date());
                 first2.setNote("网页手动计量结净");
@@ -817,7 +817,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 // 清空毛重数据中的委托信息
                 mwcaf1.setValueFlag(DbConstants.VALID);
                 mwcaf1.setNote(model.getNote());
-                mwcaf1.setUpdateManName("system");
+                mwcaf1.setUpdateManNo("system");
                 mwcaf1.setUpdateManName("二次计量解除更新");
                 mwcaf1.setUpdateTime(new Date());
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf1);
@@ -830,12 +830,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 if (mwcaf2 != null) {
                     if ("2".equals(mwcaf2.getWeightType())) {
                         mwcaf2.setValueFlag(DbConstants.INVALID); //期限皮重置为作废
-                        mwcaf2.setUpdateManName("system");
+                        mwcaf2.setUpdateManNo("system");
                         mwcaf2.setUpdateManName("二次计量解除作废");
                         mwcaf2.setUpdateTime(new Date());
                     } else {
                         mwcaf2.setValueFlag(DbConstants.VALID);
-                        mwcaf2.setUpdateManName("system");
+                        mwcaf2.setUpdateManNo("system");
                         mwcaf2.setUpdateManName("二次计量解除更新");
                         mwcaf2.setNote(model.getNote());
                         mwcaf2.setUpdateTime(new Date());
@@ -1000,7 +1000,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             userName = "admins";
         }
         model.setValueFlag("0");
-        model.setUpdateManName(userId);
+        model.setUpdateManNo(userId);
         model.setUpdateManName(userName);
         model.setUpdateTime(new Date());
         model.setIsPreScale("0");

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/service/impl/MeterWorkCarActualBakServiceImpl.java

@@ -346,7 +346,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 BeanUtils.copyProperties(first2, mwcaf2);
 
                 mwcaf1.setValueFlag(DbConstants.NET);
-                mwcaf1.setUpdateManName("system");
+                mwcaf1.setUpdateManNo("system");
                 mwcaf1.setUpdateManName("二次计量结净更新");
                 mwcaf1.setUpdateTime(new Date());
                 mwcaf1.setIsPreScale("1");
@@ -356,7 +356,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                 // 皮重数据处理
                 mwcaf2.setValueFlag(DbConstants.NET);
-                mwcaf2.setUpdateManName("system");
+                mwcaf2.setUpdateManNo("system");
                 mwcaf2.setUpdateManName("二次计量结净更新");
                 mwcaf2.setUpdateTime(new Date());
                 mwcaf2.setPredictionNo(predictionNo);
@@ -426,7 +426,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                         BeanUtils.copyProperties(first2, mwcaf2);
 
                         mwcaf1.setValueFlag(DbConstants.NET);
-                        mwcaf1.setUpdateManName("system");
+                        mwcaf1.setUpdateManNo("system");
                         mwcaf1.setUpdateManName("二次计量结净更新");
                         mwcaf1.setUpdateTime(new Date());
                         mwcaf1.setIsPreScale("1");
@@ -436,7 +436,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                         // 皮重数据处理
                         mwcaf2.setValueFlag(DbConstants.NET);
-                        mwcaf2.setUpdateManName("system");
+                        mwcaf2.setUpdateManNo("system");
                         mwcaf2.setUpdateManName("二次计量结净更新");
                         mwcaf2.setUpdateTime(new Date());
                         mwcaf2.setIsPreScale("1");
@@ -499,7 +499,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 MeterWorkCarActualFirstBak first2 = meterWorkCarActualFirstBakMapper.selectByPrimaryKey(dataNo);
 
                 first1.setValueFlag(DbConstants.NET);
-                first1.setUpdateManName("system");
+                first1.setUpdateManNo("system");
                 first1.setUpdateManName("二次计量结净更新");
                 first1.setUpdateTime(new Date());
                 first1.setIsPreScale("0");
@@ -507,7 +507,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
 
                 // 皮重数据处理
                 first2.setValueFlag(DbConstants.NET);
-                first2.setUpdateManName("system");
+                first2.setUpdateManNo("system");
                 first2.setUpdateManName("二次计量结净更新");
                 first2.setUpdateTime(new Date());
                 first2.setIsPreScale("0");
@@ -595,7 +595,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 MeterWorkCarActualFirstBak mwcafg = meterWorkCarActualFirstBakMapper.selectAndRemove(model.getActualFirst1No());
                 mwcafg.setValueFlag(DbConstants.VALID);
                 mwcafg.setNote(model.getNote());
-                mwcafg.setUpdateManName("system");
+                mwcafg.setUpdateManNo("system");
                 mwcafg.setUpdateManName("二次计量解除更新");
                 mwcafg.setUpdateTime(new Date());
                 mwcafg.setIsPreScale("0");
@@ -611,14 +611,14 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                     MeterWorkCarActualFirstBak mwcaft = meterWorkCarActualFirstBakMapper.selectAndRemove(mwcaf2.getActualFirstNo());
                     if ("2".equals(mwcaft.getWeightType())) {
                         mwcaft.setValueFlag(DbConstants.INVALID); //期限皮重置为作废
-                        mwcaft.setUpdateManName("system");
+                        mwcaft.setUpdateManNo("system");
                         mwcaft.setUpdateManName("二次计量解除作废");
                         mwcaft.setIsPreScale("0");
 //                        mwcaft.setDataSource("1");
                         mwcaft.setUpdateTime(new Date());
                     } else {
                         mwcaft.setValueFlag(DbConstants.VALID);
-                        mwcaft.setUpdateManName("system");
+                        mwcaft.setUpdateManNo("system");
                         mwcaft.setUpdateManName("二次计量解除更新");
                         mwcaft.setNote(model.getNote());
                         mwcaft.setIsPreScale("0");
@@ -677,7 +677,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 // 清空毛重数据中的委托信息
                 mwcaf1.setValueFlag(DbConstants.VALID);
                 mwcaf1.setNote(model.getNote());
-                mwcaf1.setUpdateManName("system");
+                mwcaf1.setUpdateManNo("system");
                 mwcaf1.setUpdateManName("二次计量解除更新");
                 mwcaf1.setUpdateTime(new Date());
                 meterWorkCarActualFirstBakMapper.updateByPrimaryKey(mwcaf1);
@@ -690,12 +690,12 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 if (mwcaf2 != null) {
                     if ("2".equals(mwcaf2.getWeightType())) {
                         mwcaf2.setValueFlag(DbConstants.INVALID); //期限皮重置为作废
-                        mwcaf2.setUpdateManName("system");
+                        mwcaf2.setUpdateManNo("system");
                         mwcaf2.setUpdateManName("二次计量解除作废");
                         mwcaf2.setUpdateTime(new Date());
                     } else {
                         mwcaf2.setValueFlag(DbConstants.VALID);
-                        mwcaf2.setUpdateManName("system");
+                        mwcaf2.setUpdateManNo("system");
                         mwcaf2.setUpdateManName("二次计量解除更新");
                         mwcaf2.setNote(model.getNote());
                         mwcaf2.setUpdateTime(new Date());
@@ -829,7 +829,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
             userName = "admins";
         }
         model.setValueFlag("0");
-        model.setUpdateManName(userId);
+        model.setUpdateManNo(userId);
         model.setUpdateManName(userName);
         model.setUpdateTime(new Date());
         model.setIsPreScale("0");
@@ -918,7 +918,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 }
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
-                    firstGross.setUpdateManName("system");
+                    firstGross.setUpdateManNo("system");
                     firstGross.setUpdateManName("结净废除更新");
                     firstGross.setNote(model.getNote());
                     firstGross.setUpdateTime(new Date());
@@ -928,7 +928,7 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 }
                 if(firstTare != null){
                     firstTare.setValueFlag(DbConstants.VALID);
-                    firstTare.setUpdateManName("system");
+                    firstTare.setUpdateManNo("system");
                     firstTare.setUpdateManName("结净废除更新");
                     firstTare.setNote(model.getNote());
                     firstTare.setUpdateTime(new Date());

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

@@ -3314,7 +3314,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混装结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -3324,7 +3324,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("混装结净更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -3399,7 +3399,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混卸结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -3409,7 +3409,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("混卸结净更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("1");
@@ -3596,7 +3596,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //更新一次数据
             //更新第一次毛重数据库
             model01.setValueFlag(DbConstants.NET);
-            model01.setUpdateManName("system");
+            model01.setUpdateManNo("system");
             model01.setUpdateManName("双委托结净更新");
             model01.setUpdateTime(new Date());
             model01.setWeightType("0");
@@ -3607,7 +3607,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             meterWorkCarActualFirstMapper.updateByPrimaryKey(model01);
             //更新第一次皮重数据库
             model02.setValueFlag(DbConstants.NET);
-            model02.setUpdateManName("system");
+            model02.setUpdateManNo("system");
             model02.setUpdateManName("双委托结净更新");
             model02.setUpdateTime(new Date());
             model02.setWeightType("1");
@@ -3623,7 +3623,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model03.setActualFirstNo(actualFirstNo);
 
             model03.setValueFlag(DbConstants.NET);
-            model03.setUpdateManName("system");
+            model03.setUpdateManNo("system");
             model03.setUpdateManName("双委托结净更新");
             model03.setWeightType("0");
             model03.setUpdateTime(new Date());
@@ -3639,7 +3639,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model04.setActualFirstNo(actualSecondNo);
 
             model04.setValueFlag(DbConstants.NET);
-            model04.setUpdateManName("system");
+            model04.setUpdateManNo("system");
             model04.setUpdateManName("双委托结净更新");
             model04.setWeightType("1");
             model04.setUpdateTime(new Date());
@@ -4464,7 +4464,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //更新一次数据
             //更新第一次毛重数据库
             mwcaf01.setValueFlag(DbConstants.NET);
-            mwcaf01.setUpdateManName(userId);
+            mwcaf01.setUpdateManNo(userId);
             mwcaf01.setUpdateManName(userName);
             mwcaf01.setNote("双委托结净更新");
             mwcaf01.setUpdateTime(new Date());
@@ -4476,7 +4476,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf01);
             //更新第一次皮重数据库
             mwcaf02.setValueFlag(DbConstants.NET);
-            mwcaf02.setUpdateManName(userId);
+            mwcaf02.setUpdateManNo(userId);
             mwcaf02.setUpdateManName(userName);
             mwcaf02.setNote("手动双委托结净更新");
             mwcaf02.setUpdateTime(new Date());
@@ -4495,7 +4495,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf03.setActualFirstNo(actualFirstNo);
 
             mwcaf03.setValueFlag(DbConstants.NET);
-            mwcaf03.setUpdateManName(userId);
+            mwcaf03.setUpdateManNo(userId);
             mwcaf03.setUpdateManName(userName);
             mwcaf03.setNote("手动双委托结净更新");
             mwcaf03.setUpdateTime(new Date());
@@ -4514,7 +4514,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf04.setActualFirstNo(actualSecondNo);
 
             mwcaf04.setValueFlag(DbConstants.NET);
-            mwcaf04.setUpdateManName(userId);
+            mwcaf04.setUpdateManNo(userId);
             mwcaf04.setUpdateManName(userName);
             mwcaf04.setNote("手动双委托结净更新");
             mwcaf04.setUpdateTime(new Date());
@@ -4963,14 +4963,14 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWeight = secondTemp.getMeterWeight().subtract(firstTemp.getMeterWeight());
             }
             firstTemp.setValueFlag(DbConstants.NET);
-            firstTemp.setUpdateManName("system");
+            firstTemp.setUpdateManNo("system");
             firstTemp.setUpdateManName("紧急结净更新");
             firstTemp.setUpdateTime(new Date());
             firstTemp.setIsPreScale("0");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTemp);
             //更新第一次皮重数据库
             secondTemp.setValueFlag(DbConstants.NET);
-            secondTemp.setUpdateManName("system");
+            secondTemp.setUpdateManNo("system");
             secondTemp.setUpdateManName("紧急结净更新");
             secondTemp.setUpdateTime(new Date());
             secondTemp.setIsPreScale("0");
@@ -5412,7 +5412,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("期限皮结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setIsPreScale("1");
@@ -5420,7 +5420,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(grossModel);
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
-                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManNo("system");
                 tareModel.setUpdateManName("期限皮结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setIsPreScale("1");

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/service/impl/MeterWorkCarActualFirstBakServiceImpl.java

@@ -3159,7 +3159,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混装结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -3169,7 +3169,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
                 meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("混装结净更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -3244,7 +3244,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混卸结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -3254,7 +3254,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
                 meterWorkCarActualFirstBakMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("混卸结净更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("1");
@@ -3441,7 +3441,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             //更新一次数据
             //更新第一次毛重数据库
             model01.setValueFlag(DbConstants.NET);
-            model01.setUpdateManName("system");
+            model01.setUpdateManNo("system");
             model01.setUpdateManName("双委托结净更新");
             model01.setUpdateTime(new Date());
             model01.setWeightType("0");
@@ -3452,7 +3452,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             meterWorkCarActualFirstBakMapper.updateByPrimaryKey(model01);
             //更新第一次皮重数据库
             model02.setValueFlag(DbConstants.NET);
-            model02.setUpdateManName("system");
+            model02.setUpdateManNo("system");
             model02.setUpdateManName("双委托结净更新");
             model02.setUpdateTime(new Date());
             model02.setWeightType("1");
@@ -3468,7 +3468,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             model03.setActualFirstNo(actualFirstNo);
 
             model03.setValueFlag(DbConstants.NET);
-            model03.setUpdateManName("system");
+            model03.setUpdateManNo("system");
             model03.setUpdateManName("双委托结净更新");
             model03.setWeightType("0");
             model03.setUpdateTime(new Date());
@@ -3484,7 +3484,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             model04.setActualFirstNo(actualSecondNo);
 
             model04.setValueFlag(DbConstants.NET);
-            model04.setUpdateManName("system");
+            model04.setUpdateManNo("system");
             model04.setUpdateManName("双委托结净更新");
             model04.setWeightType("1");
             model04.setUpdateTime(new Date());
@@ -3705,7 +3705,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             //更新一次数据
             //更新第一次皮重数据
             mwcaf1.setValueFlag(DbConstants.NET);
-            mwcaf1.setUpdateManName("system");
+            mwcaf1.setUpdateManNo("system");
             mwcaf1.setUpdateManName("混装结净更新");
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreScale("1");
@@ -3715,7 +3715,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             meterWorkCarActualFirstBakMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次毛重数据
             mwcaf2.setValueFlag(DbConstants.NET);
-            mwcaf2.setUpdateManName("system");
+            mwcaf2.setUpdateManNo("system");
             mwcaf2.setUpdateManName("混装结净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreScale("1");
@@ -3733,7 +3733,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
 
 
             mwcaf3.setValueFlag(DbConstants.NET);
-            mwcaf3.setUpdateManName("system");
+            mwcaf3.setUpdateManNo("system");
             mwcaf3.setUpdateManName("混装结净更新");
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreScale("1");
@@ -3744,7 +3744,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             meterWorkCarActualFirstBakMapper.insertSelective(mwcaf3);
             //更新第二次毛重数据
             mwcaf4.setValueFlag(DbConstants.NET);
-            mwcaf4.setUpdateManName("system");
+            mwcaf4.setUpdateManNo("system");
             mwcaf4.setUpdateManName("混装结净更新");
             mwcaf4.setUpdateTime(new Date());
             mwcaf4.setIsPreScale("1");
@@ -4178,7 +4178,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             //更新一次数据
             //更新第一次毛重数据库
             mwcaf01.setValueFlag(DbConstants.NET);
-            mwcaf01.setUpdateManName("system");
+            mwcaf01.setUpdateManNo("system");
             mwcaf01.setUpdateManName("双委托结净更新");
             mwcaf01.setUpdateTime(new Date());
             mwcaf01.setIsPreScale("1");
@@ -4188,7 +4188,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             meterWorkCarActualFirstBakMapper.updateByPrimaryKey(mwcaf01);
             //更新第一次皮重数据库
             mwcaf02.setValueFlag(DbConstants.NET);
-            mwcaf02.setUpdateManName("system");
+            mwcaf02.setUpdateManNo("system");
             mwcaf02.setUpdateManName("双委托结净更新");
             mwcaf02.setUpdateTime(new Date());
             mwcaf02.setIsPreScale("1");
@@ -4205,7 +4205,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             mwcaf03.setActualFirstNo(actualFirstNo);
 
             mwcaf03.setValueFlag(DbConstants.NET);
-            mwcaf03.setUpdateManName("system");
+            mwcaf03.setUpdateManNo("system");
             mwcaf03.setUpdateManName("双委托结净更新");
             mwcaf03.setUpdateTime(new Date());
             mwcaf03.setIsPreScale("1");
@@ -4223,7 +4223,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             mwcaf04.setActualFirstNo(actualSecondNo);
 
             mwcaf04.setValueFlag(DbConstants.NET);
-            mwcaf04.setUpdateManName("system");
+            mwcaf04.setUpdateManNo("system");
             mwcaf04.setUpdateManName("双委托结净更新");
             mwcaf04.setUpdateTime(new Date());
             mwcaf04.setIsPreScale("1");
@@ -4632,14 +4632,14 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
                 meterWeight = secondTemp.getMeterWeight().subtract(firstTemp.getMeterWeight());
             }
             firstTemp.setValueFlag(DbConstants.NET);
-            firstTemp.setUpdateManName("system");
+            firstTemp.setUpdateManNo("system");
             firstTemp.setUpdateManName("紧急结净更新");
             firstTemp.setUpdateTime(new Date());
             firstTemp.setIsPreScale("0");
             meterWorkCarActualFirstBakMapper.updateByPrimaryKey(firstTemp);
             //更新第一次皮重数据库
             secondTemp.setValueFlag(DbConstants.NET);
-            secondTemp.setUpdateManName("system");
+            secondTemp.setUpdateManNo("system");
             secondTemp.setUpdateManName("紧急结净更新");
             secondTemp.setUpdateTime(new Date());
             secondTemp.setIsPreScale("0");
@@ -5060,7 +5060,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
 
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("期限皮结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setIsPreScale("1");
@@ -5068,7 +5068,7 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
                 meterWorkCarActualFirstBakMapper.updateByPrimaryKey(grossModel);
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
-                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManNo("system");
                 tareModel.setUpdateManName("期限皮结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setIsPreScale("1");

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/mapper/MeterWorkCheckFirstActualMapper.xml

@@ -693,6 +693,14 @@
               when A.net_mode = '2' then '智能计量'
               when A.net_mode = '3' then '手工计量'
               else A.net_mode end netMode,
+          case when A.gross_mode = '1' then '远程计量'
+              when A.gross_mode = '2' then '智能计量'
+              when A.gross_mode = '3' then '手工计量'
+              else A.gross_mode end grossMode,
+          case when A.tare_mode = '1' then '远程计量'
+              when A.tare_mode = '2' then '智能计量'
+              when A.tare_mode = '3' then '手工计量'
+              else A.tare_mode end tareMode,
           A.prediction_no predictionNo,
           A.car_No carNo,
           A.conveyance_type conveyanceType,
@@ -708,18 +716,21 @@
               when A.meter_type_Name = 'PO2GM' then '外进'
               else A.meter_type_Name end meterTypeName,
           A.theory_amount theoryAmount,
+          A.sender_remark senderRemark,
           A.gross_time grossTime,
           A.base_spot1_name baseSpot1Name,
           A.gross_man_name grossManName,
           A.tare_time tareTime,
           A.base_spot2_name baseSpot2Name,
           A.tare_man_name tareManName,
+          A.net_time netTime,
+          A.net_spot3_name netSpot3Name,
+          A.net_man_name netManName,
           case when A.value_flag = '0' then '作废'
-              when A.value_flag = '1' then '有效-未上传'
-              when A.value_flag = '2' then '有效-已上传'
+              when A.value_flag = '1' then '有效'
               else A.value_flag end valueFlag,
-          case when A.upload_flag = '1' then '待上传'
-              when A.upload_flag = '2' then '已上传'
+          case when A.upload_flag = '1' then '未同步'
+              when A.upload_flag = '2' then '已同步'
               else A.upload_flag end uploadFlag
     from meter_work_car_actual A
         left join meter_work_check_first_actual B
@@ -744,6 +755,8 @@
             A.actual_first1_no,
             A.actual_first2_no,
             A.net_mode,
+            A.gross_mode,
+            A.tare_mode,
             A.prediction_no,
             A.car_no,
             A.conveyance_type,
@@ -756,12 +769,16 @@
             A.receiving_uint_name,
             A.meter_type_Name,
             A.theory_amount,
+            A.sender_remark,
             A.gross_time,
             A.base_spot1_name,
             A.gross_man_name,
             A.tare_time,
             A.base_spot2_name,
             A.tare_man_name,
+            A.net_time,
+            A.net_spot3_name,
+            A.net_man_name,
             A.value_flag,
             A.upload_flag
   </select>
@@ -781,6 +798,10 @@
           A.matter_no matterNo,
           A.matter_name matterName,
           to_char(round(A.meter_Weight/1000, 2),'FM9999999999999999.00') meterWeight,
+          case when A.weight_type = '0' then '毛重'
+            when A.weight_type = '1' then '皮重'
+            when A.weight_type = '2' then '期限皮'
+            else A.weight_type end weightType,
           A.forwarding_unit_name forwardingUnitName,
           A.receiving_uint_name receivingUintName,
           case when A.meter_type_Name = 'SendToOutTms' then '外发'
@@ -788,8 +809,12 @@
               when A.meter_type_Name = 'PO2GM' then '外进'
               else A.meter_type_Name end meterTypeName,
           A.theory_amount theoryAmount,
+          A.create_man_name createManName,
           A.create_time createTime,
           A.base_spot_name baseSpotName,
+          case when A.is_pre_scale = '0' then '未匹配'
+              when A.is_pre_scale = '1' then '已匹配'
+              else A.is_pre_scale end isPreScale,
           case when A.value_flag = '0' then '作废'
               when A.value_flag = '1' then '有效'
               when A.value_flag = '2' then '结净'
@@ -821,13 +846,15 @@
             A.matter_no,
             A.matter_name,
             A.meter_weight,
+            A.weight_type,
             A.forwarding_unit_name,
             A.receiving_uint_name,
             A.meter_type_Name,
             A.theory_amount,
+            A.create_man_name,
             A.create_time,
             A.base_spot_name,
-            A.create_man_name,
+            A.is_pre_scale,
             A.value_flag
   </select>
 
@@ -863,6 +890,10 @@
         A.matter_no matterNo,
         A.matter_name matterName,
         to_char(round(A.meter_Weight/1000, 2),'FM9999999999999999.00') meterWeight,
+        case when A.weight_type = '0' then '毛重'
+            when A.weight_type = '1' then '皮重'
+            when A.weight_type = '2' then '期限皮'
+            else A.weight_type end weightType,
         A.forwarding_unit_name forwardingUnitName,
         A.receiving_uint_name receivingUintName,
         case when A.meter_type_Name = 'SendToOutTms' then '外发'
@@ -870,8 +901,12 @@
             when A.meter_type_Name = 'PO2GM' then '外进'
             else A.meter_type_Name end meterTypeName,
         A.theory_amount theoryAmount,
+        A.create_man_name createManName,
         A.create_time createTime,
         A.base_spot_name baseSpotName,
+        case when A.is_pre_scale = '0' then '未匹配'
+            when A.is_pre_scale = '1' then '已匹配'
+            else A.is_pre_scale end isPreScale,
         case when A.value_flag = '0' then '作废'
             when A.value_flag = '1' then '有效'
             when A.value_flag = '2' then '结净'
@@ -901,6 +936,14 @@
               when A.net_mode = '2' then '智能计量'
               when A.net_mode = '3' then '手工计量'
               else A.net_mode end netMode,
+          case when A.gross_mode = '1' then '远程计量'
+              when A.gross_mode = '2' then '智能计量'
+              when A.gross_mode = '3' then '手工计量'
+              else A.gross_mode end grossMode,
+          case when A.tare_mode = '1' then '远程计量'
+              when A.tare_mode = '2' then '智能计量'
+              when A.tare_mode = '3' then '手工计量'
+              else A.tare_mode end tareMode,
           A.prediction_no predictionNo,
           A.car_No carNo,
           A.conveyance_type conveyanceType,
@@ -916,18 +959,21 @@
               when A.meter_type_Name = 'PO2GM' then '外进'
               else A.meter_type_Name end meterTypeName,
           A.theory_amount theoryAmount,
+          A.sender_remark senderRemark,
           A.gross_time grossTime,
           A.base_spot1_name baseSpot1Name,
           A.gross_man_name grossManName,
           A.tare_time tareTime,
           A.base_spot2_name baseSpot2Name,
           A.tare_man_name tareManName,
+          A.net_time netTime,
+          A.net_spot3_name netSpot3Name,
+          A.net_man_name netManName,
           case when A.value_flag = '0' then '作废'
-              when A.value_flag = '1' then '有效-未上传'
-              when A.value_flag = '2' then '有效-已上传'
+              when A.value_flag = '1' then '有效'
               else A.value_flag end valueFlag,
-          case when A.upload_flag = '1' then '待上传'
-              when A.upload_flag = '2' then '已上传'
+          case when A.upload_flag = '1' then '未同步'
+              when A.upload_flag = '2' then '已同步'
               else A.upload_flag end uploadFlag
     from meter_work_car_actual A
         left join meter_work_check_first_actual B

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/model/CarActualCountCheckNum.java

@@ -11,6 +11,8 @@ public class CarActualCountCheckNum {
     private String actualFirst1No;
     private String actualFirst2No;
     private String netMode;
+    private String grossMode;
+    private String tareMode;
     private String predictionNo;
     private String carNo;
     private String conveyanceType;
@@ -23,12 +25,16 @@ public class CarActualCountCheckNum {
     private String receivingUintName;
     private String meterTypeName;
     private String theoryAmount;
+    private String senderRemark;
     private Date grossTime;
     private String baseSpot1Name;
     private String grossManName;
     private Date tareTime;
     private String baseSpot2Name;
     private String tareManName;
+    private Date netTime;
+    private String netSpot3Name;
+    private String netManName;
     private String valueFlag;
     private String uploadFlag;
 
@@ -80,6 +86,22 @@ public class CarActualCountCheckNum {
         this.actualFirst2No = actualFirst2No;
     }
 
+    public String getGrossMode() {
+        return grossMode;
+    }
+
+    public void setGrossMode(String grossMode) {
+        this.grossMode = grossMode;
+    }
+
+    public String getTareMode() {
+        return tareMode;
+    }
+
+    public void setTareMode(String tareMode) {
+        this.tareMode = tareMode;
+    }
+
     public String getNetMode() {
         return netMode;
     }
@@ -184,6 +206,14 @@ public class CarActualCountCheckNum {
         this.theoryAmount = theoryAmount;
     }
 
+    public String getSenderRemark() {
+        return senderRemark;
+    }
+
+    public void setSenderRemark(String senderRemark) {
+        this.senderRemark = senderRemark;
+    }
+
     public Date getGrossTime() {
         return grossTime;
     }
@@ -232,6 +262,30 @@ public class CarActualCountCheckNum {
         this.tareManName = tareManName;
     }
 
+    public Date getNetTime() {
+        return netTime;
+    }
+
+    public void setNetTime(Date netTime) {
+        this.netTime = netTime;
+    }
+
+    public String getNetSpot3Name() {
+        return netSpot3Name;
+    }
+
+    public void setNetSpot3Name(String netSpot3Name) {
+        this.netSpot3Name = netSpot3Name;
+    }
+
+    public String getNetManName() {
+        return netManName;
+    }
+
+    public void setNetManName(String netManName) {
+        this.netManName = netManName;
+    }
+
     public String getValueFlag() {
         return valueFlag;
     }

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/model/CarFirstCountCheckNum.java

@@ -12,14 +12,18 @@ public class CarFirstCountCheckNum {
     private String carNo;
     private String conveyanceType;
     private String matterNo;
-    private String mattterName;
+    private String matterName;
     private BigDecimal meterWeight;
+    private String weightType;
     private String forwardingUnitName;
     private String receivingUintName;
     private String meterTypeName;
     private String theoryAmount;
+    private String createManName;
     private String createTime;
     private String baseSpotName;
+    private String uploadFlag;
+    private String isPreScale;
     private String valueFlag;
 
     public BigDecimal getCountCheckNum() {
@@ -94,12 +98,12 @@ public class CarFirstCountCheckNum {
         this.matterNo = matterNo;
     }
 
-    public String getMattterName() {
-        return mattterName;
+    public String getMatterName() {
+        return matterName;
     }
 
-    public void setMattterName(String mattterName) {
-        this.mattterName = mattterName;
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
     }
 
     public BigDecimal getMeterWeight() {
@@ -110,6 +114,14 @@ public class CarFirstCountCheckNum {
         this.meterWeight = meterWeight;
     }
 
+    public String getWeightType() {
+        return weightType;
+    }
+
+    public void setWeightType(String weightType) {
+        this.weightType = weightType;
+    }
+
     public String getForwardingUnitName() {
         return forwardingUnitName;
     }
@@ -142,6 +154,14 @@ public class CarFirstCountCheckNum {
         this.theoryAmount = theoryAmount;
     }
 
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName;
+    }
+
     public String getCreateTime() {
         return createTime;
     }
@@ -158,6 +178,14 @@ public class CarFirstCountCheckNum {
         this.baseSpotName = baseSpotName;
     }
 
+    public String getIsPreScale() {
+        return isPreScale;
+    }
+
+    public void setIsPreScale(String isPreScale) {
+        this.isPreScale = isPreScale;
+    }
+
     public String getValueFlag() {
         return valueFlag;
     }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -890,7 +890,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混装结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -900,7 +900,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("混装结净更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -984,7 +984,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混卸结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -994,7 +994,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("混卸结净更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("1");
@@ -1137,7 +1137,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //更新一次数据
             //更新第一次毛重数据库
             model01.setValueFlag(DbConstants.NET);
-            model01.setUpdateManName("system");
+            model01.setUpdateManNo("system");
             model01.setUpdateManName("双委托结净更新");
             model01.setUpdateTime(new Date());
             model01.setWeightType("0");
@@ -1148,7 +1148,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(model01);
             //更新第一次皮重数据库
             model02.setValueFlag(DbConstants.NET);
-            model02.setUpdateManName("system");
+            model02.setUpdateManNo("system");
             model02.setUpdateManName("双委托结净更新");
             model02.setUpdateTime(new Date());
             model02.setWeightType("1");
@@ -1163,7 +1163,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String actualFirstNo = PublicMethod.IdCreate(3);
             model03.setActualFirstNo(actualFirstNo);
             model03.setValueFlag(DbConstants.NET);
-            model03.setUpdateManName("system");
+            model03.setUpdateManNo("system");
             model03.setUpdateManName("双委托结净更新");
             model03.setWeightType("0");
             model03.setUpdateTime(new Date());
@@ -1179,7 +1179,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String actualSecondNo = PublicMethod.IdCreate(3);
             model04.setActualFirstNo(actualSecondNo);
             model04.setValueFlag(DbConstants.NET);
-            model04.setUpdateManName("system");
+            model04.setUpdateManNo("system");
             model04.setUpdateManName("双委托结净更新");
             model04.setWeightType("1");
             model04.setUpdateTime(new Date());
@@ -1399,7 +1399,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 MeterWorkRailwayActFirst firstTemp = meterWorkRailwayActFirstMapper.selectAndMatch(addFirsts.get(0).getActualFirstNo(), scales.get(0).getPredictionNo());
                 BeanUtils.copyProperties(firstTemp, addFirsts.get(0));
                 addFirsts.get(0).setValueFlag(DbConstants.NET);
-                addFirsts.get(0).setUpdateManName("system");
+                addFirsts.get(0).setUpdateManNo("system");
                 addFirsts.get(0).setUpdateManName("双委托结净更新");
                 addFirsts.get(0).setCreateManNo(userId);
                 addFirsts.get(0).setCreateManName(userName);
@@ -1415,7 +1415,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                 //添加第二次皮重数据库
                 addFirsts.get(1).setValueFlag(DbConstants.NET);
-                addFirsts.get(1).setUpdateManName("system");
+                addFirsts.get(1).setUpdateManNo("system");
                 addFirsts.get(1).setUpdateManName("双委托结净更新");
                 addFirsts.get(1).setWeightType("0");
                 addFirsts.get(1).setUpdateTime(new Date());
@@ -1548,7 +1548,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 //                    addFirsts.get(i).setActualFirstNo(actualFirstNo);
                             String actualFirstNo = PublicMethod.IdCreate(3);
                             addFirsts.get(i).setActualFirstNo(actualFirstNo);
-                            addFirsts.get(i).setUpdateManName("system");
+                            addFirsts.get(i).setUpdateManNo("system");
                             addFirsts.get(i).setUpdateManName("双委托结净更新");
                             addFirsts.get(i).setUpdateTime(new Date());
                             addFirsts.get(i).setCreateManNo(userId);
@@ -1566,7 +1566,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             if(StringUtils.isEmpty(selectedFirsts.get(i).getActualFirstNo())) {
                                 selectedFirsts.get(i).setActualFirstNo(PublicMethod.IdCreate(3));
                                 selectedFirsts.get(i).setCreateTime(new Date());
-                                selectedFirsts.get(i).setUpdateManName("system");
+                                selectedFirsts.get(i).setUpdateManNo("system");
                                 selectedFirsts.get(i).setUpdateManName("双委托结净更新");
                                 selectedFirsts.get(i).setUpdateTime(new Date());
                                 selectedFirsts.get(i).setValueFlag(DbConstants.NET);
@@ -1576,7 +1576,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                                 selectedFirsts.get(i).setPredictionCombination(selectedFirsts.get(i).getPredictionNo() + "," + addFirsts.get(i).getPredictionNo());
                                 meterWorkRailwayActFirstMapper.insertSelective(selectedFirsts.get(i));
                             }else{
-                                selectedFirsts.get(i).setUpdateManName("system");
+                                selectedFirsts.get(i).setUpdateManNo("system");
                                 selectedFirsts.get(i).setUpdateManName("双委托结净更新");
                                 selectedFirsts.get(i).setUpdateTime(new Date());
                                 selectedFirsts.get(i).setValueFlag(DbConstants.NET);
@@ -1818,7 +1818,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混装结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -1826,7 +1826,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混装结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -1893,7 +1893,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混卸结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -1901,7 +1901,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混卸结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -1960,11 +1960,11 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 //存储当前计量的数据
                 if (flag.equals("0")) {
                     if (first01.getWeightType().equals("0")) {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混卸一次复制");
                         firsts.add(model02);
                     } else {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混装一次复制");
                         firsts.add(model01);
                     }
@@ -2053,7 +2053,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混装结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -2063,7 +2063,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混装结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -2136,7 +2136,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混卸结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -2146,7 +2146,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混卸结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -2208,11 +2208,11 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 //存储当前计量的数据
                 if (flag.equals("0")) {
                     if (first01.getWeightType().equals("0")) {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混卸一次复制");
                         firsts.add(model02);
                     } else {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混装一次复制");
                         firsts.add(model01);
                     }
@@ -2338,7 +2338,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //更新一次数据
             //更新第一次毛重数据库
             model01.setValueFlag(DbConstants.NET);
-            model01.setUpdateManName("system");
+            model01.setUpdateManNo("system");
             model01.setUpdateManName("智能计量双委托结净更新");
             model01.setUpdateTime(new Date());
             model01.setWeightType("0");
@@ -2349,7 +2349,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(model01);
             //更新第一次皮重数据库
             model02.setValueFlag(DbConstants.NET);
-            model02.setUpdateManName("system");
+            model02.setUpdateManNo("system");
             model02.setUpdateManName("智能计量双委托结净更新");
             model02.setUpdateTime(new Date());
             model02.setWeightType("1");
@@ -2364,7 +2364,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String actualFirstNo = PublicMethod.IdCreate(3);
             model03.setActualFirstNo(actualFirstNo);
             model03.setValueFlag(DbConstants.NET);
-            model03.setUpdateManName("system");
+            model03.setUpdateManNo("system");
             model03.setUpdateManName("智能计量双委托结净更新");
             model03.setWeightType("0");
             model03.setUpdateTime(new Date());
@@ -2380,7 +2380,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String actualSecondNo = PublicMethod.IdCreate(3);
             model04.setActualFirstNo(actualSecondNo);
             model04.setValueFlag(DbConstants.NET);
-            model04.setUpdateManName("system");
+            model04.setUpdateManNo("system");
             model04.setUpdateManName("智能计量双委托结净更新");
             model04.setWeightType("1");
             model04.setUpdateTime(new Date());
@@ -4803,7 +4803,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                 //修改毛重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("自动匹配更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("0");
@@ -4813,7 +4813,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("自动匹配更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -4881,7 +4881,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             } else {
                 //修改毛重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("自动匹配更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("0");
@@ -4889,7 +4889,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("自动匹配更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -6625,7 +6625,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //更新一次数据
             //更新第一次毛重数据库
             grossModel.setValueFlag(DbConstants.NET);
-    //        grossModel.setUpdateManName("system");
+    //        grossModel.setUpdateManNo("system");
     //        grossModel.setUpdateManName("智能计量双委托结净更新");
     //        grossModel.setUpdateTime(new Date());
             grossModel.setWeightType("0");
@@ -6635,7 +6635,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
             //更新第一次皮重数据库
             tareModel.setValueFlag(DbConstants.NET);
-    //        tareModel.setUpdateManName("system");
+    //        tareModel.setUpdateManNo("system");
     //        tareModel.setUpdateManName("自助计量结净更新");
     //        tareModel.setUpdateTime(new Date());
             tareModel.setWeightType("1");
@@ -6696,7 +6696,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         } else {
             //更新第一次毛重数据库
             grossModel.setValueFlag(DbConstants.NET);
-    //        grossModel.setUpdateManName("system");
+    //        grossModel.setUpdateManNo("system");
     //        grossModel.setUpdateManName("自助计量结净更新");
     //        grossModel.setUpdateTime(new Date());
             grossModel.setWeightType("0");
@@ -6704,7 +6704,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
             //更新第一次皮重数据库
             tareModel.setValueFlag(DbConstants.NET);
-    //        tareModel.setUpdateManName("system");
+    //        tareModel.setUpdateManNo("system");
     //        tareModel.setUpdateManName("自助计量结净更新");
     //        tareModel.setUpdateTime(new Date());
             tareModel.setWeightType("1");
@@ -6917,7 +6917,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 //更新一次数据
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("智能计量双委托结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
@@ -6927,7 +6927,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
-                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManNo("system");
                 tareModel.setUpdateManName("自助计量结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setWeightType("1");
@@ -6990,7 +6990,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             } else {
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("自助计量结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
@@ -6998,7 +6998,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
-                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManNo("system");
                 tareModel.setUpdateManName("自助计量结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setWeightType("1");
@@ -7049,7 +7049,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
             //更新第一次毛重数据库
             grossModel.setValueFlag(DbConstants.NET);
-            grossModel.setUpdateManName("system");
+            grossModel.setUpdateManNo("system");
             grossModel.setUpdateManName("自助计量结净更新");
             grossModel.setUpdateTime(new Date());
             grossModel.setWeightType("0");
@@ -7057,7 +7057,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
             //更新第一次皮重数据库
             tareModel.setValueFlag(DbConstants.NET);
-            tareModel.setUpdateManName("system");
+            tareModel.setUpdateManNo("system");
             tareModel.setUpdateManName("自助计量结净更新");
             tareModel.setUpdateTime(new Date());
             tareModel.setWeightType("1");
@@ -7215,7 +7215,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("标识皮结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -7225,7 +7225,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
 //                    model02.setValueFlag(DbConstants.NET);
-//                    model02.setUpdateManName("system");
+//                    model02.setUpdateManNo("system");
 //                    model02.setUpdateManName("标识皮结净更新");
 //                    model02.setUpdateTime(new Date());
 //                    model02.setWeightType("1");
@@ -7297,7 +7297,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             } else {
                 //修改毛重一次数据状态
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("标识皮结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
@@ -7305,7 +7305,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(grossModel);
                 //修改皮重一次数据状态
 //                tareModel.setValueFlag(DbConstants.NET);
-//                tareModel.setUpdateManName("system");
+//                tareModel.setUpdateManNo("system");
 //                tareModel.setUpdateManName("标志皮结净更新");
 //                tareModel.setUpdateTime(new Date());
 //                tareModel.setWeightType("1");
@@ -7484,7 +7484,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             } else {
                 //修改毛重一次数据状态
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("标准皮结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/service/impl/MeterWorkRailwayActFirstBakServiceImpl.java

@@ -767,7 +767,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混装结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -777,7 +777,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("混装结净更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -857,7 +857,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
-                first02.setUpdateManName("system");
+                first02.setUpdateManNo("system");
                 first02.setUpdateManName("混卸结净更新");
                 first02.setUpdateTime(new Date());
                 first02.setWeightType("0");
@@ -867,7 +867,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(first02);
                 //修改皮重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("混卸结净更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("1");
@@ -1011,7 +1011,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             //更新一次数据
             //更新第一次毛重数据库
             model01.setValueFlag(DbConstants.NET);
-            model01.setUpdateManName("system");
+            model01.setUpdateManNo("system");
             model01.setUpdateManName("双委托结净更新");
             model01.setUpdateTime(new Date());
             model01.setWeightType("0");
@@ -1022,7 +1022,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(model01);
             //更新第一次皮重数据库
             model02.setValueFlag(DbConstants.NET);
-            model02.setUpdateManName("system");
+            model02.setUpdateManNo("system");
             model02.setUpdateManName("双委托结净更新");
             model02.setUpdateTime(new Date());
             model02.setWeightType("1");
@@ -1035,7 +1035,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
             model03.setActualFirstNo(actualFirstNo);
             model03.setValueFlag(DbConstants.NET);
-            model03.setUpdateManName("system");
+            model03.setUpdateManNo("system");
             model03.setUpdateManName("双委托结净更新");
             model03.setWeightType("0");
             model03.setUpdateTime(new Date());
@@ -1049,7 +1049,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String actualSecondNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
             model04.setActualFirstNo(actualSecondNo);
             model04.setValueFlag(DbConstants.NET);
-            model04.setUpdateManName("system");
+            model04.setUpdateManNo("system");
             model04.setUpdateManName("双委托结净更新");
             model04.setWeightType("1");
             model04.setUpdateTime(new Date());
@@ -1272,7 +1272,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
                     addFirsts.get(i).setActualFirstNo(actualFirstNo);
                     addFirsts.get(i).setValueFlag(DbConstants.NET);
-                    addFirsts.get(i).setUpdateManName("system");
+                    addFirsts.get(i).setUpdateManNo("system");
                     addFirsts.get(i).setUpdateManName("双委托结净更新");
                     addFirsts.get(i).setCreateManNo(userId);
                     addFirsts.get(i).setCreateManName(userName);
@@ -1287,7 +1287,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     meterWorkRailwayActFirstBakMapper.insertSelective(addFirsts.get(i));
                     //添加第二次皮重数据库
                     selectedFirsts.get(i).setValueFlag(DbConstants.NET);
-                    selectedFirsts.get(i).setUpdateManName("system");
+                    selectedFirsts.get(i).setUpdateManNo("system");
                     selectedFirsts.get(i).setUpdateManName("双委托结净更新");
                     selectedFirsts.get(i).setWeightType("0");
                     selectedFirsts.get(i).setUpdateTime(new Date());
@@ -1442,7 +1442,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混装结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -1450,7 +1450,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混装结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -1512,7 +1512,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混卸结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -1520,7 +1520,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混卸结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -1574,11 +1574,11 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 //存储当前计量的数据
                 if (flag.equals("0")) {
                     if (first01.getWeightType().equals("0")) {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混卸一次复制");
                         firsts.add(model02);
                     } else {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混装一次复制");
                         firsts.add(model01);
                     }
@@ -1672,7 +1672,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混装结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -1682,7 +1682,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混装结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -1751,7 +1751,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("智能计量混卸结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -1761,7 +1761,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
                     model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
+                    model02.setUpdateManNo("system");
                     model02.setUpdateManName("智能计量混卸结净更新");
                     model02.setUpdateTime(new Date());
                     model02.setWeightType("1");
@@ -1819,11 +1819,11 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 //存储当前计量的数据
                 if (flag.equals("0")) {
                     if (first01.getWeightType().equals("0")) {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混卸一次复制");
                         firsts.add(model02);
                     } else {
-                        first02.setUpdateManName("system");
+                        first02.setUpdateManNo("system");
                         first02.setUpdateManName("智能计量混装一次复制");
                         firsts.add(model01);
                     }
@@ -1953,7 +1953,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             //更新一次数据
             //更新第一次毛重数据库
             model01.setValueFlag(DbConstants.NET);
-            model01.setUpdateManName("system");
+            model01.setUpdateManNo("system");
             model01.setUpdateManName("智能计量双委托结净更新");
             model01.setUpdateTime(new Date());
             model01.setWeightType("0");
@@ -1964,7 +1964,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(model01);
             //更新第一次皮重数据库
             model02.setValueFlag(DbConstants.NET);
-            model02.setUpdateManName("system");
+            model02.setUpdateManNo("system");
             model02.setUpdateManName("智能计量双委托结净更新");
             model02.setUpdateTime(new Date());
             model02.setWeightType("1");
@@ -1977,7 +1977,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
             model03.setActualFirstNo(actualFirstNo);
             model03.setValueFlag(DbConstants.NET);
-            model03.setUpdateManName("system");
+            model03.setUpdateManNo("system");
             model03.setUpdateManName("智能计量双委托结净更新");
             model03.setWeightType("0");
             model03.setUpdateTime(new Date());
@@ -1991,7 +1991,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String actualSecondNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
             model04.setActualFirstNo(actualSecondNo);
             model04.setValueFlag(DbConstants.NET);
-            model04.setUpdateManName("system");
+            model04.setUpdateManNo("system");
             model04.setUpdateManName("智能计量双委托结净更新");
             model04.setWeightType("1");
             model04.setUpdateTime(new Date());
@@ -2193,7 +2193,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             //更新一次数据
             //更新第一次毛重数据库
             mwcaf01.setValueFlag(DbConstants.NET);
-            mwcaf01.setUpdateManName("system");
+            mwcaf01.setUpdateManNo("system");
             mwcaf01.setUpdateManName("双委托结净更新");
             mwcaf01.setUpdateTime(new Date());
             mwcaf01.setIsPreSacale("1");
@@ -2203,7 +2203,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(mwcaf01);
             //更新第一次皮重数据库
             mwcaf02.setValueFlag(DbConstants.NET);
-            mwcaf02.setUpdateManName("system");
+            mwcaf02.setUpdateManNo("system");
             mwcaf02.setUpdateManName("双委托结净更新");
             mwcaf02.setUpdateTime(new Date());
             mwcaf02.setIsPreSacale("1");
@@ -2217,7 +2217,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
             mwcaf03.setActualFirstNo(actualFirstNo);
             mwcaf03.setValueFlag(DbConstants.NET);
-            mwcaf03.setUpdateManName("system");
+            mwcaf03.setUpdateManNo("system");
             mwcaf03.setUpdateManName("双委托结净更新");
             mwcaf03.setUpdateTime(new Date());
             mwcaf03.setIsPreSacale("1");
@@ -2232,7 +2232,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String actualSecondNo = sdf01.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl01);
             mwcaf04.setActualFirstNo(actualSecondNo);
             mwcaf04.setValueFlag(DbConstants.NET);
-            mwcaf04.setUpdateManName("system");
+            mwcaf04.setUpdateManNo("system");
             mwcaf04.setUpdateManName("双委托结净更新");
             mwcaf04.setUpdateTime(new Date());
             mwcaf04.setIsPreSacale("1");
@@ -2407,7 +2407,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             //更新一次数据
             //更新第一次皮重数据
             mwcaf1.setValueFlag(DbConstants.NET);
-            mwcaf1.setUpdateManName("system");
+            mwcaf1.setUpdateManNo("system");
             mwcaf1.setUpdateManName("混装结净更新");
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreSacale("1");
@@ -2417,7 +2417,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次毛重数据
             mwcaf2.setValueFlag(DbConstants.NET);
-            mwcaf2.setUpdateManName("system");
+            mwcaf2.setUpdateManNo("system");
             mwcaf2.setUpdateManName("混装结净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreSacale("1");
@@ -2431,7 +2431,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstBakMapper.getNewID(afl);
             mwcaf3.setActualFirstNo(actualFirstNo);
             mwcaf3.setValueFlag(DbConstants.NET);
-            mwcaf3.setUpdateManName("system");
+            mwcaf3.setUpdateManNo("system");
             mwcaf3.setUpdateManName("混装结净更新");
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreSacale("1");
@@ -2442,7 +2442,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.insertSelective(mwcaf3);
             //更新第二次毛重数据
             mwcaf4.setValueFlag(DbConstants.NET);
-            mwcaf4.setUpdateManName("system");
+            mwcaf4.setUpdateManNo("system");
             mwcaf4.setUpdateManName("混装结净更新");
             mwcaf4.setUpdateTime(new Date());
             mwcaf4.setIsPreSacale("1");
@@ -3887,7 +3887,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                 //修改毛重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("自动匹配更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("0");
@@ -3897,7 +3897,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model01);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("自动匹配更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -3954,7 +3954,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             } else {
                 //修改毛重一次数据状态
                 model01.setValueFlag(DbConstants.NET);
-                model01.setUpdateManName("system");
+                model01.setUpdateManNo("system");
                 model01.setUpdateManName("自动匹配更新");
                 model01.setUpdateTime(new Date());
                 model01.setWeightType("0");
@@ -3962,7 +3962,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model01);
                 //修改皮重一次数据状态
                 model02.setValueFlag(DbConstants.NET);
-                model02.setUpdateManName("system");
+                model02.setUpdateManNo("system");
                 model02.setUpdateManName("自动匹配更新");
                 model02.setUpdateTime(new Date());
                 model02.setWeightType("1");
@@ -5636,7 +5636,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             //更新一次数据
             //更新第一次毛重数据库
             grossModel.setValueFlag(DbConstants.NET);
-    //        grossModel.setUpdateManName("system");
+    //        grossModel.setUpdateManNo("system");
     //        grossModel.setUpdateManName("智能计量双委托结净更新");
     //        grossModel.setUpdateTime(new Date());
             grossModel.setWeightType("0");
@@ -5646,7 +5646,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossModel);
             //更新第一次皮重数据库
             tareModel.setValueFlag(DbConstants.NET);
-    //        tareModel.setUpdateManName("system");
+    //        tareModel.setUpdateManNo("system");
     //        tareModel.setUpdateManName("自助计量结净更新");
     //        tareModel.setUpdateTime(new Date());
             tareModel.setWeightType("1");
@@ -5703,7 +5703,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
         } else {
             //更新第一次毛重数据库
             grossModel.setValueFlag(DbConstants.NET);
-    //        grossModel.setUpdateManName("system");
+    //        grossModel.setUpdateManNo("system");
     //        grossModel.setUpdateManName("自助计量结净更新");
     //        grossModel.setUpdateTime(new Date());
             grossModel.setWeightType("0");
@@ -5711,7 +5711,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossModel);
             //更新第一次皮重数据库
             tareModel.setValueFlag(DbConstants.NET);
-    //        tareModel.setUpdateManName("system");
+    //        tareModel.setUpdateManNo("system");
     //        tareModel.setUpdateManName("自助计量结净更新");
     //        tareModel.setUpdateTime(new Date());
             tareModel.setWeightType("1");
@@ -5911,7 +5911,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 //更新一次数据
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("智能计量双委托结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
@@ -5921,7 +5921,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossModel);
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
-                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManNo("system");
                 tareModel.setUpdateManName("自助计量结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setWeightType("1");
@@ -5980,7 +5980,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             } else {
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("自助计量结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
@@ -5988,7 +5988,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossModel);
                 //更新第一次皮重数据库
                 tareModel.setValueFlag(DbConstants.NET);
-                tareModel.setUpdateManName("system");
+                tareModel.setUpdateManNo("system");
                 tareModel.setUpdateManName("自助计量结净更新");
                 tareModel.setUpdateTime(new Date());
                 tareModel.setWeightType("1");
@@ -6035,7 +6035,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
             //更新第一次毛重数据库
             grossModel.setValueFlag(DbConstants.NET);
-            grossModel.setUpdateManName("system");
+            grossModel.setUpdateManNo("system");
             grossModel.setUpdateManName("自助计量结净更新");
             grossModel.setUpdateTime(new Date());
             grossModel.setWeightType("0");
@@ -6043,7 +6043,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(grossModel);
             //更新第一次皮重数据库
             tareModel.setValueFlag(DbConstants.NET);
-            tareModel.setUpdateManName("system");
+            tareModel.setUpdateManNo("system");
             tareModel.setUpdateManName("自助计量结净更新");
             tareModel.setUpdateTime(new Date());
             tareModel.setWeightType("1");
@@ -6174,7 +6174,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
 
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
-                    model01.setUpdateManName("system");
+                    model01.setUpdateManNo("system");
                     model01.setUpdateManName("标识皮结净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
@@ -6184,7 +6184,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
 //                    model02.setValueFlag(DbConstants.NET);
-//                    model02.setUpdateManName("system");
+//                    model02.setUpdateManNo("system");
 //                    model02.setUpdateManName("标识皮结净更新");
 //                    model02.setUpdateTime(new Date());
 //                    model02.setWeightType("1");
@@ -6246,7 +6246,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             } else {
                 //修改毛重一次数据状态
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("标识皮结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
@@ -6254,7 +6254,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(grossModel);
                 //修改皮重一次数据状态
 //                tareModel.setValueFlag(DbConstants.NET);
-//                tareModel.setUpdateManName("system");
+//                tareModel.setUpdateManNo("system");
 //                tareModel.setUpdateManName("标志皮结净更新");
 //                tareModel.setUpdateTime(new Date());
 //                tareModel.setWeightType("1");
@@ -6417,7 +6417,7 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
             } else {
                 //修改毛重一次数据状态
                 grossModel.setValueFlag(DbConstants.NET);
-                grossModel.setUpdateManName("system");
+                grossModel.setUpdateManNo("system");
                 grossModel.setUpdateManName("标准皮结净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
@@ -7395,14 +7395,14 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                 meterWeight = secondTemp.getMeterWeight().subtract(firstTemp.getMeterWeight());
             }
             firstTemp.setValueFlag(DbConstants.NET);
-            firstTemp.setUpdateManName("system");
+            firstTemp.setUpdateManNo("system");
             firstTemp.setUpdateManName("紧急结净更新");
             firstTemp.setUpdateTime(new Date());
             firstTemp.setIsPreSacale("0");
             meterWorkRailwayActFirstBakMapper.updateByPrimaryKey(firstTemp);
             //更新第一次皮重数据库
             secondTemp.setValueFlag(DbConstants.NET);
-            secondTemp.setUpdateManName("system");
+            secondTemp.setUpdateManNo("system");
             secondTemp.setUpdateManName("紧急结净更新");
             secondTemp.setUpdateTime(new Date());
             secondTemp.setIsPreSacale("0");

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -679,6 +679,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public RESTfulResult cleanByfirstNoAndNotes(String actFirstNo01, String actFirstNo02, String predictionNo, String Notes) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
@@ -2962,7 +2963,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 }
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
-//                    firstGross.setUpdateManName("system");
+//                    firstGross.setUpdateManNo("system");
 //                    firstGross.setUpdateManName("结净废除更新");
                     firstGross.setUpdateManNo(userId);
                     firstGross.setUpdateManName(userName);
@@ -3049,7 +3050,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             userName = "admins";
         }
         model.setValueFlag("0");
-        model.setUpdateManName(userId);
+        model.setUpdateManNo(userId);
         model.setUpdateManName(userName);
         model.setUpdateTime(new Date());
         model.setIsPreSacale("0");
@@ -4414,7 +4415,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 //更新第一次毛重数据库
                 actFirst01.setWeightType("0");
                 actFirst01.setValueFlag(DbConstants.NET);
-                actFirst01.setUpdateManName(userId);
+                actFirst01.setUpdateManNo(userId);
                 actFirst01.setUpdateManName(userName);
                 actFirst01.setUpdateTime(new Date());
                 actFirst01.setIsPreSacale("1");
@@ -4425,7 +4426,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 //更新第一次皮重数据库
                 actFirst02.setWeightType("1");
                 actFirst02.setValueFlag(DbConstants.NET);
-                actFirst02.setUpdateManName(userId);
+                actFirst02.setUpdateManNo(userId);
                 actFirst02.setUpdateManName(userName);
                 actFirst02.setUpdateTime(new Date());
                 actFirst02.setIsPreSacale("1");

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/impl/MeterWorkRailwayActualBakServiceImpl.java

@@ -407,7 +407,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             //更新第一次毛重数据库
             actFirst01.setWeightType("0");
             actFirst01.setValueFlag(DbConstants.NET);
-            actFirst01.setUpdateManName("system");
+            actFirst01.setUpdateManNo("system");
             actFirst01.setUpdateManName("匹配结净更新");
             actFirst01.setUpdateTime(new Date());
             actFirst01.setIsPreSacale("1");
@@ -418,7 +418,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             //更新第一次皮重数据库
             actFirst02.setWeightType("1");
             actFirst02.setValueFlag(DbConstants.NET);
-            actFirst02.setUpdateManName("system");
+            actFirst02.setUpdateManNo("system");
             actFirst02.setUpdateManName("匹配结净更新");
             actFirst02.setUpdateTime(new Date());
             actFirst02.setIsPreSacale("1");
@@ -2439,7 +2439,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                 }
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
-//                    firstGross.setUpdateManName("system");
+//                    firstGross.setUpdateManNo("system");
 //                    firstGross.setUpdateManName("结净废除更新");
                     firstGross.setUpdateManNo(userId);
                     firstGross.setUpdateManName(userName);
@@ -2513,7 +2513,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
             userName = "admins";
         }
         model.setValueFlag("0");
-        model.setUpdateManName(userId);
+        model.setUpdateManNo(userId);
         model.setUpdateManName(userName);
         model.setUpdateTime(new Date());
         model.setIsPreSacale("0");

src/main/java/com/steerinfo/meterwork/meterworkzeroalarm/controller/MeterWorkZeroAlarmController.java

@@ -63,6 +63,18 @@ public class MeterWorkZeroAlarmController extends BaseRESTfulController {
         PageList<MeterWorkZeroAlarm> list = meterWorkZeroAlarmService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkzeroalarm:view")
+    @GetMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<MeterWorkZeroAlarm> list = meterWorkZeroAlarmService.likeByDesc(parmas, pageNum, pageSize);
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MeterWorkZeroAlarm对象创建")
     @ApiImplicitParam(name = "meterWorkZeroAlarm", value = "详细实体meterWorkZeroAlarm", required = true, dataType = "MeterWorkZeroAlarm")

src/main/java/com/steerinfo/meterwork/meterworkzeroalarm/mapper/MeterWorkZeroAlarmMapper.java

@@ -4,6 +4,10 @@ import com.steerinfo.meterwork.meterworkzeroalarm.model.MeterWorkZeroAlarm;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
+import java.util.List;
+
 @Mapper
 public interface MeterWorkZeroAlarmMapper extends IBaseMapper<MeterWorkZeroAlarm, String> {
+    List<MeterWorkZeroAlarm> likeByDesc(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkzeroalarm/mapper/MeterWorkZeroAlarmMapper.xml

@@ -516,5 +516,62 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
+  <select id="likeByDesc" resultMap="BaseResultMap" parameterType="hashmap">
+    <include refid="select" />
+    <where>
+      <if test="alarmNo != null and alarmNo != ''">
+        and ALARM_NO = #{alarmNo}
+      </if>
+      <if test="spotTypeNo != null and spotTypeNo != ''">
+        and SPOT_TYPE_NO = #{spotTypeNo}
+      </if>
+      <if test="spotTypeName != null and spotTypeName != ''">
+        and SPOT_TYPE_NAME = #{spotTypeName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="scalePointNo != null and scalePointNo != ''">
+        and SCALE_POINT_NO = #{scalePointNo}
+      </if>
+      <if test="scalePointName != null and scalePointName != ''">
+        and SCALE_POINT_NAME = #{scalePointName}
+      </if>
+      <if test="zeroWeight != null">
+        and ZERO_WEIGHT = #{zeroWeight}
+      </if>
+      <if test="zeroTime != null">
+        and TO_CHAR(ZERO_TIME,'yyyy-MM-dd') = #{zeroTime}
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO = #{createManNo}
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME = #{createManName}
+      </if>
+      <if test="createTime != null">
+        and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+      </if>
+      <if test="updateManNo != null and updateManNo != ''">
+        and UPDATE_MAN_NO = #{updateManNo}
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME = #{updateManName}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="memo != null and memo != ''">
+        and MEMO = #{memo}
+      </if>
+      <if test="validFlag != null and validFlag != ''">
+        and VALID_FLAG = #{validFlag}
+      </if>
+      and ZERO_WEIGHT != 0
+    </where>
+    order by create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkzeroalarm/service/IMeterWorkZeroAlarmService.java

@@ -1,8 +1,12 @@
 package com.steerinfo.meterwork.meterworkzeroalarm.service;
 
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkzeroalarm.model.MeterWorkZeroAlarm;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * MeterWorkZeroAlarm服务接口：
  * @author generator
@@ -24,4 +28,5 @@ public interface IMeterWorkZeroAlarmService extends IBaseService<MeterWorkZeroAl
      * @return
      */
     String doInsertZeroAlarm(MeterWorkZeroAlarm model);
+    PageList<MeterWorkZeroAlarm> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/meterwork/meterworkzeroalarm/service/impl/MeterWorkZeroAlarmServiceImpl.java

@@ -2,6 +2,8 @@ package com.steerinfo.meterwork.meterworkzeroalarm.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkzeroalarm.model.MeterWorkZeroAlarm;
 import com.steerinfo.meterwork.meterworkzeroalarm.mapper.MeterWorkZeroAlarmMapper;
 import com.steerinfo.meterwork.meterworkzeroalarm.service.IMeterWorkZeroAlarmService;
@@ -12,6 +14,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkZeroAlarm服务实现：
@@ -61,4 +65,12 @@ public class MeterWorkZeroAlarmServiceImpl extends BaseServiceImpl<MeterWorkZero
         meterWorkZeroAlarmMapper.insertSelective(model);
         return null;
     }
+
+    @Override
+    public PageList<MeterWorkZeroAlarm> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkZeroAlarm> rows = meterWorkZeroAlarmMapper.likeByDesc(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
 }