委托使用站点更新

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/impl/MeterBaseCarServiceImpl.java

@@ -241,6 +241,16 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
                         if(model.get("usetDepartmentment") != null) {
                             if(StringUtils.isNotEmpty(model.get("usetDepartmentment").toString())) {
                                 car.setUsetDepartment(model.get("usetDepartmentment").toString());
+                                HashMap<String, Object> specialUnitMap = new HashMap<>();
+                                specialUnitMap.put("unitName", car.getUsetDepartment());
+                                List<MeterBaseSpecialUnit> specialUnitList = meterBaseSpecialUnitMapper.selectByParameters(specialUnitMap);
+                                //根据使用部门查询出特殊单位编号，未查询到赋值为其他公司编号："888888"
+                                if(specialUnitList.size() >= 1) {
+                                    car.setUsetDepartmentNo(specialUnitList.get(0).getUnitNo());
+                                }else {
+                                    car.setUsetDepartmentNo("888888");
+                                }
+
                             }
                         }
                         if(model.get("vehicleIdentifyNo") != null) {

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/controller/MeterBaseTermTareDataController.java

@@ -288,4 +288,16 @@ throw new MarkerMetException(500, "操作异常！！");
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "根据车号获取期限皮未失效的数据显示APP界面", notes = "不分页查询")
+    @GetMapping(value = "/ApplistBycarNo")
+    public RESTfulResult ApplistBycarNo(@RequestParam HashMap parmas) {
+        try {
+            RESTfulResult rm = meterBaseTermTareDataService.ApplistBycarNo(parmas);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/IMeterBaseTermTareDataService.java

@@ -35,4 +35,5 @@ public interface IMeterBaseTermTareDataService extends IBaseService<MeterBaseTer
     RESTfulResult doSaveTerm(String id);
 
     RESTfulResult listBycarNo(HashMap<String, Object> parmas);
+    RESTfulResult ApplistBycarNo(HashMap<String, Object> parmas);
 }

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -395,6 +395,50 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
         return rm;
     }
 
