后端修改

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

@@ -2650,6 +2650,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             first02.setActualFirstNo(firstNo01);
             meterWorkCarActualFirstMapper.insertSelective(first02);
 
+            MeterWorkCarActual actualRow = new MeterWorkCarActual();
             //毛重一次
             MeterWorkCarActualFirst model01 = meterWorkCarActualFirstMapper.selectByPrimaryKey(carModel.getActualFirst1No());
             //皮重一次
@@ -2695,21 +2696,30 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model02);
 
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(first02.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
-                BeanUtils.copyProperties(mwca1, carModel);
+                BeanUtils.copyProperties(mwca1, actualRow);
                 //保存洁净
                 String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                carModel.setActualNo(sdf.format(new Date()) + no);
-                carModel.setNetTime(new Date());
-                carModel.setNetMode(DbConstants.TYPE);
-                carModel.setNote("混装匹配洁净");
-                carModel.setNetMode("4");
-                carModel.setUploadFlag("1");
-                carModel.setValueFlag("1");
-                carModel.setIsPreScale("1");
-                carModel.setPredictionNo(scale.getPredictionNo());
-                carModel.setPredictionType("7");
-                carModel.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
-                meterWorkCarActualMapper.insertSelective(carModel);
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("混装匹配洁净");
+                actualRow.setNetMode("4");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreScale("1");
+                actualRow.setNetManNo(carModel.getNetManNo());
+                actualRow.setNetManName(carModel.getNetManName());
+                actualRow.setNetSpot3No(carModel.getNetSpot3No());
+                actualRow.setNetSpot3Name(carModel.getNetSpot3Name());
+                actualRow.setCreateManName(carModel.getCreateManName());
+                actualRow.setCreateTime(carModel.getCreateTime());
+                actualRow.setUpdateManNo(carModel.getUpdateManNo());
+                actualRow.setUpdateManName(carModel.getUpdateManName());
+                actualRow.setUpdateTime(carModel.getUpdateTime());
+                actualRow.setPredictionNo(scale.getPredictionNo());
+                actualRow.setPredictionType("7");
+                actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
+                meterWorkCarActualMapper.insertSelective(actualRow);
 
             } else if (first02.getWeightType().equals("1")) {         //混卸
                 //修改委托状态
@@ -2750,22 +2760,31 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model01);
 
                 MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(model01.getActualFirstNo(), first02.getActualFirstNo(),  scale.getPredictionNo());
-                BeanUtils.copyProperties(mwca1, carModel);
+                BeanUtils.copyProperties(mwca1, actualRow);
 
                 //保存洁净
                 String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
-                carModel.setActualNo(sdf.format(new Date()) + no);
-                carModel.setNetTime(new Date());
-                carModel.setNetMode(DbConstants.TYPE);
-                carModel.setNote("混卸匹配洁净");
-                carModel.setNetMode("5");
-                carModel.setUploadFlag("1");
-                carModel.setValueFlag("1");
-                carModel.setIsPreScale("1");
-                carModel.setPredictionNo(scale.getPredictionNo());
-                carModel.setPredictionType("6");
-                carModel.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
-                meterWorkCarActualMapper.insertSelective(carModel);
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("混卸匹配洁净");
+                actualRow.setNetMode("5");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreScale("1");
+                actualRow.setNetManNo(carModel.getNetManNo());
+                actualRow.setNetManName(carModel.getNetManName());
+                actualRow.setNetSpot3No(carModel.getNetSpot3No());
+                actualRow.setNetSpot3Name(carModel.getNetSpot3Name());
+                actualRow.setCreateManName(carModel.getCreateManName());
+                actualRow.setCreateTime(carModel.getCreateTime());
+                actualRow.setUpdateManNo(carModel.getUpdateManNo());
+                actualRow.setUpdateManName(carModel.getUpdateManName());
+                actualRow.setUpdateTime(carModel.getUpdateTime());
+                actualRow.setPredictionNo(scale.getPredictionNo());
+                actualRow.setPredictionType("6");
+                actualRow.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
+                meterWorkCarActualMapper.insertSelective(actualRow);
             }
 
             //存储当前计量的数据
