'提交'

src/main/java/com/steerinfo/SysManageApplication.java

@@ -71,7 +71,8 @@ public class SysManageApplication implements WebMvcConfigurer {
         FastJsonConfig fastJsonConfig = new FastJsonConfig();
         // 3.添加配置
         fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");                       // 自定义时间格式
-        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue); // 正常转换 null 值
+        fastJsonConfig.setSerializerFeatures(SerializerFeature.WriteMapNullValue
+                ,SerializerFeature.WriteNullStringAsEmpty); // 正常转换 null 值
         SerializeConfig serializeConfig = SerializeConfig.getGlobalInstance();
         serializeConfig.put(Float.TYPE, ToStringSerializer.instance);
         serializeConfig.put(Float.class, ToStringSerializer.instance);

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

@@ -2531,6 +2531,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     public String doubleEntrustMatch(String actualNo1, String actualNo2, String predictionNo1, String predictionNo2) {
 
         try {
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "admin";
+                userName = "admins";
+            }
             //查询出一次计量数据
             MeterWorkRailwayActFirst mwcaf01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo1);
             MeterWorkRailwayActFirst mwcaf02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo1);
@@ -2584,71 +2594,71 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             //将委托中的编号和收发货的等数据拷贝进一次数据中
             MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(actualNo1, predictionNo1);
-            BeanUtils.copyProperties(first1, mwcaf01);
+//            BeanUtils.copyProperties(first1, mwcaf01);
             MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(actualNo2, predictionNo1);
-            BeanUtils.copyProperties(first2, mwcaf02);
+//            BeanUtils.copyProperties(first2, mwcaf02);
             MeterWorkRailwayActFirst first3 = meterWorkRailwayActFirstMapper.selectAndMatch(actualNo1, predictionNo2);
-            BeanUtils.copyProperties(first3, mwcaf03);
+//            BeanUtils.copyProperties(first3, mwcaf03);
             MeterWorkRailwayActFirst first4 = meterWorkRailwayActFirstMapper.selectAndMatch(actualNo2, predictionNo2);
-            BeanUtils.copyProperties(first4, mwcaf04);
+//            BeanUtils.copyProperties(first4, mwcaf04);
 
             //更新一次数据
             //更新第一次毛重数据库
-            mwcaf01.setValueFlag(DbConstants.NET);
-            mwcaf01.setUpdateManNo("system");
-            mwcaf01.setUpdateManName("双委托结净更新");
-            mwcaf01.setUpdateTime(new Date());
-            mwcaf01.setIsPreSacale("1");
-            mwcaf01.setWeightType("0");
-            mwcaf01.setPredictionNo(predictionNo1);
-            mwcaf01.setPredictionType("5");
-            mwcaf01.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf01);
+            first1.setValueFlag(DbConstants.NET);
+            first1.setUpdateManNo(userId);
+            first1.setUpdateManName(userName);
+            first1.setUpdateTime(new Date());
+            first1.setIsPreSacale("1");
+            first1.setWeightType("0");
+            first1.setPredictionNo(predictionNo1);
+            first1.setPredictionType("5");
+            first1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkRailwayActFirstMapper.updateByPrimaryKey(first1);
             //更新第一次皮重数据库
-            mwcaf02.setValueFlag(DbConstants.NET);
-            mwcaf02.setUpdateManNo("system");
-            mwcaf02.setUpdateManName("双委托结净更新");
-            mwcaf02.setUpdateTime(new Date());
-            mwcaf02.setIsPreSacale("1");
-            mwcaf02.setWeightType("1");
-            mwcaf02.setPredictionNo(predictionNo1);
-            mwcaf02.setPredictionType("5");
-            mwcaf02.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf02);
+            first2.setValueFlag(DbConstants.NET);
+            first2.setUpdateManNo(userId);
+            first2.setUpdateManName(userName);
+            first2.setUpdateTime(new Date());
+            first2.setIsPreSacale("1");
+            first2.setWeightType("1");
+            first2.setPredictionNo(predictionNo1);
+            first2.setPredictionType("5");
+            first2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkRailwayActFirstMapper.updateByPrimaryKey(first2);
             //添加第一次毛重数据库
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
 //            String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
 //            mwcaf03.setActualFirstNo(actualFirstNo);
             String actualFirstNo = PublicMethod.IdCreate(3);