+    @Override
+    public RESTfulResult ApplistBycarNo(HashMap<String, Object> parmas) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            HashMap<String, Object> map = new HashMap<>();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+            List<MeterBaseTermTareData> models = meterBaseTermTareDataMapper.selectByParameters(parmas);
+            if(models.size() >= 1) {
+                MeterBaseTermTareData model = models.get(0);
+                //判断期限皮过期时间
+                Date startTime = sdf.parse(sdf.format(model.getEndTime()));
+                Date endTime = sdf.parse(sdf.format(new Date()));
+                long from = startTime.getTime();
+                long to = endTime.getTime();
+                int day = (int)(from - to)/(60*60*24*100);
+                int hour = (int)(from - to)/(60*60*1000);
+                int minutes = (int)(from - to)/(60*1000);
+                if(startTime.compareTo(endTime) > 0) {
+                    map.put("flag", "1");
+                }else {
+                    map.put("flag", "0");
+                }
+                map.put("model", model);
+                map.put("day", day);
+                map.put("hour", hour);
+                map.put("minutes", minutes);
+                rm.setData(map);
+                rm.setSucceed();
+                rm.setMessage("操作成功");
+                rm.setCode("200");
+            }else {
+                rm.setSucceed();
+                rm.setMessage("未找到相应期限皮重信息");
+                rm.setData("");
+                rm.setCode("200");
+            }
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！！" + e.getMessage());
+        }
+        return rm;
+    }
+
     private String saveNote(MeterMonitorNote note){
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(new Date());

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

@@ -4102,6 +4102,15 @@
         <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
             and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+          and net_spot3_no like '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+          and net_spot3_name like '%${netSpot3Name}%'
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+          and sender_remark LIKE '%${senderRemark}%'
+        </if>
     group by matter_no, matter_name, forwarding_unit_no, forwarding_unit_name, receiving_uint_no, receiving_uint_name
     union
         (
@@ -4123,6 +4132,15 @@
             <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
               and  fs_netweightTime  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and fs_netweightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
             </if>
+            <if test="netSpot3No != null and netSpot3No != ''">
+              and fs_netPointId like '%${netSpot3No}%'
+            </if>
+            <if test="netSpot3Name != null and netSpot3Name != ''">
+              and fs_netPointName like '%${netSpot3Name}%'
+            </if>
+            <if test="senderRemark != null and senderRemark != ''">
+              and fs_senderRemark LIKE '%${senderRemark}%'
+            </if>
         group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
         )
     )

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -312,20 +312,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
             MeterWorkCarActual actualRow = new MeterWorkCarActual();
             if(StringUtils.isNotEmpty(predictionNo)){
-                PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
-                scale.setValueFlag(DbConstants.NET);
-                scale.setUpdateTime(new Date());
-                scale.setUpdateManNo("system");
-                scale.setUpdateManName("二次计量洁净更新");
-                scale.setUploadFlag("1");
-                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-
                 MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectAndMatch(actualFirstNo, predictionNo);
                 BeanUtils.copyProperties(first1,mwcaf1);
                 MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(dataNo, predictionNo);
                 BeanUtils.copyProperties(first2, mwcaf2);
 
-
                 mwcaf1.setValueFlag(DbConstants.NET);
                 mwcaf1.setUpdateManName("system");
                 mwcaf1.setUpdateManName("二次计量洁净更新");
@@ -361,8 +352,15 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
                 actualRow.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(actualRow);
-                scale.setMeasureStation(actualRow.getBaseSpot2No());
-                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+
+                PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(predictionNo);
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("二次计量洁净更新");
+                scale.setUploadFlag("1");
+                scale.setMeasureStation(actualRow.getNetSpot3No());
+                scale.setMeasureStationName(actualRow.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }else if(StringUtils.isNotEmpty(mwcaf1.getPredictionNo()) || StringUtils.isNotEmpty(mwcaf2.getPredictionNo())){
                 String preNo = null;
@@ -376,12 +374,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 if(StringUtils.isNotEmpty(preNo)){
                     PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(preNo);
                     if(scale != null) {
-                        scale.setValueFlag(DbConstants.NET);
-                        scale.setUpdateTime(new Date());
-                        scale.setUpdateManNo("system");
-                        scale.setUpdateManName("二次计量洁净更新");
-                        scale.setUploadFlag("1");
-                        preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
                         MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectAndMatch(actualFirstNo, scale.getPredictionNo());
                         BeanUtils.copyProperties(first1,mwcaf1);
@@ -427,8 +419,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         actualRow.setCreateTime(new Date());
                         meterWorkCarActualMapper.insertSelective(actualRow);
 
-                        scale.setMeasureStation(actualRow.getBaseSpot2No());
-                        scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+                        scale.setValueFlag(DbConstants.NET);
+                        scale.setUpdateTime(new Date());
+                        scale.setUpdateManNo("system");
+                        scale.setUpdateManName("二次计量洁净更新");
+                        scale.setUploadFlag("1");
+                        scale.setMeasureStation(actualRow.getNetSpot3No());
+                        scale.setMeasureStationName(actualRow.getNetSpot3Name());
                         preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                     }else {
                         throw new MarkerMetException(500, "委托表不存在该"+ preNo + "委托编号信息！！");
@@ -1045,15 +1042,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             tarerow.setUpdateManNo(userId);
             tarerow.setIsPreScale("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(tarerow);
-            // 处理预报
-            if (scale != null) {
-                scale.setValueFlag("2");
-                scale.setUploadFlag("1");
-                scale.setUpdateTime(new Date());
-                scale.setUpdateManNo("system");
-                scale.setUpdateManName("计量洁净数据匹配委托操作");
-                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-            }
+
             MeterWorkCarActual mwca = meterWorkCarActualMapper.mathPredcition(actualNo, predictionNo);
             mwca.setIsPreScale("1");
             mwca.setPredictionType("1");
@@ -1064,9 +1053,18 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwca.setNote(note);
             meterWorkCarActualMapper.updateByPrimaryKey(mwca);
 
-            scale.setMeasureStation(mwca.getBaseSpot2No());
-            scale.setMeasureStationName(mwca.getBaseSpot2Name());
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+            // 处理预报
+            if (scale != null) {
+                scale.setValueFlag("2");
+                scale.setUploadFlag("1");
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("计量洁净数据匹配委托操作");
+                scale.setMeasureStation(mwca.getNetSpot3No());
+                scale.setMeasureStationName(mwca.getNetSpot3Name());
+                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+            }
+
             rm.setSucceed();
             rm.setCode("200");
             rm.setData(mwca);
@@ -1122,6 +1120,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         tarerow.setUpdateTime(new Date());
         tarerow.setUpdateManName(userName + ": 洁净数据解除委托操作");
         tarerow.setUpdateManNo(userId);
+        tarerow.setIsPreScale("0");
         meterWorkCarActualFirstMapper.updateByPrimaryKey(tarerow);
 
         // 处理预报
@@ -1210,8 +1209,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 scale.setUploadFlag("1");
                 scale.setUpdateManNo("system");
                 scale.setUpdateManName("计量洁净数据洁净操作");
-                scale.setMeasureStation(mwca.getBaseSpot2No());
-                scale.setMeasureStationName(mwca.getBaseSpot2Name());
+                scale.setMeasureStation(mwca.getNetSpot3No());
+                scale.setMeasureStationName(mwca.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }
             return mwca;
@@ -1688,13 +1687,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 throw new MarkerMetException(500, "业务类型[" + trackScale.getMatterName() + "]必须包含[单包计量]！");
             }
 
-            trackScale.setUpdateManNo(userId);
-            trackScale.setUpdateManName(userName);
-            trackScale.setUpdateTime(new Date());
-            trackScale.setValueFlag(DbConstants.NET);
-            trackScale.setUploadFlag("1");
-            preTrackScaleMapper.updateByPrimaryKeySelective(trackScale);
-
             BeanUtils.copyProperties(trackScale, actual); //相同的实体类进行转换
 //            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 //            String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
@@ -1711,6 +1703,15 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             actual.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actual);
 
+            trackScale.setUpdateManNo(userId);
+            trackScale.setUpdateManName(userName);
+            trackScale.setUpdateTime(new Date());
+            trackScale.setValueFlag(DbConstants.NET);
+            trackScale.setUploadFlag("1");
+            trackScale.setMeasureStation(actual.getNetSpot3No());
+            trackScale.setMeasureStationName(actual.getNetSpot3Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(trackScale);
+
             return actual;
         } catch (MarkerMetException e) {
             throw e;
@@ -1931,12 +1932,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             }
             else {
                 PreTrackScale preTrackScale = preTrackScaleMapper.selectBypredictionNo(predictionNo);
-                preTrackScale.setValueFlag("2");
-                preTrackScale.setUploadFlag("1");
-                preTrackScale.setUpdateTime(new Date());
-                preTrackScale.setUpdateManNo("system");
-                preTrackScale.setUpdateManName("计量洁净数据手动录入");
-                preTrackScaleMapper.updateByPrimaryKey(preTrackScale);
                 //添加毛重一次计量数据
 //                String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
                 String actualFirstNo = PublicMethod.IdCreate(3);
@@ -1993,8 +1988,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 model.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(model);
 
-                preTrackScale.setMeasureStation(model.getBaseSpot2No());
-                preTrackScale.setMeasureStationName(model.getBaseSpot2Name());
+                preTrackScale.setValueFlag("2");
+                preTrackScale.setUploadFlag("1");
+                preTrackScale.setUpdateTime(new Date());
+                preTrackScale.setUpdateManNo("system");
+                preTrackScale.setUpdateManName("计量洁净数据手动录入");
+                preTrackScale.setMeasureStation(model.getNetSpot3No());
+                preTrackScale.setMeasureStationName(model.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
                 num++;
             }
@@ -2070,6 +2070,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcaf2.setIsPreScale("1");
                 BeanUtils.copyProperties(first2, mwcaf2);
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf2);
+
+                //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
+                MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualFirstNo, actualSecondNo, predictionNo);
+                BeanUtils.copyProperties(mwca1, actualRow);
+
                 //更新预报数据
                 PreTrackScale scale = new PreTrackScale();
                 scale.setPredictionNo(predictionNo);
@@ -2079,13 +2084,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 scale.setUpdateManName("手动录入");
                 scale.setUploadFlag("1");
                 scale.setValueFlag("2");
-                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-                //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
-                MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualFirstNo, actualSecondNo, predictionNo);
-                BeanUtils.copyProperties(mwca1, actualRow);
-
-                scale.setMeasureStation(actualRow.getBaseSpot2No());
-                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+                scale.setMeasureStation(actualRow.getNetSpot3No());
+                scale.setMeasureStationName(actualRow.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }else {
                 //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中

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

@@ -449,6 +449,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     ps.setPredictionNo(model.getPredictionNo());
                     ps.setValueFlag(DbConstants.IN); //预报调整为使用中
                     ps.setUploadFlag("1");
+                    ps.setMeasureStation(model.getBaseSpotNo());
+                    ps.setMeasureStationName(model.getBaseSpotName());
                     this.preTrackScaleMapper.updateByPrimaryKeySelective(ps);
                 }
 
@@ -651,13 +653,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwpl.setValueFlag("2");//已使用
                 meterWorkPreLinkMapper.updateByPrimaryKey(mwpl);
             }
