新增智能终端“双委托”接口

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/mapper/MeterBaseTermTareDataMapper.java

@@ -16,4 +16,8 @@ public interface MeterBaseTermTareDataMapper extends IBaseMapper<MeterBaseTermTa
     List<MeterBaseTermTareData> selectBy(Map<String, Object> parameters);
 
     void cancelTermTare(HashMap<String, Object> mp);
+
+    MeterBaseTermTareData selectByCarNo(HashMap<String, Object> mp);
+
+    MeterBaseTermTareData selectByDataNo(HashMap<String, Object> mp);
 }

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/mapper/MeterBaseTermTareDataMapper.xml

@@ -583,6 +583,21 @@
     <include refid="select"/>
     <include refid="whereBy"/>
   </select>
+
+  <select id="selectByCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from METER_BASE_TERM_TARE_DATA
+    where CAR_NO = '${carNo}'
+    and END_TIME >= to_date('${endTime}', 'yyyy-MM-dd HH24:mi:ss')
+    and rownum = 1 ORDER BY CREATE_TIME desc
+  </select>
+
+  <select id="selectByDataNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    select * from METER_BASE_TERM_TARE_DATA
+    where DATA_NO = '${dataNo}'
+    and END_TIME >= to_date('${endTime}', 'yyyy-MM-dd HH24:mi:ss')
+    and rownum = 1 ORDER BY CREATE_TIME desc
+  </select>
+
   <update id="cancelTermTare">
     update METER_BASE_TERM_TARE_DATA set value_flag=#{valueFlag} where car_no=#{carNo}
   </update>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -12,6 +12,7 @@ import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcaractualfirst.service.IMeterWorkCarActualFirstService;
 import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -907,4 +908,18 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "双委托洁净")
