后端提交

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/controller/MeterBaseSpecialUnitController.java

@@ -77,6 +77,15 @@ public class MeterBaseSpecialUnitController extends BaseRESTfulController {
         PageList<MeterBaseSpecialUnit> list = meterBaseSpecialUnitService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    //@RequiresPermissions("meterbasespecialunit:view")
+    @PostMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc(@RequestBody HashMap parmas){
+        List<MeterBaseSpecialUnit> list = meterBaseSpecialUnitService.likeByDesc(parmas);
+        
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MeterBaseSpecialUnit对象创建")
     @ApiImplicitParam(name = "meterBaseSpecialUnit", value = "详细实体meterBaseSpecialUnit", required = true, dataType = "MeterBaseSpecialUnit")

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/mapper/MeterBaseSpecialUnitMapper.java

@@ -3,8 +3,13 @@ package com.steerinfo.baseinfo.meterbasespecialunit.mapper;
 import com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import io.micrometer.core.instrument.Meter;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface MeterBaseSpecialUnitMapper extends IBaseMapper<MeterBaseSpecialUnit, String> {
+    List<MeterBaseSpecialUnit> likeByDesc(Map<String, Object> var1);
 }

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/mapper/MeterBaseSpecialUnitMapper.xml

@@ -234,5 +234,9 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-  
+  <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+    order By create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/service/IMeterBaseSpecialUnitService.java

@@ -4,6 +4,8 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasespecialunit.model.MeterBaseSpecialUnit;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseSpecialUnit服务接口：
@@ -19,5 +21,5 @@ import java.math.BigDecimal;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterBaseSpecialUnitService extends IBaseService<MeterBaseSpecialUnit, String>{
-
+    List<MeterBaseSpecialUnit> likeByDesc(HashMap<String, Object> parmas);
 }

src/main/java/com/steerinfo/baseinfo/meterbasespecialunit/service/impl/MeterBaseSpecialUnitServiceImpl.java

@@ -7,8 +7,12 @@ import com.steerinfo.baseinfo.meterbasespecialunit.mapper.MeterBaseSpecialUnitMa
 import com.steerinfo.baseinfo.meterbasespecialunit.service.IMeterBaseSpecialUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseSpecialUnit服务实现：
@@ -26,11 +30,18 @@ import java.math.BigDecimal;
 @Service(value = "meterBaseSpecialUnitService")
 public class MeterBaseSpecialUnitServiceImpl extends BaseServiceImpl<MeterBaseSpecialUnit, String> implements IMeterBaseSpecialUnitService {
 
-    @Autowired
+    @Resource
     private MeterBaseSpecialUnitMapper meterBaseSpecialUnitMapper;
 
     @Override
     protected IBaseMapper<MeterBaseSpecialUnit, String> getMapper() {
         return meterBaseSpecialUnitMapper;
     }
+
+    @Override
+    public List<MeterBaseSpecialUnit> likeByDesc(HashMap<String, Object> parmas) {
+        List<MeterBaseSpecialUnit> rows = meterBaseSpecialUnitMapper.likeByDesc(parmas);
+
+        return rows;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -540,6 +540,22 @@ throw new MarkerMetException(500, "操作异常！！");
         return rm;
     }
 
+    @ApiOperation(value = "普通委托解除洁净", notes = "将洁净后的数据进行还原")
+    @PostMapping(value = "/commonRemove")
+    public RESTfulResult commonRemove(@RequestBody HashMap params) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkCarActualService.commonRemove(params);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "查询计量票据录入数据")
     @PostMapping(value = "/selectManualData")
     @Transactional(rollbackFor = Exception.class)

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

@@ -3177,7 +3177,7 @@
        t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
        t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t2.data_source,
        t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
-       t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
+       t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.net_man_no net_man_no, t2.met_man_name net_man_name, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
     from METER_WORK_CAR_ACTUAL_FIRST t1,METER_WORK_CAR_ACTUAL_FIRST t2
     where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.actual_first_no=#{dataNo,jdbcType=VARCHAR}
  </select>
@@ -3197,7 +3197,7 @@
                t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
                t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,
                t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
-               t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
+               t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.net_man_no net_man_no, t2.met_man_name net_man_name, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
         from METER_WORK_CAR_ACTUAL_FIRST t1,METER_WORK_CAR_ACTUAL_FIRST t2, PRE_TRACK_SCALE T3
         where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.actual_first_no=#{dataNo,jdbcType=VARCHAR} AND T3.prediction_no =#{predictionNo,jdbcType=VARCHAR}
     </select>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -62,6 +62,7 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     public int removeButNotEntrust(List<MeterWorkCarActual> models);
 
     RESTfulResult specialRemove(HashMap map);
+    RESTfulResult commonRemove(HashMap map);
 
     MeterWorkCarActual termclean(String actualFirstNo, String dataNo);
 

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

@@ -823,6 +823,71 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return rm;
     }
 
+    @Override
+    public RESTfulResult commonRemove(HashMap params) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        rm.setData(null);
+        rm.setCode("500");
+
+        MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(params.get("actualNo").toString());
+        if(actualModel == null){
+            rm.setMessage("未找到一次计量数据，请确认！！！");
+            return rm;
+        }
+        List<MeterWorkCarActual> models = new ArrayList<MeterWorkCarActual>();
+        models.add(actualModel);
+
+        if(models == null || models.size() == 0) {
+            rm.setMessage("参数为空，请确认！！！");
+            return rm;
+        }
+
+        for (MeterWorkCarActual model: models) {
+            //循环每一个洁净记录
+            //委托不能为空
+            if(!model.getPredictionNo().equals("")){
+                // 改委托
+                if (StringUtils.isNotEmpty(model.getPredictionNo())) {
+                    PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                    scale.setValueFlag("1");
+                    scale.setUploadFlag("1");
+                    scale.setUpdateTime(new Date());
+                    scale.setUpdateManNo("system");
+                    scale.setUpdateManName("洁净废除操作");
+                    preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+                }
+            }
+            // 清空一次毛重、皮重委托信息
+            MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
+            MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
+            if(firstGross != null){
+                firstGross.setValueFlag(DbConstants.VALID);
+                firstGross.setUpdateManName("system");
+                firstGross.setUpdateManName("洁净废除更新");
+                firstGross.setNote(model.getNote());
+                firstGross.setUpdateTime(new Date());
+                firstGross.setIsPreScale("0");
+                meterWorkCarActualFirstMapper.updateByPrimaryKey(firstGross);
+            }
+            if(firstTare != null){
+                firstTare.setValueFlag(DbConstants.VALID);
+                firstTare.setUpdateManName("system");
+                firstTare.setUpdateManName("洁净废除更新");
+                firstTare.setNote(model.getNote());
+                firstTare.setUpdateTime(new Date());
+                firstTare.setIsPreScale("0");
+                meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
+            }
+            // 删洁净
+            meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+        }
+        rm.setSucceed();
+        rm.setMessage("操作成功！！");
+        rm.setCode("200");
+        return rm;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int manualInput (MeterWorkCarActual model) {

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.java

@@ -22,4 +22,5 @@ public interface MeterWorkMonitorMapper extends IBaseMapper<MeterWorkMonitor, St
 
     int UpdateUserNo(List<MeterWorkMonitor> list);
 
+    List<MeterWorkMonitor> weightByCarNo(HashMap<String, Object> map);
 }

src/main/java/com/steerinfo/meterwork/meterworkmonitor/mapper/MeterWorkMonitorMapper.xml

@@ -1942,5 +1942,21 @@
       #{item.pointNo,jdbcType=VARCHAR}
     </foreach>
   </update>
-  
+
+  <select id="weightByCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1 != 1
+      <if test="rfidCar != null and rfidCar != ''">
+        or RFID_CAR = #{rfidCar}
+      </if>
+      <if test="photoCar != null and photoCar != ''">
+        or PHOTO_CAR = #{photoCar}
+      </if>
+      <if test="scanCar != null and scanCar != ''">
+        or SCAN_CAR = #{scanCar}
+      </if>
+      <if test="editCar != null and editCar != ''">
+        or EDIT_CAR = #{editCar}
+      </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkmonitor/service/impl/MeterWorkMonitorServiceImpl.java

@@ -116,24 +116,17 @@ public class MeterWorkMonitorServiceImpl extends BaseServiceImpl<MeterWorkMonito
         try{
             HashMap<String, Object> map = new HashMap();
             map.put("rfidCar", rfidCar);
-            List<MeterWorkMonitor> models = meterWorkMonitorMapper.selectByParameters(map);
+            map.put("photoCar", rfidCar);
+            map.put("scanCar", rfidCar);
+            map.put("editCar", rfidCar);
+            List<MeterWorkMonitor> models = meterWorkMonitorMapper.weightByCarNo(map);
             if(models.size() >= 1) {
                 rm.setSucceed();
                 rm.setData(models.get(0));
                 rm.setMessage("操作成功！！");
                 rm.setCode("200");
             }else {
-                map.remove("rfidCar");
-                map.put("photoCar", rfidCar);
-                models = meterWorkMonitorMapper.selectByParameters(map);
-                if(models.size() >= 1) {
-                    rm.setSucceed();
-                    rm.setData(models.get(0));
-                    rm.setMessage("操作成功！！");
-                    rm.setCode("200");
-                }else{
-                    rm.setMessage("根据车号未查询到相应重量信息,请确认！！");
-                }
+                rm.setMessage("根据车号未查询到相应重量信息,请确认！！");
             }
             return rm;
         }catch(Exception e) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -204,20 +204,14 @@ throw new MarkerMetException(500, "操作异常！！");
     public RESTfulResult chechandadd(@RequestBody MeterWorkRailwayActFirst model) {
         RESTfulResult rm = failed();
         try {
-            int num = meterWorkRailwayActFirstService.checkandadd(model);
-            if (num >= 1) {
-                return success(num);
-            } else {
-                return failed("新增失败");
-            }
+            rm = meterWorkRailwayActFirstService.checkandadd(model);
+            return rm;
         } catch (MarkerMetException e) {
             e.printStackTrace();
             rm.setMessage(e.getMessage());
         } catch (Exception e) {
             e.printStackTrace();
             rm.setMessage("操作异常，请确认！");
-        } finally {
-
         }
         return rm;
     }
@@ -717,19 +711,13 @@ throw new MarkerMetException(500, "操作异常！！");
     public RESTfulResult doAddWfStatic(@RequestBody MeterWorkRailwayActFirst model) {
         RESTfulResult rm = failed();
         try {
-            String no = meterWorkRailwayActFirstService.doAddWfStatic(model);
-            if (StringUtils.isEmpty(no)) {
-                return failed(null, "新增数据失败");
-            }
-            return success(no);
+            rm = meterWorkRailwayActFirstService.doAddWfStatic(model);
         } catch (MarkerMetException e) {
             e.printStackTrace();
             rm.setMessage(e.getMessage());
         } catch (Exception e) {
             e.printStackTrace();
             rm.setMessage("操作异常，请确认！");
-        } finally {
-
         }
         return rm;
     }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -34,7 +34,7 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWorkRailwayActFirst, String>{
-    int checkandadd(MeterWorkRailwayActFirst model);
+    RESTfulResult checkandadd(MeterWorkRailwayActFirst model);
 
     int checkandupdate(MeterWorkRailwayActFirst model);
 
@@ -75,7 +75,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
 
     PageList<MeterWorkRailwayActFirst> selectDiff(String flag, Integer pageNum, Integer pageSize);
 
-    String doAddWfStatic(MeterWorkRailwayActFirst firstRail) throws Exception;
+    RESTfulResult doAddWfStatic(MeterWorkRailwayActFirst firstRail) throws Exception;
 
     RESTfulResult doAddWfStaticTwo(PreRailwayScale scale, MeterWorkRailwayActFirst grossModel, MeterWorkRailwayActFirst tareModel);
 

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

@@ -103,18 +103,33 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int checkandadd(MeterWorkRailwayActFirst model) {
+    public RESTfulResult checkandadd(MeterWorkRailwayActFirst model) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
         try {
+            List<MeterWorkRailwayActFirst> firsts = new ArrayList<>();
+            HashMap<String, Object> map = new HashMap<>();
+
             check1(model);
             model.setDataSource("1");
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String no = meterWorkRailwayActFirstMapper.getNewID(sdf.format(new Date()));
             model.setActualFirstNo(sdf.format(new Date()) + no);
-            int num = meterWorkRailwayActFirstMapper.insertSelective(model);
-            return num;
-        } catch (MarkerMetException e) {
-            throw e;
+            int i = meterWorkRailwayActFirstMapper.insertSelective(model);
+
+            if(i >= 1) {
+                firsts.add(model);
+            }
+            map.put("firsts", firsts);
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！>>>" + e.getMessage());
         }
+        return rm;
     }
 
 
@@ -2173,9 +2188,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String doAddWfStatic(MeterWorkRailwayActFirst model) throws Exception {
+    public RESTfulResult doAddWfStatic(MeterWorkRailwayActFirst model) throws Exception {
         BigDecimal zero = new BigDecimal(0);
-        String id = "";//需要返回的作业编号
+        //String id = "";//需要返回的作业编号
+        HashMap<String, Object> map = new HashMap<>();
+        List<MeterWorkRailwayActFirst> firsts = new ArrayList<>();
+        List<MeterWorkRailwayActual> actuals = new ArrayList<>();
+        RESTfulResult rm = new RESTfulResult();
+        rm.setSucceed();
+        rm.setCode("0");
+        rm.setMessage("操作成功！！");
+
         /*if (model == null || StringUtils.isEmpty(model.getPredictionNo())) {
             throw new MarkerMetException(500, "预报编号为空不允许进行保存操作!");
         }*/
@@ -2261,12 +2284,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 model.setWeightType("0");
                 model.setMeterSortWeight(zero); //分检重量
                 model.setMeterBalanceWeight(model.getMeterWeight()); //结算重量
-                id = doAddWfStaticFrist(model);
+                doAddWfStaticFrist(model);
                 //3、修改预报状态为【使用中】
                 if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                     ids.add(model.getPredictionNo());
                     preRailwayScaleMapper.batchUpdateByIdsForIn(ids);
                 }
+
+                firsts.add(model);
+                map.put("firsts", firsts);
                 //============一毛一皮的计量数据处理结束==============
             } else {
                 //============毛重+自重的计量数据处理开始==============
@@ -2275,7 +2301,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 model.setMeterSortWeight(zero); //分检重量
                 model.setMeterBalanceWeight(model.getMeterWeight());//结算重量
                 model.setCreateTime(new Date()); //服务端重新赋值，避免出现皮重比毛重时间晚的情况；2021年6月10日
-                id = doAddWfStaticFrist(model);
+                doAddWfStaticFrist(model);
 
                 //皮重计量实体的组装；皮重数据保存
                 MeterWorkRailwayActFirst railwayActFirstTare = new MeterWorkRailwayActFirst();
@@ -2287,30 +2313,40 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 Calendar tareDate = Calendar.getInstance();
                 tareDate.add(Calendar.SECOND, -10);//自重的皮重减10s,用于查询最近的一条毛重数据，保证复磅数据准确
                 railwayActFirstTare.setCreateTime(tareDate.getTime());
-                id = doAddWfStaticFrist(railwayActFirstTare);
+                doAddWfStaticFrist(railwayActFirstTare);
 
                 //保存历史皮重
                 if(railwayActFirstTare.getWeightType().equals("1")){
                     doSaveTare(railwayActFirstTare);
                 }
+                MeterWorkRailwayActual actual = new MeterWorkRailwayActual();
                 if(StringUtils.isNotEmpty(model.getPredictionNo())){
                     //净重数据保存
                     PreRailwayScale preRailwayScale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                    doAddWfStaticNet(preRailwayScale, model, railwayActFirstTare); //预报，毛重，皮重
+                    actual = doAddWfStaticNet(preRailwayScale, model, railwayActFirstTare); //预报，毛重，皮重
                 }else{
-                    doAddWfStaticNetNot(model, railwayActFirstTare);
+                    actual = doAddWfStaticNetNot(model, railwayActFirstTare);
                 }
 
+                railwayActFirstTare.setValueFlag("0");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(railwayActFirstTare);
                 //3、修改预报状态为【已使用】
                 if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                     ids.add(model.getPredictionNo());
                     preRailwayScaleMapper.batchUpdateByIdsForUsed(ids);
                 }
+
+                firsts.add(model);
+                map.put("firsts", firsts);
+                actuals.add(actual);
+                map.put("actuals", actuals);
                 //============毛重+自重的计量数据处理结束==============
             }
             //===========一次计量处理结束==============
         } else {
             //===========二次计量处理开始==============
+            MeterWorkRailwayActual actual = new MeterWorkRailwayActual();
+            MeterWorkRailwayActFirst first = new MeterWorkRailwayActFirst();
             for (MeterWorkRailwayActFirst mwraf : mwrafs) {
 
                 //保存第二次的一次计量数据；特别说明：先皮后毛不会做分检，所以不需要考虑
@@ -2363,7 +2399,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirst.setMeterBalanceWeight(meterWorkRailwayActFirst.getMeterWeight());
 
 
-                id = doAddWfStaticFrist(meterWorkRailwayActFirst);
+                doAddWfStaticFrist(meterWorkRailwayActFirst);
                 //保存洁净数据
                 if (mwraf.getMeterWeight().compareTo(meterWorkRailwayActFirst.getMeterWeight()) >= 0) {
                     //保存历史皮重
@@ -2374,9 +2410,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     if(StringUtils.isNotEmpty(model.getPredictionNo())){
                         //净重数据保存
                         PreRailwayScale preRailwayScale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                        doAddWfStaticNet(preRailwayScale, model, meterWorkRailwayActFirst); //预报，毛重，皮重
+                        actual = doAddWfStaticNet(preRailwayScale, model, meterWorkRailwayActFirst); //预报，毛重，皮重
                     }else{
-                        doAddWfStaticNetNot(model, meterWorkRailwayActFirst);
+                        actual = doAddWfStaticNetNot(model, meterWorkRailwayActFirst);
                     }
                    // doAddWfStaticNet(prs, mwraf, meterWorkRailwayActFirst); //预报，毛重，皮重
                 } else {
@@ -2388,9 +2424,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     if(StringUtils.isNotEmpty(model.getPredictionNo())){
                         //净重数据保存
                         PreRailwayScale preRailwayScale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
-                        doAddWfStaticNet(preRailwayScale, meterWorkRailwayActFirst, mwraf); //预报，毛重，皮重
+                        actual = doAddWfStaticNet(preRailwayScale, meterWorkRailwayActFirst, mwraf); //预报，毛重，皮重
                     }else{
-                        doAddWfStaticNetNot(model, meterWorkRailwayActFirst);
+                        actual = doAddWfStaticNetNot(model, meterWorkRailwayActFirst);
                     }
 
                     //doAddWfStaticNet(prs, meterWorkRailwayActFirst, mwraf);//预报，皮重，毛重
@@ -2401,6 +2437,11 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 ids.add(model.getPredictionNo());
                 preRailwayScaleMapper.batchUpdateByIdsForUsed(ids);
             }
+            firsts.add(model);
+            map.put("firsts", firsts);
+            actuals.add(actual);
+            map.put("actuals", actuals);
+
         }
         //===========二次计量处理结束==============
         //4、保存图片（一、二次计量共用）
@@ -2410,7 +2451,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             e.printStackTrace();
             //throw new MarkerMetException(500, "保存图片失败");
         }*/