-
-            pts.setUpdateTime(new Date());
-            pts.setUpdateManNo("system");
-            pts.setUpdateManName("一次计量数据匹配操作");
-            pts.setValueFlag(DbConstants.IN); //2021年5月24日  预报直接就写成【使用中】
-            pts.setUploadFlag("1");
-            preTrackScaleMapper.updateByPrimaryKey(pts);
             //当一次计量数据是已结净的状态时，同时将该结净数据的另一条一次计量数据自动匹配该委托，并将该结净记录也进行委托匹配
             if (meterWorkCarActualFirst.getValueFlag() == "2" || "2".equals(meterWorkCarActualFirst.getValueFlag())){
                 MeterWorkCarActual meterWorkCarActual = meterWorkCarActualMapper.selectActual(actualFirstNo);
@@ -678,6 +673,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mwca.setIsPreScale("1");
                 mwca.setUploadFlag("1");
                 meterWorkCarActualMapper.updateByPrimaryKey(mwca);
+
+                pts.setUpdateTime(new Date());
+                pts.setUpdateManNo("system");
+                pts.setUpdateManName("一次计量数据匹配操作");
+                pts.setValueFlag(DbConstants.IN); //2021年5月24日  预报直接就写成【使用中】
+                pts.setUploadFlag("1");
+                pts.setMeasureStation(mwca.getNetSpot3No());
+                pts.setMeasureStationName(mwca.getNetSpot3Name());
+                preTrackScaleMapper.updateByPrimaryKey(pts);
             }
             // 设置为已匹配状态
             //model.setValueFlag("1");