@@ -2928,6 +2947,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setUploadFlag("1");
             actualRow1.setValueFlag("1");
             actualRow1.setIsPreScale("1");
+            actualRow1.setNetManNo(two.getNetManNo());
+            actualRow1.setNetManName(two.getNetManName());
+            actualRow1.setNetSpot3No(two.getNetSpot3No());
+            actualRow1.setNetSpot3Name(two.getNetSpot3Name());
+            actualRow1.setCreateManName(two.getCreateManName());
+            actualRow1.setCreateTime(two.getCreateTime());
+            actualRow1.setUpdateManNo(two.getUpdateManNo());
+            actualRow1.setUpdateManName(two.getUpdateManName());
+            actualRow1.setUpdateTime(two.getUpdateTime());
             actualRow1.setPredictionNo(scale01.getPredictionNo());
             actualRow1.setPredictionType("5");
             actualRow1.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
@@ -2943,6 +2971,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setValueFlag("1");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreScale("1");
+            actualRow2.setNetManNo(two.getNetManNo());
+            actualRow2.setNetManName(two.getNetManName());
+            actualRow2.setNetSpot3No(two.getNetSpot3No());
+            actualRow2.setNetSpot3Name(two.getNetSpot3Name());
+            actualRow2.setCreateManName(two.getCreateManName());
+            actualRow2.setCreateTime(two.getCreateTime());
+            actualRow2.setUpdateManNo(two.getUpdateManNo());
+            actualRow2.setUpdateManName(two.getUpdateManName());
+            actualRow2.setUpdateTime(two.getUpdateTime());
             actualRow2.setPredictionNo(scale02.getPredictionNo());
             actualRow2.setPredictionType("5");
             actualRow2.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());

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

@@ -555,6 +555,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             first02.setActualFirstNo(firstNo01);
             meterWorkRailwayActFirstMapper.insertSelective(first02);
 
+            MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
             //毛重一次
             MeterWorkRailwayActFirst model01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(carModel.getActualFirst1No());
             //皮重一次