+    @Transactional
+    @PostMapping(value = "/doNetAddTwo", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doNetAddTwo(@RequestBody CommonCombination<MeterWorkCarActualFirst, MeterWorkCarActual, PreTrackScale, PreTrackScale> com) {
+        try {
+            RESTfulResult rm = meterWorkCarActualFirstService.doNetAddTwo(com.getOne(), com.getTwo(), com.getThree(), com.getFour());
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -8,6 +8,7 @@ import com.steerinfo.meterwork.dto.*;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 
 import java.util.HashMap;
 import java.util.List;
@@ -92,6 +93,8 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     RESTfulResult doAddLianDaWf(MeterWorkCarActualFirst one, MeterMonitorNote two) throws Exception;
 
+    RESTfulResult doNetAddTwo(MeterWorkCarActualFirst one, MeterWorkCarActual two, PreTrackScale three, PreTrackScale four) throws Exception;
+
     RESTfulResult doAddNetLianDaWf(MeterWorkCarActualFirst one, MeterWorkCarActual two, MeterMonitorNote three) throws Exception;
 
     RESTfulResult doAddNetDouble(MeterWorkCarActualFirst secondDb, MeterWorkCarActual netDb1, MeterMonitorNote note, MeterWorkCarActual netDb2) throws Exception;

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

@@ -1024,135 +1024,157 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Override
     @Transactional(value = "tm", rollbackFor = Exception.class)
     public RESTfulResult doAddNetInnerWf(MeterWorkCarActualFirst secondDb, MeterWorkCarActual netDb, String saveTare, MeterMonitorNote note) throws Exception {
-        RESTfulResult rm = new RESTfulResult();
-        rm.setCode("200");
-
+        try{
 
-        //1、存储当前计量的数据
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
-        String afl = formatter.format(secondDb.getCreateTime());
-        String no = meterWorkCarActualFirstMapper.getNewID(afl);
-        secondDb.setActualFirstNo(formatter.format(new Date()) + no);
-        secondDb.setValueFlag("2");//洁净
-        meterWorkCarActualFirstMapper.insertSelective(secondDb);
+            RESTfulResult rm = new RESTfulResult();
+            rm.setCode("200");
 
-        //修改一次计量数据为洁净
-        MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
-        //2、存储洁净数据
-        if (secondDb.getMeterWeight().equals(netDb.getTareWeight())) {
-            //二次重量如果跟皮重一样
-            netDb.setActualFirst2No(secondDb.getActualFirstNo());
-            firstUpdate.setActualFirstNo(netDb.getActualFirst1No());
-            firstUpdate.setWeightType("0");
-        } else {
-            netDb.setActualFirst1No(secondDb.getActualFirstNo());
-            firstUpdate.setActualFirstNo(netDb.getActualFirst2No());
-            firstUpdate.setWeightType("1");
-        }
 
-        //3、修改第一次存储的计量数据状态为洁净
-        if (firstUpdate.getActualFirstNo() != null) {
-            firstUpdate.setValueFlag("2");
-            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstUpdate);
-        }
+            //1、存储当前计量的数据
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+            String afl = formatter.format(secondDb.getCreateTime());
+            String no = meterWorkCarActualFirstMapper.getNewID(afl);
+            secondDb.setActualFirstNo(formatter.format(new Date()) + no);
+            secondDb.setValueFlag("2");//洁净
+            meterWorkCarActualFirstMapper.insertSelective(secondDb);
+
+            //修改一次计量数据为洁净
+            MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
+            //2、存储洁净数据
+            if (secondDb.getMeterWeight().equals(netDb.getTareWeight())) {
+                //二次重量如果跟皮重一样
+                netDb.setActualFirst2No(secondDb.getActualFirstNo());
+                firstUpdate.setActualFirstNo(netDb.getActualFirst1No());
+                firstUpdate.setWeightType("0");
+            } else {
+                netDb.setActualFirst1No(secondDb.getActualFirstNo());
+                firstUpdate.setActualFirstNo(netDb.getActualFirst2No());
+                firstUpdate.setWeightType("1");
+            }
 
-        // 判断当前数据是否存在委托
-        if (netDb.getPredictionNo() != null && "".equals(netDb.getPredictionNo())) {
-            MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
-            if ((gross.getPredictionNo() == null || "".equals(gross.getPredictionNo()))) {
-                // 如果毛重数据还未匹配委托，则匹配委托操作
-                MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(gross.getActualFirstNo(), netDb.getPredictionNo());
-                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
-                PreTrackScale preTrackScale = new PreTrackScale();
-                preTrackScale.setPredictionNo(netDb.getPredictionNo());
-                preTrackScale.setValueFlag("2");
-                preTrackScale.setUploadFlag("1");
-                preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
+            //3、修改第一次存储的计量数据状态为洁净
+            if (firstUpdate.getActualFirstNo() != null) {
+                firstUpdate.setValueFlag("2");
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstUpdate);
             }
-        }
 
-        String no1 = meterWorkCarActualMapper.getNewID(afl);
-        netDb.setActualNo(afl + no1);
-        if (netDb != null && netDb.getNetWeight() != null) {
-            //2021年3月7日 净重保留两位小数；
-            BigDecimal net;
-            net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
-            netDb.setNetWeight(net);
-        }
-        netDb.setUploadFlag("1");
-        meterWorkCarActualMapper.insert(netDb);
+            // 判断当前数据是否存在委托
+            if (netDb.getPredictionNo() != null && "".equals(netDb.getPredictionNo())) {
+                MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst1No());
+                if ((gross.getPredictionNo() == null || "".equals(gross.getPredictionNo()))) {
+                    // 如果毛重数据还未匹配委托，则匹配委托操作
+                    MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(gross.getActualFirstNo(), netDb.getPredictionNo());
+                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
+                    PreTrackScale preTrackScale = new PreTrackScale();
+                    preTrackScale.setPredictionNo(netDb.getPredictionNo());
+                    preTrackScale.setValueFlag("2");
+                    preTrackScale.setUploadFlag("1");
+                    preTrackScaleMapper.updateByPrimaryKeySelective(preTrackScale);
+                }
+            }
 
-        //4、如果为期限皮重，则将期限皮重转化为一条皮重计量数据保存
-        MeterWorkCarActualFirst mwraf = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
-        if (mwraf == null) {
-            MeterBaseTermTareData mbttd = meterBaseTermTareDataMapper.selectByPrimaryKey(netDb.getActualFirst2No());
-            MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
-            //补充数据
-            String afl1 = formatter.format(new Date());
-            String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
-            imTare.setActualFirstNo(afl1 + imTareNO);
-            imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
-            imTare.setMeterTypeName(secondDb.getMeterTypeName());
-            imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
-            imTare.setBaseSpotName(mbttd.getBaseSpotName());
-            imTare.setCarNo(mbttd.getCarNo());
-            imTare.setCreateTime(mbttd.getCreateTime());
-            imTare.setCreateManNo(mbttd.getCreateManNo());
-            imTare.setCreateManName(mbttd.getCreateManName());
-            imTare.setMeterWeight(netDb.getTareWeight());
-            imTare.setWeightType("2");//期限皮重
-            imTare.setValueFlag("2");//洁净
-            meterWorkCarActualFirstMapper.insertSelective(imTare);
-            //将洁净数据中的皮重编号修改
-            MeterWorkCarActual mwca = new MeterWorkCarActual();
-            mwca.setActualNo(netDb.getActualNo());
-            mwca.setActualFirst2No(imTare.getActualFirstNo());
-            meterWorkCarActualMapper.updateByPrimaryKeySelective(mwca);
-        }
+            String no1 = meterWorkCarActualMapper.getNewID(afl);
+            netDb.setActualNo(afl + no1);
+            if (netDb != null && netDb.getNetWeight() != null) {
+                //2021年3月7日 净重保留两位小数；
+                BigDecimal net;
+                net = new BigDecimal(String.valueOf(netDb.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
+                netDb.setNetWeight(net);
+            }
+            netDb.setUploadFlag("1");
+            meterWorkCarActualMapper.insert(netDb);
+
+            //4、如果为期限皮重，则将期限皮重转化为一条皮重计量数据保存
+            MeterWorkCarActualFirst mwraf = meterWorkCarActualFirstMapper.selectByPrimaryKey(netDb.getActualFirst2No());
+            if (mwraf == null) {
+                MeterBaseTermTareData mbttd = new MeterBaseTermTareData();
+                HashMap mbMap = new HashMap();
+                SimpleDateFormat mbsdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                mbMap.put("endTime",mbsdf.format(new Date()));
+                if(StringUtils.isNotEmpty(netDb.getActualFirst2No())){
+                    mbMap.put("dataNo",netDb.getActualFirst2No());
+                    mbttd = meterBaseTermTareDataMapper.selectByDataNo(mbMap);
+                }
+                else{
+                    mbMap.put("carNo",netDb.getCarNo());
+                    mbttd = meterBaseTermTareDataMapper.selectByCarNo(mbMap);
+                }
+                MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
+                //补充数据
+                String afl1 = formatter.format(new Date());
+                String imTareNO = meterWorkCarActualFirstMapper.getNewID(afl1);
+                imTare.setActualFirstNo(afl1 + imTareNO);
+                imTare.setMeterTypeNo(secondDb.getMeterTypeNo());
+                imTare.setMeterTypeName(secondDb.getMeterTypeName());
+                imTare.setBaseSpotNo(mbttd.getBaseSpotNo());
+                imTare.setBaseSpotName(mbttd.getBaseSpotName());
+                imTare.setCarNo(mbttd.getCarNo());
+                imTare.setCreateTime(mbttd.getCreateTime());
+                imTare.setCreateManNo(mbttd.getCreateManNo());
+                imTare.setCreateManName(mbttd.getCreateManName());
+                imTare.setMeterWeight(netDb.getTareWeight());
+                imTare.setWeightType("2");//期限皮重
+                imTare.setValueFlag("2");//洁净
+                meterWorkCarActualFirstMapper.insertSelective(imTare);
+                //将洁净数据中的皮重编号修改
+                MeterWorkCarActual mwca = new MeterWorkCarActual();
+                mwca.setActualNo(netDb.getActualNo());
+                mwca.setActualFirst2No(imTare.getActualFirstNo());
+                meterWorkCarActualMapper.updateByPrimaryKeySelective(mwca);
+            }
 
-        //4、存储历史皮重及历史皮重明细信息
-        if ("1".equals(saveTare)) {
-            MeterWorkCarActualFirst oci = new MeterWorkCarActualFirst();
-            oci.setCarNo(netDb.getCarNo());
-            oci.setCreateTime(netDb.getTareTime());
-            oci.setBaseSpotNo(netDb.getBaseSpot2No());
-            oci.setBaseSpotName(netDb.getBaseSpot2Name());
-            oci.setMeterWeight(netDb.getTareWeight());
-            oci.setActualFirstNo(netDb.getActualFirst2No());
-            doSaveHisTare(oci);
-        }
+            //4、存储历史皮重及历史皮重明细信息
+            if ("1".equals(saveTare)) {
+                MeterWorkCarActualFirst oci = new MeterWorkCarActualFirst();
+                oci.setCarNo(netDb.getCarNo());
+                oci.setCreateTime(netDb.getTareTime());
+                oci.setBaseSpotNo(netDb.getBaseSpot2No());
+                oci.setBaseSpotName(netDb.getBaseSpot2Name());
+                oci.setMeterWeight(netDb.getTareWeight());
+                oci.setActualFirstNo(netDb.getActualFirst2No());
+                doSaveHisTare(oci);
+            }
 
-        //5、保存图片
-        SaveImg(secondDb);
+            //5、保存图片
+            SaveImg(secondDb);
 
-        //6、修改计量监控
-        updateMonitor(secondDb.getBaseSpotNo());
+            //6、修改计量监控
+            updateMonitor(secondDb.getBaseSpotNo());
 
-        //保存日志
-        saveNote(note);
+            //保存日志
+            saveNote(note);
 
-        //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
-        updatePreWeight(secondDb.getCarNo());
+            //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+            updatePreWeight(secondDb.getCarNo());
 
-        updateMonitorOver(secondDb.getActualFirstNo(), secondDb.getBaseSpotNo());
+            updateMonitorOver(secondDb.getActualFirstNo(), secondDb.getBaseSpotNo());
 
-        //重量类型为毛重则调用接口为
-        String flag = "";
-        /*
-        if("0".equals(secondDb.getWeightType())){
-            flag = transferParamForLims(netDb.getCarNo(),netDb.getMatterNo(),netDb.getReceivingUintName(),netDb.getForwardingUnitName(),netDb.getNetWeight().toString(),netDb.getNetTime(),"",netDb.getActualNo());
-        }
-        //*/
+            //重量类型为毛重则调用接口为
+            String flag = "";
+            /*
+            if("0".equals(secondDb.getWeightType())){
+                flag = transferParamForLims(netDb.getCarNo(),netDb.getMatterNo(),netDb.getReceivingUintName(),netDb.getForwardingUnitName(),netDb.getNetWeight().toString(),netDb.getNetTime(),"",netDb.getActualNo());
+            }
+            //*/
 
-        //补充附加重量的数据
-        if (StringUtils.isNotEmpty(secondDb.getAddWgtPk())) {
-            insertAddWgtNo(secondDb.getActualFirstNo(), secondDb.getAddWgtPk(), secondDb.getCreateManNo(), secondDb.getCreateManName());
-        }
+            //补充附加重量的数据
+            if (StringUtils.isNotEmpty(secondDb.getAddWgtPk())) {
+                insertAddWgtNo(secondDb.getActualFirstNo(), secondDb.getAddWgtPk(), secondDb.getCreateManNo(), secondDb.getCreateManName());
+            }
 
 
-        rm.setData(secondDb.getActualFirstNo());
-        rm.setMessage(flag);
-        return rm;
+            rm.setData(secondDb.getActualFirstNo());
+            rm.setMessage(flag);
+            return rm;
+        }
+        catch (Exception e){
+            RESTfulResult rm = new RESTfulResult();
+            rm.setCode("500");
+            rm.setData(null);
+            rm.setMessage(e.getMessage());
+            e.printStackTrace();
+            return rm;
+        }
     }
 
 
@@ -2885,5 +2907,118 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }
         return "";
     }
+
+    @Override
+    public RESTfulResult doNetAddTwo(MeterWorkCarActualFirst one, MeterWorkCarActual two, PreTrackScale three, PreTrackScale four) throws Exception {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setCode("200");
+
+        //1、存储当前计量的数据
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
+        String afl = formatter.format(one.getCreateTime());
+        String no = meterWorkCarActualFirstMapper.getNewID(afl);
+        one.setActualFirstNo(formatter.format(new Date()) + no);
+        one.setValueFlag("2");//洁净
+        meterWorkCarActualFirstMapper.insertSelective(one);
+
+        //修改一次计量数据为洁净
+        MeterWorkCarActualFirst firstUpdate = new MeterWorkCarActualFirst();
+        //2、存储洁净数据
+        if (one.getMeterWeight().equals(two.getTareWeight())) {
+            //二次重量如果跟皮重一样
+            two.setActualFirst2No(one.getActualFirstNo());
+            firstUpdate.setActualFirstNo(two.getActualFirst1No());
+        } else {
+            two.setActualFirst1No(one.getActualFirstNo());
+            firstUpdate.setActualFirstNo(two.getActualFirst2No());
+        }
+
+        //3、修改第一次存储的计量数据状态为洁净
+        if (firstUpdate.getActualFirstNo() != null) {
+            firstUpdate.setValueFlag("2");
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstUpdate);
+        }
+
+        //4、判断第一次计量数据是否匹配委托
+        MeterWorkCarActualFirst mwca1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(two.getActualFirst1No());
+        if(mwca1.getPredictionNo().equals("")){
+            MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(firstUpdate.getActualFirstNo(), three.getPredictionNo());
+            meca1.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
+        }
+        //5、判断这次一次计量数据是否匹配委托
+        if (one.getPredictionNo().equals("")){
+            MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(one.getActualFirstNo(), three.getPredictionNo());
+            meca1.setIsPreScale("1");
+            meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
+        }
+
+        //6、插入另外两条一次数据，并匹配委托
+        MeterWorkCarActualFirst mwcaf1 = meterWorkCarActualFirstMapper.selectAndMatch(one.getActualFirstNo(), four.getPredictionNo());
+        mwcaf1.setIsPreScale("1");
+        meterWorkCarActualFirstMapper.insertSelective(mwcaf1);
+        MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectAndMatch(firstUpdate.getActualFirstNo(), four.getPredictionNo());
+        mwcaf2.setIsPreScale("1");
+        meterWorkCarActualFirstMapper.insertSelective(mwcaf2);
+
+
+        //7、判断洁净数据是否匹配委托
+        if(two.getPredictionNo().equals("")){
+            MeterWorkCarActual mwcaOld = meterWorkCarActualMapper.mathPredcition(two.getActualNo(), three.getPredictionNo());
+            BeanUtils.copyProperties(mwcaOld,two);
+        }
+
+        //8、插入洁净数据
+        String no1 = meterWorkCarActualMapper.getNewID(afl);
+        two.setActualNo(afl + no1);
+        two.setIsPreScale("1");
+        two.setUploadFlag("1");
+        if (two != null && two.getNetWeight() != null) {
+            //2021年3月7日 净重保留两位小数；
+            BigDecimal net;
+            net = new BigDecimal(String.valueOf(two.getNetWeight())).setScale(2, BigDecimal.ROUND_HALF_UP);
+            two.setNetWeight(net);
+        }
+        meterWorkCarActualMapper.insert(two);
+
+
+        //9、复制一份新的洁净数据并匹配委托
+        MeterWorkCarActual mwcaNew = meterWorkCarActualMapper.mathPredcition(two.getActualNo(),four.getPredictionNo());
+        mwcaNew.setActualNo(formatter.format(new Date()) + meterWorkCarActualMapper.getNewID(afl));
+        mwcaNew.setIsPreScale("1");
+        mwcaNew.setUploadFlag("1");
+        meterWorkCarActualMapper.insertSelective(mwcaNew);
+
+        //修改委托为已使用状态
+        three.setValueFlag("4");
+        three.setUploadFlag("1");
+        preTrackScaleMapper.updateByPrimaryKeySelective(three);
+        four.setValueFlag("4");
+        four.setUploadFlag("1");
+        preTrackScaleMapper.updateByPrimaryKeySelective(four);
+
+        //10、保存图片
+        SaveImg(one);
+
+        //11、修改计量监控
+        updateMonitor(one.getBaseSpotNo());
+
+        //12、当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+        updatePreWeight(one.getCarNo());
+
+        updateMonitorOver(one.getActualFirstNo(), one.getBaseSpotNo());
+
+        //重量类型为毛重则调用接口为
+        String flag = "";
+
+        //补充附加重量的数据
+        if (StringUtils.isNotEmpty(one.getAddWgtPk())) {
+            insertAddWgtNo(one.getActualFirstNo(), one.getAddWgtPk(), one.getCreateManNo(), one.getCreateManName());
+        }
+
+        rm.setData(one.getActualFirstNo());
+        rm.setMessage(flag);
+        return rm;
+    }
 }