@@ -1181,8 +1185,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");
                 preTrackScale.setUploadFlag("1");
-                preTrackScale.setMeasureStation(netDb.getBaseSpot2No());
-                preTrackScale.setMeasureStationName(netDb.getBaseSpot2Name());
+                preTrackScale.setMeasureStation(netDb.getNetSpot3No());
+                preTrackScale.setMeasureStationName(netDb.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
                 PreTrackScale pres = preTrackScaleMapper.selectBypredictionNo(netDb.getPredictionNo());
                 if(pres != null && pres.getReceiverRemark() != null && (pres.getReceiverRemark().equals("H01") || pres.getReceiverRemark().equals("H02"))){
@@ -1404,8 +1408,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale.setUploadFlag("1");
             scale.setPredictionType("7");
             scale.setPredictionCombination(upModel.getPredictionNo() + "," + netDb.getPredictionNo());
-            scale.setMeasureStation(netDb.getBaseSpot2No());
-            scale.setMeasureStationName(netDb.getBaseSpot2Name());
+            scale.setMeasureStation(netDb.getNetSpot3No());
+            scale.setMeasureStationName(netDb.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
             //4、存储历史皮重及历史皮重明细信息
@@ -1554,6 +1558,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             ptsU.setValueFlag("4");//非一车联运的话，扫码时预报改为正使用  下次还是扫相同码
         }
         ptsU.setUploadFlag("1");
+        ptsU.setMeasureStation(oci.getBaseSpotNo());
+        ptsU.setMeasureStationName(oci.getBaseSpotName());
         preTrackScaleMapper.updateByPrimaryKeySelective(ptsU);
 
         //6、存储图片
@@ -1695,11 +1701,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 }
             }
             ptsU.setUploadFlag("1");