-            mwcaf03.setActualFirstNo(actualFirstNo);
-            mwcaf03.setValueFlag(DbConstants.NET);
-            mwcaf03.setUpdateManNo("system");
-            mwcaf03.setUpdateManName("双委托结净更新");
-            mwcaf03.setUpdateTime(new Date());
-            mwcaf03.setIsPreSacale("1");
-            mwcaf03.setWeightType("0");
-            mwcaf03.setPredictionNo(predictionNo2);
-            mwcaf03.setPredictionType("5");
-            mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkRailwayActFirstMapper.insertSelective(mwcaf03);
+            first3.setActualFirstNo(actualFirstNo);
+            first3.setValueFlag(DbConstants.NET);
+            first3.setUpdateManNo(userId);
+            first3.setUpdateManName(userName);
+            first3.setUpdateTime(new Date());
+            first3.setIsPreSacale("1");
+            first3.setWeightType("0");
+            first3.setPredictionNo(predictionNo2);
+            first3.setPredictionType("5");
+            first3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkRailwayActFirstMapper.insertSelective(first3);
             //添加第二次皮重数据库
             SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
             String afl01 = sdf01.format(new Date());
 //            String actualSecondNo = sdf01.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl01);
 //            mwcaf04.setActualFirstNo(actualSecondNo);
             String actualSecondNo = PublicMethod.IdCreate(3);
-            mwcaf04.setActualFirstNo(actualSecondNo);
-            mwcaf04.setValueFlag(DbConstants.NET);
-            mwcaf04.setUpdateManNo("system");
-            mwcaf04.setUpdateManName("双委托结净更新");
-            mwcaf04.setUpdateTime(new Date());
-            mwcaf04.setIsPreSacale("1");
-            mwcaf04.setWeightType("1");
-            mwcaf04.setPredictionNo(predictionNo2);
-            mwcaf04.setPredictionType("5");
-            mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkRailwayActFirstMapper.insertSelective(mwcaf04);
+            first4.setActualFirstNo(actualSecondNo);
+            first4.setValueFlag(DbConstants.NET);
+            first4.setUpdateManNo(userId);
+            first4.setUpdateManName(userName);
+            first4.setUpdateTime(new Date());
+            first4.setIsPreSacale("1");
+            first4.setWeightType("1");
+            first4.setPredictionNo(predictionNo2);
+            first4.setPredictionType("5");
+            first4.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkRailwayActFirstMapper.insertSelective(first4);
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
             MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
             BeanUtils.copyProperties(mwca1, actualRow1);
@@ -2663,6 +2673,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
             actualRow1.setNote("双委托匹配结净");
+            actualRow1.setMemo("双委托匹配结净");
             actualRow1.setNetMode("3");
             actualRow1.setUploadFlag("1");
             actualRow1.setValueFlag("1");
@@ -2670,7 +2681,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setPredictionType("5");
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
+            actualRow1.setNetWeight(first1.getMeterWeight().subtract(first2.getMeterWeight()));
             if(actualRow1.getGrossTime().compareTo(actualRow1.getTareTime()) >= 0) {
                 actualRow1.setNetSpot3No(actualRow1.getBaseSpot1No());
                 actualRow1.setNetSpot3Name(actualRow1.getBaseSpot1Name());
@@ -2690,6 +2701,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow1.setCreateManName(actualRow1.getTareManName());
                 actualRow1.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow1.getActualFirst2No()));
             }
+            actualRow1.setUpdateManNo(userId);
+            actualRow1.setUpdateManName(userName);
+            actualRow1.setUpdateTime(new Date());
             meterWorkRailwayActualMapper.insertSelective(actualRow1);
 
 //            String no1 = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
@@ -2699,6 +2713,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
             actualRow2.setNote("双委托匹配结净");
+            actualRow2.setMemo("双委托匹配结净");
             actualRow2.setNetMode("3");
             actualRow2.setValueFlag("1");
             actualRow2.setUploadFlag("1");
@@ -2706,7 +2721,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setPredictionType("5");
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
+            actualRow2.setNetWeight(first3.getMeterWeight().subtract(first4.getMeterWeight()));
             if(actualRow2.getGrossTime().compareTo(actualRow2.getTareTime()) >= 0) {
                 actualRow2.setNetSpot3No(actualRow2.getBaseSpot1No());
                 actualRow2.setNetSpot3Name(actualRow2.getBaseSpot1Name());
@@ -2726,6 +2741,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow2.setCreateManName(actualRow2.getTareManName());
                 actualRow2.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow2.getActualFirst2No()));
             }
+            actualRow2.setUpdateManNo(userId);
+            actualRow2.setUpdateManName(userName);
+            actualRow2.setUpdateTime(new Date());
             meterWorkRailwayActualMapper.insertSelective(actualRow2);
 
             //更新预报数据