-        return id;
+        rm.setData(map);
+
+        return rm;
     }
 
     @Override
@@ -2420,6 +2463,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
         try {
             HashMap<String, Object> map = new HashMap<>();
+            List<MeterWorkRailwayActFirst> firsts = new ArrayList<>();
+            List<MeterWorkRailwayActual> actuals = new ArrayList<>();
+
+            BigDecimal num = grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()).abs();
+            if(num.compareTo(BigDecimal.valueOf(400)) == -1){
+                rm.setMessage("选择的两条一次计量数据不能小于400kg，请确认！！");
+                return rm;
+            }
+            if(!grossModel.getRailwayNo().equals(tareModel.getRailwayNo())){
+                rm.setMessage("两条一次计量数据车号不一致,请确认！！");
+                return rm;
+            }
 
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
@@ -2443,16 +2498,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //皮重一次
             MeterWorkRailwayActFirst model02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(tareModel.getActualFirstNo());
 
-            BigDecimal num = model01.getMeterWeight().subtract(model02.getMeterWeight()).abs();
-            if(num.compareTo(BigDecimal.valueOf(400)) == -1){
-                rm.setMessage("选择的两条一次计量数据不能小于400kg，请确认！！");
-                return rm;
-            }
-            if(!model01.getRailwayNo().equals(model02.getRailwayNo())){
-                rm.setMessage("两条一次计量数据车号不一致,请确认！！");
-                return rm;
-            }
-
             //修改委托状态
             if(scale != null) {
                 //委托信息是否为有效数据
@@ -2514,6 +2559,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
             }else {
+                //修改毛重一次数据状态
+                model01.setValueFlag(DbConstants.NET);
+                model01.setUpdateManName("system");
+                model01.setUpdateManName("自动匹配更新");
+                model01.setUpdateTime(new Date());
+                model01.setWeightType("0");
+                model01.setIsPreSacale("0");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
+                //修改皮重一次数据状态
+                model02.setValueFlag(DbConstants.NET);
+                model02.setUpdateManName("system");
+                model02.setUpdateManName("自动匹配更新");
+                model02.setUpdateTime(new Date());
+                model02.setWeightType("1");
+                model02.setIsPreSacale("0");
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
+
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(model01.getActualFirstNo(), model02.getActualFirstNo());
                 BeanUtils.copyProperties(mwca1, actualRow);
                 //保存洁净
@@ -2531,11 +2593,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
 
             if(flag.equals("0")) {
-                map.put("firstModel", model01);
+                firsts.add(model01);
             }else if(flag.equals("1")) {
-                map.put("firstModel", model02);
+                firsts.add(model02);
             }
-            map.put("actualModel", actualRow);
+            actuals.add(actualRow);
+            map.put("firsts", firsts);
+            map.put("actuals", actuals);
 
             rm.setSucceed();
             rm.setData(map);
@@ -2801,7 +2865,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         two.setValueFlag("2");//洁净
         two.setWeightType("1");//皮重
         meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(one);
-        meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(two);
+        //meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(tow);
+        meterWorkRailwayActFirstMapper.deleteByPrimaryKey(two.getActualFirstNo());
         return netRail;
     }
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -2963,7 +2963,7 @@
            t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
            t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t1.railway_type_no RAILWAY_TYPE_NO,t1.railway_type_name RAILWAY_TYPE_NAME,
            t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