+            ptsU.setMeasureStation(netDb.getNetSpot3No());
+            ptsU.setMeasureStationName(netDb.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(ptsU);
         } else if (pts.getPredictionType().equals("1")) {
             //单次预报 使用1次后将状态设置为已使用
             ptsU.setValueFlag("2");
             ptsU.setUploadFlag("1");
+            ptsU.setMeasureStation(netDb.getNetSpot3No());
+            ptsU.setMeasureStationName(netDb.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(ptsU);
         } else if (pts.getPredictionType().equals("2")) {
             //联运预报 使用1次，但是根据车辆的环节中若是 互锁式则直接洁净，否则则看是否还有其它的预报未使用
@@ -1707,6 +1717,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             if ("1".equals(isLock)) { //互锁搞法：与单次的先皮后毛流程一样
                 ptsU.setValueFlag("2"); //修改预报状态为正使用
                 ptsU.setUploadFlag("1");
+                ptsU.setMeasureStation(netDb.getNetSpot3No());
+                ptsU.setMeasureStationName(netDb.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(ptsU);
             } else {
                 MeterWorkCarActualFirst mwaf = new MeterWorkCarActualFirst();
@@ -1946,6 +1958,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             ptsU.setValueFlag("2");//预报完结
             ptsU.setUploadFlag("1");
+            ptsU.setMeasureStation(mwrafs.get(0).getBaseSpotNo());
+            ptsU.setMeasureStationName(mwrafs.get(0).getBaseSpotName());
             preTrackScaleMapper.updateByPrimaryKeySelective(ptsU);
             //===================火车分检预报处理结束==========================
         }
@@ -2355,11 +2369,15 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 }
             }
             pts.setUploadFlag("1");
+            pts.setMeasureStation(netDb.getNetSpot3No());
+            pts.setMeasureStationName(netDb.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(pts);
         } else if (pts.getPredictionType().equals("1")) {
             //单次预报 使用1次后将状态设置为已使用
             pts.setValueFlag("2");
             pts.setUploadFlag("1");
+            pts.setMeasureStation(netDb.getNetSpot3No());
+            pts.setMeasureStationName(netDb.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(pts);
         } else if (pts.getPredictionType().equals("3") && StringUtils.isNotEmpty(pts.getRailwayNo())) {
             //===================火车分检预报处理开始==========================
@@ -2375,6 +2393,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             }
             pts.setValueFlag("2");//预报完结
             pts.setUploadFlag("1");
+            pts.setMeasureStation(mwrafs.get(0).getBaseSpotNo());
+            pts.setMeasureStationName(mwrafs.get(0).getBaseSpotName());
             preTrackScaleMapper.updateByPrimaryKeySelective(pts);
             //===================火车分检预报处理结束==========================
         }
@@ -2822,6 +2842,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         pre.setPredictionNo(oci.getPredictionNo());
         pre.setValueFlag("2");
         pre.setUploadFlag("1");
+        pre.setMeasureStation(oci.getBaseSpotNo());
+        pre.setMeasureStationName(oci.getBaseSpotName());
         preTrackScaleMapper.updateByPrimaryKeySelective(pre);
 
         //若有环节信息，还得将环节信息给设置为已使用，不然会影响后续计量的流程
@@ -2961,14 +2983,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(first02.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(first2, first02);
 
-                //修改委托编号
-                scale.setValueFlag(DbConstants.NET);
-                scale.setUpdateTime(new Date());
-                scale.setUpdateManNo("system");
-                scale.setUpdateManName("混装洁净更新");
-                scale.setUploadFlag("1");
-                scale.setPredictionType("7");
-                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+
 
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
@@ -3020,8 +3035,16 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow.setNetWeight(first02.getMeterWeight().subtract(model02.getMeterWeight()));
 
                 meterWorkCarActualMapper.insertSelective(actualRow);
-                scale.setMeasureStation(actualRow.getBaseSpot2No());
-                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+
+                //修改委托编号
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("混装洁净更新");
+                scale.setUploadFlag("1");
+                scale.setPredictionType("7");
+                scale.setMeasureStation(actualRow.getNetSpot3No());
+                scale.setMeasureStationName(actualRow.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             } else if (first02.getWeightType().equals("1")) {         //混卸
                 //修改委托状态
@@ -3031,15 +3054,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(first02.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(first2, first02);
 
-                //修改委托编号
-                scale.setValueFlag(DbConstants.NET);
-                scale.setUpdateTime(new Date());
-                scale.setUpdateManNo("system");
-                scale.setUpdateManName("混卸洁净更新");
-                scale.setUploadFlag("1");
-                scale.setPredictionType("6");
-                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-
                 //修改毛重一次数据状态
                 first02.setValueFlag(DbConstants.NET);
                 first02.setUpdateManName("system");
@@ -3090,8 +3104,16 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 actualRow.setPredictionType("6");
                 actualRow.setNetWeight(model01.getMeterWeight().subtract(first02.getMeterWeight()));
                 meterWorkCarActualMapper.insertSelective(actualRow);
-                scale.setMeasureStation(actualRow.getBaseSpot2No());
-                scale.setMeasureStationName(actualRow.getBaseSpot2Name());
+
+                //修改委托编号
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("混卸洁净更新");
+                scale.setUploadFlag("1");
+                scale.setPredictionType("6");
+                scale.setMeasureStation(actualRow.getNetSpot3No());
+                scale.setMeasureStationName(actualRow.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }
 
@@ -3211,25 +3233,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale02.getPredictionNo());
             BeanUtils.copyProperties(first4, model04);
 
-            //更新预报数据
-            scale01.setValueFlag(DbConstants.NET);
-            scale01.setUpdateTime(new Date());
-            scale01.setUpdateManNo("system");
-            scale01.setUpdateManName("双委托洁净更新");
-            scale01.setUploadFlag("1");
-            scale01.setPredictionType("5");
-            scale01.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale01);
-
-            scale02.setValueFlag(DbConstants.NET);
-            scale02.setUpdateTime(new Date());
-            scale02.setUpdateManNo("system");
-            scale02.setUpdateManName("双委托洁净更新");
-            scale02.setUploadFlag("1");
-            scale02.setPredictionType("5");
-            scale02.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale02);
-
             //更新一次数据
             //更新第一次毛重数据库
             model01.setValueFlag(DbConstants.NET);
@@ -3318,9 +3321,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             actualRow1.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
-            scale01.setMeasureStation(actualRow1.getBaseSpot2No());
-            scale01.setMeasureStationName(actualRow1.getBaseSpot2Name());
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale01);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
@@ -3347,8 +3347,29 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
             actualRow2.setNetWeight(model03.getMeterWeight().subtract(model04.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow2);
-            scale02.setMeasureStation(actualRow2.getBaseSpot2No());
-            scale02.setMeasureStationName(actualRow2.getBaseSpot2Name());
+
+
+            //更新预报数据
+            scale01.setValueFlag(DbConstants.NET);
+            scale01.setUpdateTime(new Date());
+            scale01.setUpdateManNo("system");
+            scale01.setUpdateManName("双委托洁净更新");
+            scale01.setUploadFlag("1");
+            scale01.setPredictionType("5");
+            scale01.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            scale01.setMeasureStation(actualRow1.getNetSpot3No());
+            scale01.setMeasureStationName(actualRow1.getNetSpot3Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale01);
+
+            scale02.setValueFlag(DbConstants.NET);
+            scale02.setUpdateTime(new Date());
+            scale02.setUpdateManNo("system");
+            scale02.setUpdateManName("双委托洁净更新");
+            scale02.setUploadFlag("1");
+            scale02.setPredictionType("5");
+            scale02.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
+            scale02.setMeasureStation(actualRow2.getNetSpot3No());
+            scale02.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale02);
             //11、修改计量监控
             updateMonitor(one.getBaseSpotNo());
