特殊委托操作修改

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

@@ -3783,6 +3783,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Override
     public String mixedLoading(String actualNo1, String actualNo2, String actualNo3, String predictionNo1, String predictionNo2) {
         try{
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
+
             //查询所有的一次数据
             MeterWorkCarActualFirst mwcaf1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo1);
             MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo2);
@@ -3845,8 +3856,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //更新一次数据
             //更新第一次皮重数据
             mwcaf1.setValueFlag(DbConstants.NET);
-            mwcaf1.setUpdateManName("system");
-            mwcaf1.setUpdateManName("混装结净更新");
+            mwcaf1.setUpdateManNo(userId);
+            mwcaf1.setUpdateManName(userName);
+            mwcaf1.setNote("手动混装结净更新");
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreScale("1");
             mwcaf1.setWeightType("1");
@@ -3856,8 +3868,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次毛重数据
             mwcaf2.setValueFlag(DbConstants.NET);
-            mwcaf2.setUpdateManName("system");
-            mwcaf2.setUpdateManName("混装结净更新");
+            mwcaf2.setUpdateManNo(userId);
+            mwcaf2.setUpdateManName(userName);
+            mwcaf2.setNote("手动混装结净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreScale("1");
             mwcaf2.setWeightType("0");
@@ -3875,20 +3888,21 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
 
             mwcaf3.setValueFlag(DbConstants.NET);
-            mwcaf3.setUpdateManName("system");
-            mwcaf3.setUpdateManName("混装结净更新");
+            mwcaf3.setUpdateManNo(userId);
+            mwcaf3.setUpdateManName(userName);
+            mwcaf3.setNote("手动混装结净更新");
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreScale("1");
             mwcaf3.setWeightType("1");
             mwcaf3.setPredictionNo(predictionNo2);
             mwcaf3.setPredictionType("7");
             mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            mwcaf3.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
             //更新第二次毛重数据
             mwcaf4.setValueFlag(DbConstants.NET);
-            mwcaf4.setUpdateManName("system");
-            mwcaf4.setUpdateManName("混装结净更新");
+            mwcaf4.setUpdateManNo(userId);
+            mwcaf4.setUpdateManName(userName);
+            mwcaf4.setNote("手动混装结净更新");
             mwcaf4.setUpdateTime(new Date());
             mwcaf4.setIsPreScale("1");
             mwcaf4.setWeightType("0");
@@ -3908,15 +3922,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             String no = PublicMethod.IdCreate(3);
             actualRow1.setActualNo(no);
-            actualRow1.setNetTime(new Date());
-            actualRow1.setNetMode(DbConstants.TYPE);
-            actualRow1.setNote("混装匹配结净");
             actualRow1.setNetMode("4");
             actualRow1.setUploadFlag("1");
             actualRow1.setIsPreScale("1");
             actualRow1.setValueFlag("1");
-            actualRow1.setCreateTime(new Date());
-            actualRow1.setCreateManName("混装匹配结净");
             actualRow1.setPredictionType("7");
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setPredictionNo(predictionNo1);
@@ -3938,6 +3947,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow1.setCreateTime(actualRow1.getTareTime());
                 actualRow1.setCreateManName(actualRow1.getTareManName());
             }
+            actualRow1.setUpdateManNo(userId);
+            actualRow1.setUpdateManName(userName);
+            actualRow1.setNote("手动混装匹配结净");
+            actualRow1.setUpdateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
@@ -3945,15 +3958,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             String no1 = PublicMethod.IdCreate(3);
             actualRow2.setActualNo(no1);
-            actualRow2.setNetTime(new Date());
-            actualRow2.setNetMode(DbConstants.TYPE);
-            actualRow2.setNote("混装匹配结净");
             actualRow2.setNetMode("4");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreScale("1");
             actualRow2.setValueFlag("1");
-            actualRow2.setCreateTime(new Date());
-            actualRow2.setCreateManName("混装匹配结净");
             actualRow2.setPredictionType("7");
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setPredictionNo(predictionNo2);
@@ -3975,6 +3983,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow2.setCreateTime(actualRow2.getTareTime());
                 actualRow2.setCreateManName(actualRow2.getTareManName());
             }
+            actualRow2.setUpdateManNo(userId);
+            actualRow2.setUpdateManName(userName);
+            actualRow2.setNote("手动混装匹配结净");
+            actualRow2.setUpdateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
             //更新预报数据
@@ -3982,8 +3994,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale.setPredictionNo(predictionNo1);
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("混装结净更新");
+            scale.setUpdateManNo(userId);
+            scale.setUpdateManName(userName);
             scale.setPredictionType("7");
             scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             scale.setUploadFlag("1");
@@ -3995,8 +4007,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setPredictionNo(predictionNo2);
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("混装结净更新");
+            scale1.setUpdateManNo(userId);
+            scale1.setUpdateManName(userName);
             scale1.setPredictionType("7");
             scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             scale1.setUploadFlag("1");
