期限皮重修改

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

@@ -4047,6 +4047,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
                 netDb.setNetWeight(net);
             }
+            netDb.setNetTime(new Date());
             netDb.setUploadFlag("1");
             netDb.setActualFirst1No(secondDb.getActualFirstNo());
             netDb.setCreateTime(new Date());
@@ -4078,7 +4079,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
             imTare.setBaseSpotName(mbttd.getBaseSpotName());
             imTare.setCarNo(mbttd.getCarNo());
-            imTare.setCreateTime(mbttd.getCreateTime());
+            imTare.setCreateTime(mbttd.getMeterTime());
             imTare.setCreateManNo(mbttd.getCreateManNo());
             imTare.setCreateManName(mbttd.getCreateManName());
             imTare.setMeterWeight(mbttd.getMeterWeight());
@@ -4091,7 +4092,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwca.setActualNo(netDb.getActualNo());
             mwca.setActualFirst2No(actualNo);
             mwca.setTareWeight(mbttd.getMeterWeight());
-            mwca.setNetTime(imTare.getCreateTime());
+            //新增修改结净数据汇总皮重计量点和时间   --20220724杜勇
+            mwca.setTareTime(mbttd.getMeterTime());
+            mwca.setBaseSpot2No(mbttd.getBaseSpotNo());
+            mwca.setBaseSpot2Name(mbttd.getBaseSpotName());
             mwca.setNetWeight(secondDb.getMeterWeight().subtract(imTare.getMeterWeight()));
             meterWorkCarActualMapper.updateByPrimaryKeySelective(mwca);
 
@@ -4766,20 +4770,24 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             imTare.setBaseSpotNo(termData.getBaseSpotNo());
             imTare.setBaseSpotName(termData.getBaseSpotName());
             imTare.setCarNo(termData.getCarNo());
-            imTare.setCreateTime(termData.getCreateTime());
+            imTare.setCreateTime(termData.getMeterTime());
             imTare.setCreateManNo(termData.getCreateManNo());
             imTare.setCreateManName(termData.getCreateManName());
             imTare.setMeterWeight(termData.getMeterWeight());
             imTare.setWeightType("2");//期限皮重
             imTare.setValueFlag("2");//洁净
             imTare.setDataSource("1");
-            imTare.setCreateTime(new Date());
+            //期限皮重转为一次数据的时，创建时间应为期限皮开始时间
+            //imTare.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(imTare);
 
             //修改结净皮重编号
             MeterWorkCarActual mca = new MeterWorkCarActual();
             mca.setActualNo(model.getActualNo());
             mca.setActualFirst2No(actualNo);
+            mca.setTareTime(termData.getMeterTime());
+            mca.setBaseSpot2No(termData.getBaseSpotNo());
+            mca.setBaseSpot2Name(termData.getBaseSpotName());
             meterWorkCarActualMapper.updateByPrimaryKeySelective(mca);
 
             //作废一次计量皮重信息
@@ -4922,7 +4930,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 imTare.setBaseSpotNo(termData.getBaseSpotNo());
                 imTare.setBaseSpotName(termData.getBaseSpotName());
                 imTare.setCarNo(termData.getCarNo());
-                imTare.setCreateTime(termData.getCreateTime());
+                //杜勇 20220724修改
+                imTare.setCreateTime(termData.getMeterTime());
                 imTare.setCreateManNo(termData.getCreateManNo());
                 imTare.setCreateManName(termData.getCreateManName());
                 imTare.setMeterWeight(termData.getMeterWeight());
@@ -4952,8 +4961,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setValueFlag("1");
                 mwca.setNetManNo("admin");
                 mwca.setNetManName("admin");
-                mwca.setNetSpot3No(imTare.getBaseSpotNo());
-                mwca.setNetSpot3Name(imTare.getBaseSpotName());
+                mwca.setNetSpot3No(model.getBaseSpotNo());
+                mwca.setNetSpot3Name(model.getBaseSpotName());
                 mwca.setPredictionNo(model.getPredictionNo());
                 mwca.setPredictionType("1");
                 mwca.setNetWeight(model.getMeterWeight().subtract(imTare.getMeterWeight()));