后端修改

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/mapper/MeterWorkOldAndNewMapper.xml

@@ -344,7 +344,7 @@
             and fs_senderRemark LIKE '%${senderRemark}%'
         </if>
         <if test="carNo != null and carNo != ''">
-            and FS_CARNO LIKE '%${carNo}%'
+            and REPLACE(FS_CARNO,'-','') LIKE '%${carNo}%'
         </if>
         group by fs_material, fs_materialName, fs_sender , fs_senderName , fs_receiver , fs_receiverName
         )

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

@@ -1095,10 +1095,11 @@ throw new MarkerMetException(500, "操作异常！！");
             String actualNo = parmas.get("actualNo") == null ? "" : parmas.get("actualNo").toString();
             String predictionNo = parmas.get("predictionNo") == null ? "" : parmas.get("predictionNo").toString();
             String tareWeight = parmas.get("tareWeight") == null ? "" : parmas.get("tareWeight").toString();
-
             String msg = meterWorkRailwayActFirstService.fixedTare(actualNo, tareWeight, predictionNo);
             if (!msg.equals("")){
                 return rm;
+            }else {
+                msg = "操作成功";
             }
             rm.setSucceed();
             rm.setCode("200");

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

@@ -3035,6 +3035,21 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 return "当前计量数据状态不允许结净，状态为"+grossModel.getValueFlag()+"，请确认！！";
             }
         }
+
+        String scaleNo = null;
+        if(predictionNo != null && StringUtils.isNotEmpty(predictionNo)) {
+            if(grossModel.getPredictionNo() != null && StringUtils.isNotEmpty(grossModel.getPredictionNo())) {
+                if (!grossModel.getPredictionNo().equals(predictionNo)) {
+                    return "当前计量数据已匹配委托不允许再次勾选其他委托";
+                }
+                scaleNo = grossModel.getPredictionNo();
+            }
+            scaleNo = predictionNo;
+        }else {
+            if(grossModel.getPredictionNo() != null && StringUtils.isNotEmpty(grossModel.getPredictionNo())) {
+                scaleNo = grossModel.getPredictionNo();
+            }
+        }
         MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
         String afl = sdf.format(new Date());
@@ -3053,24 +3068,27 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
 
             PreRailwayScale scale = new PreRailwayScale();
-            if (!com.steerinfo.util.StringUtils.isEmpty(predictionNo)) {
-                scale = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
+            if (!com.steerinfo.util.StringUtils.isEmpty(scaleNo)) {
+                scale = preRailwayScaleMapper.selectByPrimaryKey(scaleNo);
             }
-            if (!com.steerinfo.util.StringUtils.isEmpty(predictionNo) && scale != null) {  //有预报编号进行预报更新
+            if (!com.steerinfo.util.StringUtils.isEmpty(scaleNo) && scale != null) {  //有预报编号进行预报更新
                 //将委托中的编号和收发货的等数据拷贝进一次数据中
-                MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), predictionNo);
+                MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(grossModel.getActualFirstNo(), scaleNo);
                 BeanUtils.copyProperties(first1, grossModel);
-                MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), predictionNo);
+                MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(tareModel.getActualFirstNo(), scaleNo);
                 BeanUtils.copyProperties(first2, tareModel);
                 grossModel.setIsPreSacale("1");
+                grossModel.setPredictionType("1");
                 tareModel.setIsPreSacale("1");
+                tareModel.setPredictionType("1");
                 //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
-                MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), predictionNo);
+                MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), scaleNo);
                 BeanUtils.copyProperties(mwca1, actualRow);
                 actualRow.setIsPreSacale("1");
+                actualRow.setPredictionType("1");
 
                 //更新预报数据
-                scale.setPredictionNo(predictionNo);
+                scale.setPredictionNo(scaleNo);
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
                 scale.setUpdateManNo("system");
@@ -5006,26 +5024,28 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 meterWorkRailwayActFirstMapper.insertSelective(mwrac);
                 count++;
             }
-            /*int count = 0;
-            for(MeterWorkRailwayActFirst model: models) {
-                model.setWeightType("1");
-                model.setCreateTime(new Date());
-                int i = meterWorkRailwayActFirstMapper.insertSelective(model);
-                int j = meterWorkRailwayMotorialReceive.update
-                if(i >= 1) {
-                    count++;
+            HashMap<String, Object> obj = new HashMap();
+            obj.put("railwayWorkNo", models.get(0).getRailwayWorkNo());
+            obj.put("valueFlag", "1");
+            List<MeterWorkRailwayReceived> receiveds = meterWorkRailwayReceivedMapper.selectByParameters(obj);
+            if(receiveds.size() < 1) {
+                HashMap<String, Object> recMainMap = new HashMap<>();
+                recMainMap.put("soundName", models.get(0).getRailwayWorkNo());
+                List<MeterWorkRailwayRecMain> recMain = meterWorkRailwayRecMainMapper.selectByParameters(recMainMap);
+                if(recMain.size() < 1) {
+                    rm.setMessage("根据车次:" + models.get(0).getActualFirstNo() +"未查询到车次信息");
+                    return rm;
                 }
+                recMain.get(0).setIsDispose("1");
+                meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMain.get(0));
             }
             rm.setSucceed();
             rm.setCode("200");
-            rm.setMessage("操作成功,总共" + count + "条及记录转换成功！！");*/
-            rm.setSucceed();
-            rm.setCode("200");
             rm.setMessage("操作成功,总共" + count + "条及记录转换成功！！");
         } catch (Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
         }
         return rm;
     }

src/main/java/com/steerinfo/pretrack/prerailwayscale/controller/PreRailwayScaleController.java