@@ -2733,8 +2751,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             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);
@@ -2746,14 +2764,40 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             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);
             scale1.setMeasureStation(actualRow2.getNetSpot3No());
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale1);
+
+            MeterBaseOperationLog logModel01 = new MeterBaseOperationLog();
+            logModel01.setId(PublicMethod.IdCreate(2));
+            logModel01.setCreateManNo(userId);
+            logModel01.setCreateManName(userName);
+            logModel01.setCreateTime(new Date());
+            logModel01.setOperationPage("web端-轨道衡一次数据维护");
+            logModel01.setOperationFunction("双委托结净");
+            logModel01.setOperationId(actualRow1.getActualNo());
+            logModel01.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualRow1.getActualFirst1No() + "," + actualRow1.getActualFirst2No());
+            logModel01.setOperationCarnNo(actualRow1.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel01);
+
+            MeterBaseOperationLog logModel02 = new MeterBaseOperationLog();
+            logModel02.setId(PublicMethod.IdCreate(2));
+            logModel02.setCreateManNo(userId);
+            logModel02.setCreateManName(userName);
+            logModel02.setCreateTime(new Date());
+            logModel02.setOperationPage("web端-轨道衡一次数据维护");
+            logModel02.setOperationFunction("双委托结净");
+            logModel02.setOperationId(actualRow2.getActualNo());
+            logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel02.setOperationBeforeFix(actualRow2.getActualFirst1No() + "," + actualRow2.getActualFirst2No());
+            logModel02.setOperationCarnNo(actualRow2.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel02);
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -2912,7 +2956,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow1.setActualNo(PublicMethod.IdCreate(3));
             actualRow1.setNetTime(new Date());
             actualRow1.setNetMode(DbConstants.TYPE);
-            actualRow1.setNote("双委托匹配结净");
+            actualRow1.setNote("标识皮双委托结净");
+            actualRow1.setMemo("标识皮双委托结净");
             actualRow1.setNetMode("2");
             actualRow1.setUploadFlag("1");
             actualRow1.setValueFlag("1");
@@ -2948,7 +2993,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setActualNo(PublicMethod.IdCreate(3));
             actualRow2.setNetTime(new Date());
             actualRow2.setNetMode(DbConstants.TYPE);
-            actualRow2.setNote("双委托匹配结净");
+            actualRow2.setNote("标识皮双委托结净");
+            actualRow2.setMemo("标识皮双委托结净");
             actualRow2.setNetMode("2");
             actualRow2.setValueFlag("1");
             actualRow2.setUploadFlag("1");
@@ -2981,6 +3027,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setUpdateTime(new Date());
             meterWorkRailwayActualMapper.insertSelective(actualRow2);
 
+            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(tareNo1);
+            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(tareNo2);
+
             //更新预报数据
             PreRailwayScale scale1 = new PreRailwayScale();
             scale1.setPredictionNo(predictionNo1);
@@ -3007,6 +3056,32 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale2.setMeasureStation(actualRow2.getNetSpot3No());
             scale2.setMeasureStationName(actualRow2.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale2);
+
+            MeterBaseOperationLog logModel01 = new MeterBaseOperationLog();
+            logModel01.setId(PublicMethod.IdCreate(2));
+            logModel01.setCreateManNo(userId);
+            logModel01.setCreateManName(userName);
+            logModel01.setCreateTime(new Date());
+            logModel01.setOperationPage("web端-轨道衡一次数据维护");
+            logModel01.setOperationFunction("标识皮双委托结净");
+            logModel01.setOperationId(actualRow1.getActualNo());
+            logModel01.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualRow1.getActualFirst1No() + "," + actualRow1.getActualFirst2No());
+            logModel01.setOperationCarnNo(actualRow1.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel01);
+
+            MeterBaseOperationLog logModel02 = new MeterBaseOperationLog();
+            logModel02.setId(PublicMethod.IdCreate(2));
+            logModel02.setCreateManNo(userId);
+            logModel02.setCreateManName(userName);
+            logModel02.setCreateTime(new Date());
+            logModel02.setOperationPage("web端-轨道衡一次数据维护");
+            logModel02.setOperationFunction("标识皮双委托结净");
+            logModel02.setOperationId(actualRow2.getActualNo());
+            logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel02.setOperationBeforeFix(actualRow2.getActualFirst1No() + "," + actualRow2.getActualFirst2No());
+            logModel02.setOperationCarnNo(actualRow2.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel02);
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();