@@ -600,21 +601,30 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
 
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(first02.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
-                BeanUtils.copyProperties(mwca1, carModel);
+                BeanUtils.copyProperties(mwca1, actualRow);
                 //保存洁净
                 String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
-                carModel.setActualNo(sdf.format(new Date()) + no);
-                carModel.setNetTime(new Date());
-                carModel.setNetMode(DbConstants.TYPE);
-                carModel.setNote("混装匹配洁净");
-                carModel.setNetMode("4");
-                carModel.setUploadFlag("1");
-                carModel.setValueFlag("1");
-                carModel.setIsPreSacale("1");
-                carModel.setPredictionNo(scale.getPredictionNo());
-                carModel.setPredictionType("7");
-                carModel.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
-                meterWorkRailwayActualMapper.insertSelective(carModel);
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("混装匹配洁净");
+                actualRow.setNetMode("4");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreSacale("1");
+                actualRow.setNetManNo(carModel.getNetManNo());
+                actualRow.setNetManName(carModel.getNetManName());
+                actualRow.setNetSpot3No(carModel.getNetSpot3No());
+                actualRow.setNetSpot3Name(carModel.getNetSpot3Name());
+                actualRow.setCreateManName(carModel.getCreateManName());
+                actualRow.setCreateTime(carModel.getCreateTime());
+                actualRow.setUpdateManNo(carModel.getUpdateManNo());
+                actualRow.setUpdateManName(carModel.getUpdateManName());
+                actualRow.setUpdateTime(carModel.getUpdateTime());
+                actualRow.setPredictionNo(scale.getPredictionNo());
+                actualRow.setPredictionType("7");
+                actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
+                meterWorkRailwayActualMapper.insertSelective(actualRow);
 
             } else if (first02.getWeightType().equals("1")) {         //混卸
                 //修改委托状态
@@ -655,22 +665,31 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
 
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(model01.getActualFirstNo(), first02.getActualFirstNo(),  scale.getPredictionNo());
-                BeanUtils.copyProperties(mwca1, carModel);
+                BeanUtils.copyProperties(mwca1, actualRow);
 
                 //保存洁净
                 String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
-                carModel.setActualNo(sdf.format(new Date()) + no);
-                carModel.setNetTime(new Date());
-                carModel.setNetMode(DbConstants.TYPE);
-                carModel.setNote("混卸匹配洁净");
-                carModel.setNetMode("5");
-                carModel.setUploadFlag("1");
-                carModel.setValueFlag("1");
-                carModel.setIsPreSacale("1");
-                carModel.setPredictionNo(scale.getPredictionNo());
-                carModel.setPredictionType("6");
-                carModel.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
-                meterWorkRailwayActualMapper.insertSelective(carModel);
+                actualRow.setActualNo(sdf.format(new Date()) + no);
+                actualRow.setNetTime(new Date());
+                actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setNote("混卸匹配洁净");
+                actualRow.setNetMode("5");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setIsPreSacale("1");
+                actualRow.setNetManNo(carModel.getNetManNo());
+                actualRow.setNetManName(carModel.getNetManName());
+                actualRow.setNetSpot3No(carModel.getNetSpot3No());
+                actualRow.setNetSpot3Name(carModel.getNetSpot3Name());
+                actualRow.setCreateManName(carModel.getCreateManName());
+                actualRow.setCreateTime(carModel.getCreateTime());
+                actualRow.setUpdateManNo(carModel.getUpdateManNo());
+                actualRow.setUpdateManName(carModel.getUpdateManName());
+                actualRow.setUpdateTime(carModel.getUpdateTime());
+                actualRow.setPredictionNo(scale.getPredictionNo());
+                actualRow.setPredictionType("6");
+                actualRow.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
+                meterWorkRailwayActualMapper.insertSelective(actualRow);
             }
 
             //存储当前计量的数据
@@ -832,6 +851,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow1.setUploadFlag("1");
             actualRow1.setValueFlag("1");
             actualRow1.setIsPreSacale("1");
+            actualRow1.setNetManNo(two.getNetManNo());
+            actualRow1.setNetManName(two.getNetManName());
+            actualRow1.setNetSpot3No(two.getNetSpot3No());
+            actualRow1.setNetSpot3Name(two.getNetSpot3Name());
+            actualRow1.setCreateManName(two.getCreateManName());
+            actualRow1.setCreateTime(two.getCreateTime());
+            actualRow1.setUpdateManNo(two.getUpdateManNo());
+            actualRow1.setUpdateManName(two.getUpdateManName());
+            actualRow1.setUpdateTime(two.getUpdateTime());
+            actualRow1.setPredictionNo(scale01.getPredictionNo());
             actualRow1.setPredictionNo(scale01.getPredictionNo());
             actualRow1.setPredictionType("5");
             actualRow1.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
@@ -847,6 +876,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setValueFlag("1");
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreSacale("1");
+            actualRow2.setNetManNo(two.getNetManNo());
+            actualRow2.setNetManName(two.getNetManName());
+            actualRow2.setNetSpot3No(two.getNetSpot3No());
+            actualRow2.setNetSpot3Name(two.getNetSpot3Name());
+            actualRow2.setCreateManName(two.getCreateManName());
+            actualRow2.setCreateTime(two.getCreateTime());
+            actualRow2.setUpdateManNo(two.getUpdateManNo());
+            actualRow2.setUpdateManName(two.getUpdateManName());
+            actualRow2.setUpdateTime(two.getUpdateTime());
             actualRow2.setPredictionNo(scale02.getPredictionNo());
             actualRow2.setPredictionType("5");
             actualRow2.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());