@@ -3440,28 +3461,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             BeanUtils.copyProperties(first3,mwcaf3);
             MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo3, predictionNo2);
             BeanUtils.copyProperties(first4, mwcaf4);
-            //更新预报数据
-            PreTrackScale scale = new PreTrackScale();
-            scale.setPredictionNo(predictionNo1);
-            scale.setValueFlag(DbConstants.NET);
-            scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("混装洁净更新");
-            scale.setPredictionType("7");
-            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            scale.setUploadFlag("1");
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
-            PreTrackScale scale1 = new PreTrackScale();
-            scale1.setPredictionNo(predictionNo2);
-            scale1.setValueFlag(DbConstants.NET);
-            scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("混装洁净更新");
-            scale1.setPredictionType("7");
-            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            scale1.setUploadFlag("1");
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
 
             //更新一次数据
             //更新第一次皮重数据
@@ -3539,9 +3539,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf2.getMeterWeight().subtract(mwcaf1.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
-            scale.setMeasureStation(actualRow1.getBaseSpot2No());
-            scale.setMeasureStationName(actualRow1.getBaseSpot2Name());
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
@@ -3562,8 +3559,32 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf4.getMeterWeight().subtract(mwcaf3.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow2);
-            scale1.setMeasureStation(actualRow2.getBaseSpot2No());
-            scale1.setMeasureStationName(actualRow2.getBaseSpot2Name());
+
+            //更新预报数据
+            PreTrackScale scale = new PreTrackScale();
+            scale.setPredictionNo(predictionNo1);
+            scale.setValueFlag(DbConstants.NET);
+            scale.setUpdateTime(new Date());
+            scale.setUpdateManNo("system");
+            scale.setUpdateManName("混装洁净更新");
+            scale.setPredictionType("7");
+            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            scale.setUploadFlag("1");
+            scale.setMeasureStation(actualRow1.getNetSpot3No());
+            scale.setMeasureStationName(actualRow1.getNetSpot3Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+
+            PreTrackScale scale1 = new PreTrackScale();
+            scale1.setPredictionNo(predictionNo2);
+            scale1.setValueFlag(DbConstants.NET);
+            scale1.setUpdateTime(new Date());
+            scale1.setUpdateManNo("system");
+            scale1.setUpdateManName("混装洁净更新");
+            scale1.setPredictionType("7");
+            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            scale1.setUploadFlag("1");
+            scale1.setMeasureStation(actualRow2.getNetSpot3No());
+            scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
         }
         catch (Exception e){
@@ -3636,32 +3657,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo3, predictionNo2);
             BeanUtils.copyProperties(first4, mwcaf4);
 
-            //更新预报数据
-            PreTrackScale scale = new PreTrackScale();
-            scale.setPredictionNo(predictionNo1);
-            scale.setValueFlag(DbConstants.NET);
-            scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("混卸洁净更新");
-            scale.setUploadFlag("1");
-            scale.setValueFlag("2");
-            //预报类型：双委托（5）、预报组合：A预报，B预报
-            scale.setPredictionType("6");
-            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-
-            PreTrackScale scale1 = new PreTrackScale();
-            scale1.setPredictionNo(predictionNo2);
-            scale1.setValueFlag(DbConstants.NET);
-            scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("混卸洁净更新");
-            scale1.setUploadFlag("1");
-            scale1.setValueFlag("2");
-            scale1.setPredictionType("6");
-            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
-
             //更新一次数据
             //更新第一次毛重数据
             mwcaf1.setValueFlag(DbConstants.NET);
@@ -3737,9 +3732,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow1);
-            scale.setMeasureStation(actualRow1.getBaseSpot2No());
-            scale.setMeasureStationName(actualRow1.getBaseSpot2Name());
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
 
