后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3547,7 +3547,6 @@
 
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
-    <include refid="whereLike"/>
     <where>
       1=1
       <if test="actualNo != null and actualNo != ''">

src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java

@@ -960,7 +960,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.lastTime = meterWorkMonitor.lastTime;
         this.stopOverTime = meterWorkMonitor.stopOverTime;
         this.msgInfo = meterWorkMonitor.msgInfo;
-        this.wgt = wgt;
+        this.wgt = meterWorkMonitor.wgt;
         this.isRemote = meterWorkMonitor.isRemote;
         this.weighInstrumentModel = meterWorkMonitor.weighInstrumentModel;
         this.weighInstrumentParam = meterWorkMonitor.weighInstrumentParam;

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

@@ -1290,9 +1290,11 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     if (first01.getWeightType().equals("0")) {
                         first02.setUpdateManName("system");
                         first02.setUpdateManName("智能计量混卸一次复制");
+                        firsts.add(model02);
                     } else {
                         first02.setUpdateManName("system");
                         first02.setUpdateManName("智能计量混装一次复制");
+                        firsts.add(model01);
                     }
                     String firstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
                     first02.setActualFirstNo(firstNo);
@@ -1490,15 +1492,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
                 }
-
                 //存储当前计量的数据
                 if (flag.equals("0")) {
                     if (first01.getWeightType().equals("0")) {
                         first02.setUpdateManName("system");
                         first02.setUpdateManName("智能计量混卸一次复制");
+                        firsts.add(model02);
                     } else {
                         first02.setUpdateManName("system");
                         first02.setUpdateManName("智能计量混装一次复制");
+                        firsts.add(model01);
                     }
                     String firstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
                     first02.setActualFirstNo(firstNo);
@@ -3378,6 +3381,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 model02.setPredictionNo(scale.getPredictionNo());
                 model02.setPredictionType("1");
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
+                doSaveTare(model02);
 
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(model01.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(mwca1, actualRow);
@@ -3412,6 +3416,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 model02.setWeightType("1");
                 model02.setIsPreSacale("0");
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
+                doSaveTare(model02);
 
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(model01.getActualFirstNo(), model02.getActualFirstNo());
                 BeanUtils.copyProperties(mwca1, actualRow);
@@ -3468,9 +3473,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             hisTareData.setMeterName(model.getMatterName());
             hisTareData.setMeterTime(model.getCreateTime());
             hisTareData.setMeterWeight(Math.round(model.getMeterWeight().doubleValue()));
-            hisTareData.setUpWeight(model.getMeterWeight().longValue());
+            hisTareData.setUpWeight(tareOne.get(0).getMeterWeight());
             //  (之前的重量*次数)/(次数+1)
-            double meterWeight = (tareOne.get(0).getAvgWeight() * tareOne.get(0).getMeterNum() + tareOne.get(0).getMeterWeight()) / (tareOne.get(0).getMeterNum() + 1);
+            double meterWeight = (tareOne.get(0).getAvgWeight() * tareOne.get(0).getMeterNum() + model.getMeterWeight().longValue()) / (tareOne.get(0).getMeterNum() + 1);
             hisTareData.setAvgWeight(Math.round(meterWeight));//平均皮重
             hisTareData.setMeterNum(tareOne.get(0).getMeterNum() + 1);
             meterBaseRailwayHisTareDataMapper.updateByPrimaryKeySelective(hisTareData);