-           t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE
+           t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.create_man_no net_man_no, t2.create_man_name net_man_name, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE
             ,t2.arrival ARRIVAL, t2.station STATION,t2.memo MEMO,t2.source_area SOURCE_AREA
     from METER_WORK_RAILWAY_ACT_FIRST t1,METER_WORK_RAILWAY_ACT_FIRST t2
     where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.actual_first_no=#{dataNo,jdbcType=VARCHAR}
@@ -2984,7 +2984,7 @@
            t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
            t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t1.railway_type_no RAILWAY_TYPE_NO,t1.railway_type_name RAILWAY_TYPE_NAME,
            t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
-           t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name,  t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE
+           t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.create_man_no net_man_no, t2.create_man_name net_man_name, t2.base_spot_no net_spot3_no, t2.base_spot_name net_spot3_name, t2.create_time create_time,  t2.create_man_name create_man_name,  t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE
             ,t2.arrival ARRIVAL, t2.station STATION,t2.memo MEMO,t2.source_area SOURCE_AREA
     from METER_WORK_RAILWAY_ACT_FIRST t1,METER_WORK_RAILWAY_ACT_FIRST t2, PRE_RAILWAY_SCALE T3
     where t1.actual_first_no=#{actualFirstNo,jdbcType=VARCHAR} and t2.actual_first_no=#{dataNo,jdbcType=VARCHAR} AND T3.prediction_no =#{predictionNo,jdbcType=VARCHAR}