@@ -3759,8 +3751,35 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setNetWeight(mwcaf3.getMeterWeight().subtract(mwcaf4.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow2);
-            scale1.setMeasureStation(actualRow2.getBaseSpot2No());
-            scale1.setMeasureStationName(actualRow2.getBaseSpot2Name());
+
+            //更新预报数据
+            PreTrackScale scale = new PreTrackScale();
+            scale.setPredictionNo(predictionNo1);
+            scale.setValueFlag(DbConstants.NET);
+            scale.setUpdateTime(new Date());
+            scale.setUpdateManNo("system");
+            scale.setUpdateManName("混卸洁净更新");
+            scale.setUploadFlag("1");
+            scale.setValueFlag("2");
+            //预报类型：双委托（5）、预报组合：A预报，B预报
+            scale.setPredictionType("6");
+            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            scale.setMeasureStation(actualRow1.getNetSpot3No());
+            scale.setMeasureStationName(actualRow1.getNetSpot3Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+
+            PreTrackScale scale1 = new PreTrackScale();
+            scale1.setPredictionNo(predictionNo2);
+            scale1.setValueFlag(DbConstants.NET);
+            scale1.setUpdateTime(new Date());
+            scale1.setUpdateManNo("system");
+            scale1.setUpdateManName("混卸洁净更新");
+            scale1.setUploadFlag("1");
+            scale1.setValueFlag("2");
+            scale1.setPredictionType("6");
+            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            scale1.setMeasureStation(actualRow2.getNetSpot3No());
+            scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
         }
         catch (Exception e){
@@ -3849,29 +3868,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo2, predictionNo2);
             BeanUtils.copyProperties(first4, mwcaf04);
 
-            //更新预报数据
-            PreTrackScale scale = new PreTrackScale();
-            scale.setPredictionNo(predictionNo1);
-            scale.setValueFlag(DbConstants.NET);
-            scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("双委托洁净更新");
-            scale.setUploadFlag("1");
-            scale.setPredictionType("5");
-            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
-
-            PreTrackScale scale1 = new PreTrackScale();
-            scale1.setPredictionNo(predictionNo2);
-            scale1.setValueFlag(DbConstants.NET);
-            scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("双委托洁净更新");
-            scale1.setUploadFlag("1");
-            scale1.setPredictionType("5");
-            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
-
             //更新一次数据
             //更新第一次毛重数据库
             mwcaf01.setValueFlag(DbConstants.NET);
@@ -3954,9 +3950,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
             actualRow1.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow1);
-            scale.setMeasureStation(actualRow1.getBaseSpot2No());
-            scale.setMeasureStationName(actualRow1.getBaseSpot2Name());
-            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
 
 //            String no1 = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
 //            actualRow2.setActualNo(sdf.format(new Date()) + no1);