@@ -4014,6 +4026,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Override
     public String mixedDischarge(String actualNo1, String actualNo2, String actualNo3, String predictionNo1, String predictionNo2) {
         try{
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
+
             //查询所有的一次数据
             MeterWorkCarActualFirst mwcaf1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo1);
             MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo2);
@@ -4075,8 +4098,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //更新一次数据
             //更新第一次毛重数据
             mwcaf1.setValueFlag(DbConstants.NET);
-            mwcaf1.setUpdateManNo("system");
-            mwcaf1.setUpdateManName("混卸结净更新");
+            mwcaf1.setUpdateManNo(userId);
+            mwcaf1.setUpdateManName(userName);
+            mwcaf1.setNote("手动混卸结净更新");
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreScale("1");
             mwcaf1.setWeightType("0");
@@ -4086,8 +4110,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次皮重数据
             mwcaf2.setValueFlag(DbConstants.NET);
-            mwcaf2.setUpdateManNo("system");
-            mwcaf2.setUpdateManName("混卸结净更新");
+            mwcaf2.setUpdateManNo(userId);
+            mwcaf2.setUpdateManName(userName);
+            mwcaf2.setNote("手动混卸结净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreScale("1");
             mwcaf2.setWeightType("1");
@@ -4102,22 +4127,22 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 //            mwcaf3.setActualFirstNo(actualFirstNo);
             String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf3.setActualFirstNo(actualFirstNo);
-
             mwcaf3.setValueFlag(DbConstants.NET);
-            mwcaf3.setUpdateManNo("system");
-            mwcaf3.setUpdateManName("混卸结净更新");
+            mwcaf3.setUpdateManNo(userId);
+            mwcaf3.setUpdateManName(userName);
+            mwcaf3.setNote("手动混卸结净更新");
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreScale("1");
             mwcaf3.setWeightType("0");
             mwcaf3.setPredictionNo(predictionNo2);
             mwcaf3.setPredictionType("6");
             mwcaf3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            mwcaf3.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf3);
             //更新第二次皮重数据
             mwcaf4.setValueFlag(DbConstants.NET);
-            mwcaf4.setUpdateManNo("system");
-            mwcaf4.setUpdateManName("混卸结净更新");
+            mwcaf4.setUpdateManNo(userId);
+            mwcaf4.setUpdateManName(userName);
+            mwcaf4.setNote("手动混卸结净更新");
             mwcaf4.setUpdateTime(new Date());
             mwcaf4.setIsPreScale("1");
             mwcaf4.setWeightType("1");
@@ -4137,15 +4162,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             String no = PublicMethod.IdCreate(3);
             actualRow1.setActualNo(no);
-            actualRow1.setNetTime(new Date());
-            actualRow1.setNetMode(DbConstants.TYPE);
-            actualRow1.setNote("混卸匹配结净");
             actualRow1.setNetMode("5");
             actualRow1.setUploadFlag("1");
             actualRow1.setIsPreScale("1");
             actualRow1.setValueFlag("1");
-            actualRow1.setCreateManName("混卸匹配结净");
-            actualRow1.setCreateTime(new Date());
             actualRow1.setPredictionType("6");
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setPredictionNo(predictionNo1);
@@ -4167,21 +4187,20 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow1.setCreateTime(actualRow1.getTareTime());
                 actualRow1.setCreateManName(actualRow1.getTareManName());
             }
+            actualRow1.setUpdateManNo(userId);
+            actualRow1.setUpdateManName(userName);
+            actualRow1.setNote("手动混卸匹配结净");
+            actualRow1.setUpdateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow1);
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
 
             String no1 = PublicMethod.IdCreate(3);
             actualRow2.setActualNo(no1);
-            actualRow2.setNetTime(new Date());
-            actualRow2.setNetMode(DbConstants.TYPE);
-            actualRow2.setNote("混卸匹配结净");
             actualRow2.setNetMode("5");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreScale("1");
             actualRow2.setValueFlag("1");
-            actualRow2.setCreateManName("混卸匹配结净");
-            actualRow2.setCreateTime(new Date());
             actualRow2.setPredictionType("6");
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setPredictionNo(predictionNo2);
@@ -4203,6 +4222,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow2.setCreateTime(actualRow2.getTareTime());
                 actualRow2.setCreateManName(actualRow2.getTareManName());
             }
+            actualRow2.setUpdateManNo(userId);
+            actualRow2.setUpdateManName(userName);
+            actualRow2.setNote("手动混卸匹配结净");
+            actualRow2.setUpdateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
             //更新预报数据
@@ -4210,8 +4233,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale.setPredictionNo(predictionNo1);
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("混卸结净更新");
+            scale.setUpdateManNo(userId);
+            scale.setUpdateManName(userName);
             scale.setUploadFlag("1");
             scale.setValueFlag("2");
             //预报类型：双委托（5）、预报组合：A预报，B预报
@@ -4225,8 +4248,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setPredictionNo(predictionNo2);
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("混卸结净更新");
+            scale1.setUpdateManNo(userId);
+            scale1.setUpdateManName(userName);
             scale1.setUploadFlag("1");
             scale1.setValueFlag("2");
             scale1.setPredictionType("6");
@@ -4248,6 +4271,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         rm.setFailed();
 
         try{
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
+
             //查询出一次计量数据
             MeterWorkCarActualFirst mwcaf01 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo1);
             MeterWorkCarActualFirst mwcaf02 = meterWorkCarActualFirstMapper.selectByPrimaryKey(actualNo1);
@@ -4365,8 +4399,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             //更新一次数据
             //更新第一次毛重数据库
             mwcaf01.setValueFlag(DbConstants.NET);
-            mwcaf01.setUpdateManName("system");
-            mwcaf01.setUpdateManName("双委托结净更新");
+            mwcaf01.setUpdateManName(userId);
+            mwcaf01.setUpdateManName(userName);
+            mwcaf01.setNote("双委托结净更新");
             mwcaf01.setUpdateTime(new Date());
             mwcaf01.setIsPreScale("1");
             mwcaf01.setWeightType("0");
@@ -4376,8 +4411,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf01);
             //更新第一次皮重数据库
             mwcaf02.setValueFlag(DbConstants.NET);
-            mwcaf02.setUpdateManName("system");
-            mwcaf02.setUpdateManName("双委托结净更新");
+            mwcaf02.setUpdateManName(userId);
+            mwcaf02.setUpdateManName(userName);
+            mwcaf02.setNote("手动双委托结净更新");
             mwcaf02.setUpdateTime(new Date());
             mwcaf02.setIsPreScale("1");
             mwcaf02.setWeightType("1");
@@ -4394,15 +4430,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf03.setActualFirstNo(actualFirstNo);
 
             mwcaf03.setValueFlag(DbConstants.NET);
-            mwcaf03.setUpdateManName("system");
-            mwcaf03.setUpdateManName("双委托结净更新");
+            mwcaf03.setUpdateManName(userId);
+            mwcaf03.setUpdateManName(userName);
+            mwcaf03.setNote("手动双委托结净更新");
             mwcaf03.setUpdateTime(new Date());
             mwcaf03.setIsPreScale("1");
             mwcaf03.setWeightType("0");
             mwcaf03.setPredictionNo(predictionNo2);
             mwcaf03.setPredictionType("5");
             mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            mwcaf03.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf03);
             //添加第二次皮重数据库
             SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
@@ -4413,15 +4449,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwcaf04.setActualFirstNo(actualSecondNo);
 
             mwcaf04.setValueFlag(DbConstants.NET);
-            mwcaf04.setUpdateManName("system");
-            mwcaf04.setUpdateManName("双委托结净更新");
+            mwcaf04.setUpdateManName(userId);
+            mwcaf04.setUpdateManName(userName);
+            mwcaf04.setNote("手动双委托结净更新");
             mwcaf04.setUpdateTime(new Date());
             mwcaf04.setIsPreScale("1");
             mwcaf04.setWeightType("1");
             mwcaf04.setPredictionNo(predictionNo2);
             mwcaf04.setPredictionType("5");
             mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            mwcaf04.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(mwcaf04);
 
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
@@ -4437,7 +4473,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setActualNo(no);
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
-            actualRow1.setNote("双委托匹配结净");
             actualRow1.setNetMode("3");
             actualRow1.setUploadFlag("1");
             actualRow1.setIsPreScale("1");
@@ -4464,6 +4499,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow1.setCreateTime(actualRow1.getTareTime());
                 actualRow1.setCreateManName(actualRow1.getTareManName());
             }
+            actualRow1.setUpdateManNo(userId);
+            actualRow1.setUpdateManName(userName);
+            actualRow1.setUpdateTime(new Date());
+            actualRow1.setNote("手动双委托匹配结净");
             meterWorkCarActualMapper.insertSelective(actualRow1);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
@@ -4472,7 +4511,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setActualNo(no1);
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
-            actualRow2.setNote("双委托匹配结净");
             actualRow2.setNetMode("3");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreScale("1");
@@ -4499,6 +4537,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow2.setCreateTime(actualRow2.getTareTime());
                 actualRow2.setCreateManName(actualRow2.getTareManName());
             }
+            actualRow2.setUpdateManNo(userId);
+            actualRow2.setUpdateManName(userName);
+            actualRow2.setUpdateTime(new Date());
+            actualRow2.setNote("手动双委托匹配结净");
             meterWorkCarActualMapper.insertSelective(actualRow2);
 
             //更新预报数据
@@ -4506,8 +4548,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale.setPredictionNo(predictionNo1);
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("双委托结净更新");
+            scale.setUpdateManNo(userId);
+            scale.setUpdateManName(userName);
             scale.setUploadFlag("1");
             scale.setPredictionType("5");
             scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
@@ -4519,8 +4561,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setPredictionNo(predictionNo2);
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("双委托结净更新");
+            scale1.setUpdateManNo(userId);
+            scale1.setUpdateManName(userName);
             scale1.setUploadFlag("1");
             scale1.setPredictionType("5");
             scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);