@@ -107,6 +107,22 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "web端-计量委托倒序获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/likeByList/")
+    public RESTfulResult likeByList(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<PreRailwayScale> list = preRailwayScaleService.likeByList(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "C#动轨倒序获取列表", notes = "不分页模糊查询")
     @PostMapping(value = "/noPage")
     public RESTfulResult listLikePost(@RequestBody HashMap parmas) {

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.java

@@ -54,6 +54,7 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
     List<PreRailwayScale> selectByRailwayNo(@Param( value = "railwayNo") String railwayNo);
     List<PreRailwayScale> likeByDesc(Map<String, Object> var1);
     List<PreRailwayScale> likeDesc(Map<String, Object> var1);
+    List<PreRailwayScale> likeByList(Map<String, Object> var1);
     List<PreRailwayScale> noPage(Map<String, Object> var1);
     List<PreRailwayScale> noPageDesc(Map<String, Object> var1);
 

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -3142,6 +3142,29 @@
     order by TRUST_DATE_TIME desc
   </select>
 
+  <select id="likeByList" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where> 1 = 1
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO = #{railwayNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and prediction_no = #{predictionNo}
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO = #{railwayTypeNo}
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME = #{railwayTypeName}
+      </if>
+      <if test="startTime != null and startTime!='' and endTime != null and endTime!=''">
+        and TRUST_DATE_TIME between to_date(#{startTime},'yyyy-MM-dd HH24:mi:ss') and to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+      </if>
+    </where>
+        and ( ( value_flag in ('0', '1') and TRUST_AVAILABILITY_TIME >= sysDate) or value_flag in ('2', '4'))
+    order by TRUST_DATE_TIME desc
+  </select>
+
   <select id="noPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
       <include refid="select"/>
       where 1 = 1

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/IPreRailwayScaleService.java

@@ -48,6 +48,7 @@ public interface IPreRailwayScaleService extends IBaseService<PreRailwayScale, S
 
     PageList<PreRailwayScale> likeByDesc(HashMap param, Integer pageNum, Integer pageSize);
     PageList<PreRailwayScale> likeDesc(HashMap param, Integer pageNum, Integer pageSize);
+    PageList<PreRailwayScale> likeByList(HashMap param, Integer pageNum, Integer pageSize);
     List<PreRailwayScale> noPage(HashMap param);
     List<PreRailwayScale> noPageDesc(HashMap param);
 }

src/main/java/com/steerinfo/pretrack/prerailwayscale/service/impl/PreRailwayScaleServiceImpl.java

@@ -325,6 +325,14 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         return pageInfo;
     }
 
+    @Override
+    public PageList<PreRailwayScale> likeByList(HashMap param, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<PreRailwayScale> rows = preRailwayScaleMapper.likeByList(param);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public List<PreRailwayScale> noPage(HashMap param) {
         List<PreRailwayScale> rows = preRailwayScaleMapper.noPage(param);
@@ -337,6 +345,7 @@ public class PreRailwayScaleServiceImpl extends BaseServiceImpl<PreRailwayScale,
         return rows;
     }
 
+
     @Autowired
     DataSource dataSource;
 

src/main/java/com/steerinfo/pretrack/pretrackscale/controller/PreTrackScaleController.java

@@ -104,6 +104,22 @@ public class PreTrackScaleController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "web端-计量委托倒序获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/likeByList/")
+    public RESTfulResult likeByList(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<PreTrackScale> list = preTrackScaleService.likeByList(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "汽车衡结净数据补录界面获取委托未过期的倒序列表", notes = "分页模糊查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -18,6 +18,7 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
     List<PreTrackScale> selectlist(@Param( value = "carNo") String carNo);
 
     List<PreTrackScale> likeByDesc(Map<String, Object> var1);
+    List<PreTrackScale> likeByList(Map<String, Object> var1);
     List<PreTrackScale> webLikeByDesc(Map<String, Object> var1);
     List<PreTrackScale> noPageDesc(Map<String, Object> var1);
 

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3446,6 +3446,23 @@
     order By TRUST_DATE_TIME desc
   </select>
 
+  <select id="likeByList" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <where> 1 = 1
+      <if test="carNo != null and carNo != ''">
+        and car_no = #{carNo}
+      </if>
+      <if test="predictionNo != null and predictionNo != ''">
+        and prediction_no = #{predictionNo}
+      </if>
+      <if test="startTime != null and startTime!='' and endTime != null and endTime!=''">
+        and TRUST_DATE_TIME between to_date(#{startTime},'yyyy-MM-dd HH24:mi:ss') and to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
+      </if>
+    </where>
+    and ( ( value_flag in ('0', '1') and TRUST_AVAILABILITY_TIME >= sysDate) or value_flag in ('2', '4'))
+    order by TRUST_DATE_TIME desc
+  </select>
+
   <select id="webLikeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     where 1 = 1

src/main/java/com/steerinfo/pretrack/pretrackscale/service/IPreTrackScaleService.java

@@ -26,6 +26,7 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
 
     List<PreTrackScale> selectlist(String carNo);
     PageList<PreTrackScale> likeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
+    PageList<PreTrackScale> likeByList(Map<String, Object> var1, Integer var2, Integer var3);
     PageList<PreTrackScale> webLikeByDesc(Map<String, Object> var1, Integer var2, Integer var3);
     List<PreTrackScale> noPageDesc(Map<String, Object> params);
 

src/main/java/com/steerinfo/pretrack/pretrackscale/service/impl/PreTrackScaleServiceImpl.java

@@ -129,6 +129,14 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         return pageInfo;
     }
 
+    @Override
+    public PageList<PreTrackScale> likeByList(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<PreTrackScale> rows = preTrackScaleMapper.likeByList(parameters);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public PageList<PreTrackScale> webLikeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);