@@ -3975,8 +3968,32 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
             actualRow2.setCreateTime(new Date());
             meterWorkCarActualMapper.insertSelective(actualRow2);
-            scale1.setMeasureStation(actualRow2.getBaseSpot2No());
-            scale1.setMeasureStationName(actualRow2.getBaseSpot2Name());
+
+            //更新预报数据
+            PreTrackScale scale = new PreTrackScale();
+            scale.setPredictionNo(predictionNo1);
+            scale.setValueFlag(DbConstants.NET);
+            scale.setUpdateTime(new Date());
+            scale.setUpdateManNo("system");
+            scale.setUpdateManName("双委托洁净更新");
+            scale.setUploadFlag("1");
+            scale.setPredictionType("5");
+            scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            scale.setMeasureStation(actualRow1.getNetSpot3No());
+            scale.setMeasureStationName(actualRow1.getNetSpot3Name());
+            preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+
+            PreTrackScale scale1 = new PreTrackScale();
+            scale1.setPredictionNo(predictionNo2);
+            scale1.setValueFlag(DbConstants.NET);
+            scale1.setUpdateTime(new Date());
+            scale1.setUpdateManNo("system");
+            scale1.setUpdateManName("双委托洁净更新");
+            scale1.setUploadFlag("1");
+            scale1.setPredictionType("5");
+            scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            scale1.setMeasureStation(actualRow2.getNetSpot3No());
+            scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
 
             rm.setSucceed();
@@ -4074,6 +4091,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             mwca.setActualNo(netDb.getActualNo());
             mwca.setActualFirst2No(actualNo);
             mwca.setTareWeight(mbttd.getMeterWeight());
+            mwca.setNetTime(imTare.getCreateTime());
             mwca.setNetWeight(secondDb.getMeterWeight().subtract(imTare.getMeterWeight()));
             meterWorkCarActualMapper.updateByPrimaryKeySelective(mwca);
 
@@ -4090,6 +4108,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");
                 preTrackScale.setUploadFlag("1");
+                preTrackScale.setMeasureStation(netDb.getNetSpot3No());
+                preTrackScale.setMeasureStationName(netDb.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
             }
 
@@ -4392,6 +4412,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 preTrackScale.setPredictionNo(meterWorkCarActual.getPredictionNo());
                 preTrackScale.setValueFlag("2");
                 preTrackScale.setUploadFlag("1");
+                preTrackScale.setMeasureStation(meterWorkCarActual.getNetSpot3No());
+                preTrackScale.setMeasureStationName(meterWorkCarActual.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
                 num++;
             }
@@ -4619,14 +4641,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 BeanUtils.copyProperties(first1, grossModel);
                 MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), scale.getPredictionNo());
                 BeanUtils.copyProperties(first2, tareModel);
-                //更新委托信息状态
-                scale.setValueFlag(DbConstants.NET);
-                scale.setUpdateTime(new Date());
-                scale.setUpdateManNo("system");
-                scale.setUpdateManName("期限皮洁净更新");
-                scale.setUploadFlag("1");
-                scale.setPredictionType("1");
-                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+
                 //更新第一次毛重数据库
                 grossModel.setValueFlag(DbConstants.NET);
                 grossModel.setUpdateManName("system");
@@ -4668,10 +4683,17 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 model.setPredictionNo(scale.getPredictionNo());
                 model.setPredictionType("1");
                 model.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
-                model.setCreateTime(new Date());
                 meterWorkCarActualMapper.insertSelective(model);
-                scale.setMeasureStation(model.getBaseSpot2No());
-                scale.setMeasureStationName(model.getBaseSpot2Name());
+
+                //更新委托信息状态
+                scale.setValueFlag(DbConstants.NET);
+                scale.setUpdateTime(new Date());
+                scale.setUpdateManNo("system");
+                scale.setUpdateManName("期限皮洁净更新");
+                scale.setUploadFlag("1");
+                scale.setPredictionType("1");
+                scale.setMeasureStation(model.getNetSpot3No());
+                scale.setMeasureStationName(model.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             } else {
                 rm.setMessage("委托信息编号不能为空，请确认！！");
@@ -4946,6 +4968,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 scale.setUpdateManName("期限皮洁净更新");
                 scale.setUploadFlag("1");
                 scale.setPredictionType("1");
+                scale.setMeasureStation(mwca.getNetSpot3No());
+                scale.setMeasureStationName(mwca.getNetSpot3Name());
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }