修改了后端接口

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -495,29 +495,28 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     return failed(null, ssoMap.get("msg").toString());
                 } else {
                     // sso注册成功时，增加车辆表
-                    if (com.steerinfo.util.StringUtils.isNotEmpty(msg) && !msg.equals("账号已被注册")) {
-                        return failed(null, msg);
-                    } else {
-                        MeterBaseCar car = new MeterBaseCar();
-                        // 将车辆类型，载重信息加入实体
-                        car.setCarNo(params.get("carNo").toString());
-                        car.setCarTypeNo(params.get("carTypeNo").toString());
-                        car.setCarTypeName(params.get("carTypeName").toString());
-                        if (params.get("carSelfWeight") != null) {
-                            car.setCarSelfWeight(new BigDecimal(params.get("carSelfWeight").toString()));
-                        }
-                        if (params.get("carCarrierWeight") != null) {
-                            car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
-                        }
-                        car.setMnemonicCode(params.get("mnemonicCode").toString());
-                        car.setCustomerSupplierName(params.get("customerSupplierName").toString());
-                        car.setMemo(params.get("memo").toString());
-                        car.setCreateManNo("admin");
-                        car.setCreateManName("admins");
-                        car.setCreateTime(new Date());
-
-                        msg = meterBaseCarService.checkandadd(car);
+                    MeterBaseCar car = new MeterBaseCar();
+                    // 将车辆类型，载重信息加入实体
+                    car.setCarNo(params.get("carNo").toString());
+                    car.setCarTypeNo(params.get("carTypeNo").toString());
+                    car.setCarTypeName(params.get("carTypeName").toString());
+                    if (params.get("carSelfWeight") != null) {
+                        car.setCarSelfWeight(new BigDecimal(params.get("carSelfWeight").toString()));
+                    }
+                    if (params.get("carCarrierWeight") != null) {
+                        car.setCarCarrierWeight(new BigDecimal(params.get("carCarrierWeight").toString()));
                     }
+//                        car.setMnemonicCode(params.get("mnemonicCode").toString());
+//                        car.setCustomerSupplierName(params.get("customerSupplierName").toString());
+//                        car.setMemo(params.get("memo").toString());
+                    car.setCreateManNo("admin");
+                    car.setCreateManName("admins");
+                    car.setCreateTime(new Date());
+
+                    // 将sso id写入车辆表，便于以后删除和重置密码
+                    car.setSsoId(ssoMap.get("data").toString());
+
+                    msg = meterBaseCarService.checkandadd(car);
                 }
             } else {
                 msg = "车辆已存在";
@@ -602,4 +601,22 @@ public class MeterBaseCarController extends BaseRESTfulController {
             return failed(null,"操作异常，请确认");
         }
     }
+
+
+    @ApiOperation(value = "批量新增车辆", notes = "批量新增车辆")
+
+    @PostMapping(value = "/batchAddCar")
+    public RESTfulResult batchAddCar(@RequestBody List<HashMap> model) {
+        try {
+            String msg = meterBaseCarService.batchAddCar(model);
+            if (msg != "" || !"".equals(msg)){
+                return failed(null,msg);
+            }
+            return success();
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasecar/service/IMeterBaseCarService.java

@@ -5,6 +5,7 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -29,4 +30,5 @@ public interface IMeterBaseCarService extends IBaseService<MeterBaseCar, String>
 
     String checkandupdate(String id,MeterBaseCar model);
 
+    String batchAddCar(List<HashMap> models);
 }

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

@@ -1,19 +1,24 @@
 package com.steerinfo.baseinfo.meterbasecar.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.baseinfo.meterbasecussupcar.model.MeterBaseCusSupCar;
 import com.steerinfo.baseinfo.meterbasedriver.model.MeterBaseDriver;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.baseinfo.meterbasecar.model.MeterBaseCar;
 import com.steerinfo.baseinfo.meterbasecar.mapper.MeterBaseCarMapper;
 import com.steerinfo.baseinfo.meterbasecar.service.IMeterBaseCarService;
+import com.steerinfo.util.SSOUtil;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -123,7 +128,75 @@ public class MeterBaseCarServiceImpl extends BaseServiceImpl<MeterBaseCar, Strin
         return "";
     }
 
-
+    @Override
+    @Transactional
+    public String batchAddCar(List<HashMap> models) {
+//        try{
+//            for (HashMap model : models){
+//                String msg = "";
+//
+//                if(model.get("carNo") == null || model.get("carNo").equals("")){
+//                    return "存在空车号";
+//                }
+//                // 检查车辆是否存在
+//                HashMap query = new HashMap();
+//                query.put("carNo", model.get("carNo").toString());
+//                query.put("validFlag", "0");
+//
+//
+//                List<MeterBaseCar> list = query(query);
+//                if (list.size() == 0) {
+//                    // sso注册
+//                    SSOUtil ssoUtil = new SSOUtil();
+//                    HashMap ssoMap = ssoUtil.ssoRegister(model);
+//                    // sso注册成功时，增加车辆表
+//                    if (ssoMap.get("code").equals("1") && !"账号已被注册".equals(ssoMap.get("msg").toString())) {
+//                        return ssoMap.get("msg").toString();
+//                    } else {
+//                        String ssoID = "";
+//                        if (ssoMap.get("code").equals("1") && "账号已被注册".equals(ssoMap.get("msg").toString())) {
+//
+//                        }
+//                        // sso注册成功时，增加车辆表
+//                        MeterBaseCar car = new MeterBaseCar();
+//                        // 将车辆类型，载重信息加入实体
+//                        car.setCarNo(model.get("carNo").toString());
+//                        car.setCarTypeNo(model.get("carTypeNo").toString());
+//                        car.setCarTypeName(model.get("carTypeName").toString());
+//                        if (model.get("carSelfWeight") != null) {
+//                            car.setCarSelfWeight(new BigDecimal(model.get("carSelfWeight").toString()));
+//                        }
+//                        if (model.get("carCarrierWeight") != null) {
+//                            car.setCarCarrierWeight(new BigDecimal(model.get("carCarrierWeight").toString()));
+//                        }
+//                        if (model.get("mnemonicCode") != null) {
+//                            car.setMnemonicCode(model.get("mnemonicCode").toString());
+//                        }
+//                        if (model.get("customerSupplierName") != null) {
+//                            car.setCustomerSupplierName(model.get("customerSupplierName").toString());
+//                        }
+//                        car.setCreateManNo("admin");
+//                        car.setCreateManName("admins");
+//                        car.setCreateTime(new Date());
+//                        car.setValidFlag("0");
+//
+//                        // 将sso id写入车辆表，便于以后删除和重置密码
+//                        car.setSsoId(ssoMap.get("data").toString());
+//
+//                        String no=meterBaseCarMapper.GetNewID();
+//                        car.setId(new SimpleDateFormat("yyyyMMdd").format(new Date())+no);
+//                        meterBaseCarMapper.insertSelective(car);
+//
+//                    }
+//                }
+//            }
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+//            return "操作异常，请确认";
+//        }
+        return "失败";
+    }
 
     private String check(MeterBaseCar model)
     {

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

@@ -106,8 +106,10 @@ throw new MarkerMetException(500, "操作异常！！");
     })
     //@RequiresPermissions("meterworkcaractual:view")
     @PostMapping(value = "/like/")
-    public RESTfulResult listLikePost(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+    public RESTfulResult listLikePost(@RequestBody HashMap parmas) {
         try {
+            Integer pageNum = parmas.get("pageNum") == null ? 1 : Integer.parseInt(parmas.get("pageNum").toString());
+            Integer pageSize =parmas.get("pageSize") == null ? 20 : Integer.parseInt(parmas.get("pageSize").toString());
             PageList<MeterWorkCarActual> list = meterWorkCarActualService.queryLikeForPage(parmas, pageNum, pageSize);
             return success(list);
         } catch (Exception ex) {
@@ -680,4 +682,29 @@ throw new MarkerMetException(500, "操作异常！！");
         }
         return rm;
     }
+
+    @ApiOperation(value = "计量票据录入", notes = "根据MeterWorkCarActual对象创建")
+    @ApiImplicitParam(name = "MeterWorkCarActual", value = "详细实体MeterWorkCarActual", required = true, dataType = "MeterWorkCarActual")
+    //@RequiresPermissions("meterworkcaractualfirst:create")
+    @PostMapping(value = "/checkandadditional")
+    public RESTfulResult checkandadditional(@RequestBody MeterWorkCarActual model) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkCarActualService.checkandadditional(model);
+            if (num == 1) {
+                return success(num);
+            } else {
+                return failed("新增失败");
+            }
+        } 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/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -29,6 +29,8 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
 
     int checkandadd(MeterWorkCarActual model);
 
+    int checkandadditional(MeterWorkCarActual model);
+
     int audit(MeterWorkCarActual model);
 
     int unaudit(MeterWorkCarActual model);

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

@@ -1277,4 +1277,156 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         List<String> list = meterWorkCarActualMapper.distinctCarNo(obj).stream().map(MeterWorkCarActual::getCarNo).collect(Collectors.toList());
         return list;
     }
+
+    @Override
+    @Transactional
+    public int checkandadditional(MeterWorkCarActual model) {
+        try{
+            int num = 0;
+//            UserPayload payload = UserPayload.getCurrUser();
+//            String userId = payload.getId();
+//            String userName = payload.getUserName();
+            String userId = "admin";
+            String userName = "admins";
+            if(model.getGrossWeight() == null || model.getGrossWeight().equals(""))
+            {
+                throw new MarkerMetException(500, "毛重数据不能为空");
+            }
+            if(model.getTareWeight() == null || model.getTareWeight().equals(""))
+            {
+                throw new MarkerMetException(500,"皮重数据不能为空");
+            }
+            if(model.getCarNo() == null || model.getCarNo().equals(""))
+            {
+                throw new MarkerMetException(500, "车号不能为空");
+            }
+            if(new BigDecimal(model.getGrossWeight().toString()).compareTo(new BigDecimal(model.getTareWeight().toString())) == -1)
+            {
+                throw new MarkerMetException(500, "毛重重量小于皮重");
+            }
+            if(model.getNetWeight() == null || model.getNetWeight().equals(""))
+            {
+                throw new MarkerMetException(500, "净重数据不能为空");
+            }
+            String predictionNo = model.getPredictionNo()==null?"":model.getPredictionNo();
+            MeterWorkCarActualFirst mwcaf1 = new MeterWorkCarActualFirst();
+            MeterWorkCarActualFirst mwcaf2 = new MeterWorkCarActualFirst();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            if(predictionNo == "" || "".equals(predictionNo)){
+                //添加毛重一次计量数据
+                String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+                mwcaf1.setActualFirstNo(actualFirstNo);
+                mwcaf1.setValueFlag("2");
+                mwcaf1.setCreateTime(new Date());
+                mwcaf1.setCreateManNo(userId);
+                mwcaf1.setCreateManName(userName);
+                mwcaf1.setCarNo(model.getCarNo());
+                mwcaf1.setMeterWeight(model.getGrossWeight());
+                mwcaf1.setDataSource("4");
+                mwcaf1.setMeterMode("3");
+                mwcaf1.setIsPreScale("0");
+                meterWorkCarActualFirstMapper.insertSelective(mwcaf1);
+                //添加皮重一次计量数据
+                String dataNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+                mwcaf2.setActualFirstNo(dataNo);
+                mwcaf2.setValueFlag("2");
+                mwcaf2.setCreateTime(new Date());
+                mwcaf2.setCreateManNo(userId);
+                mwcaf2.setCreateManName(userName);
+                mwcaf2.setCarNo(model.getCarNo());
+                mwcaf2.setMeterWeight(model.getTareWeight());
+                mwcaf2.setDataSource("4");
+                mwcaf2.setMeterMode("3");
+                mwcaf2.setIsPreScale("0");
+                meterWorkCarActualFirstMapper.insertSelective(mwcaf2);
+                //添加净重重一次计量数据
+                String ActualNo = sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(afl);
+                model.setActualNo(ActualNo);
+                model.setValueFlag("2");
+                model.setActualFirst1No(actualFirstNo);
+                model.setGrossManNo(userId);
+                model.setGrossManName(userName);
+                model.setGrossTime(mwcaf1.getCreateTime());
+                model.setGrossMode("3");
+                model.setActualFirst2No(dataNo);
+                model.setTareManNo(userId);
+                model.setTareManName(userName);
+                model.setTareTime(mwcaf2.getCreateTime());
+                model.setTareMode("3");
+                model.setNetManNo(userId);
+                model.setNetManName(userName);
+                model.setNetTime(new Date());
+                model.setNetMode("3");
+                model.setDataSource("4");
+                model.setIsPreScale("0");
+                meterWorkCarActualMapper.insertSelective(model);
+                num++;
+            }
+            else {
+                PreTrackScale preTrackScale = preTrackScaleMapper.selectBypredictionNo(predictionNo);
+                preTrackScale.setValueFlag("2");
+                preTrackScale.setUpdateTime(new Date());
+                preTrackScale.setUpdateManNo("system");
+                preTrackScale.setUpdateManName("计量洁净数据手动录入");
+                preTrackScaleMapper.updateByPrimaryKey(preTrackScale);
+                //添加毛重一次计量数据
+                String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+                BeanUtils.copyProperties(preTrackScale,mwcaf1);
+                mwcaf1.setActualFirstNo(actualFirstNo);
+                mwcaf1.setIsPreScale("1");
+                mwcaf1.setValueFlag("2");
+                mwcaf1.setCreateTime(new Date());
+                mwcaf1.setCreateManNo(userId);
+                mwcaf1.setCreateManName(userName);
+                mwcaf1.setCarNo(model.getCarNo());
+                mwcaf1.setMeterWeight(model.getGrossWeight());
+                mwcaf1.setDataSource("4");
+                mwcaf1.setMeterMode("3");
+                meterWorkCarActualFirstMapper.insertSelective(mwcaf1);
+                //添加皮重一次计量数据
+                String dataNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
+                BeanUtils.copyProperties(preTrackScale, mwcaf2,predictionNo);
+                mwcaf2.setActualFirstNo(dataNo);
+                mwcaf2.setIsPreScale("1");
+                mwcaf2.setValueFlag("2");
+                mwcaf2.setCreateTime(new Date());
+                mwcaf2.setCreateManNo(userId);
+                mwcaf2.setCreateManName(userName);
+                mwcaf2.setCarNo(model.getCarNo());
+                mwcaf2.setMeterWeight(model.getTareWeight());
+                mwcaf2.setDataSource("4");
+                mwcaf2.setMeterMode("3");
+                meterWorkCarActualFirstMapper.insertSelective(mwcaf2);
+                //添加净重重一次计量数据
+                String ActualNo = sdf.format(new Date()) + meterWorkCarActualMapper.getNewID(afl);
+                BeanUtils.copyProperties(preTrackScale, model);
+                model.setActualNo(ActualNo);
+                model.setIsPreScale("1");
+                model.setValueFlag("2");
+                model.setActualFirst1No(actualFirstNo);
+                model.setGrossManNo(userId);
+                model.setGrossManName(userName);
+                model.setGrossTime(mwcaf1.getCreateTime());
+                model.setGrossMode("3");
+                model.setActualFirst2No(dataNo);
+                model.setTareManNo(userId);
+                model.setTareManName(userName);
+                model.setTareTime(mwcaf2.getCreateTime());
+                model.setTareMode("3");
+                model.setNetManNo(userId);
+                model.setNetManName(userName);
+                model.setNetTime(new Date());
+                model.setNetMode("3");
+                model.setDataSource("4");
+                meterWorkCarActualMapper.insertSelective(model);
+                num++;
+            }
+            return num;
+        }catch (Exception e){
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return -1;
+        }
+    }
 }

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

@@ -46,6 +46,7 @@ import com.steerinfo.meterwork.meterworkprelink.model.MeterWorkPreLink;
 import com.steerinfo.meterwork.meterworkprelink.service.IMeterWorkPreLinkService;
 import com.steerinfo.meterwork.meterworkpreprocess.mapper.MeterWorkPreProcessMapper;
 import com.steerinfo.meterwork.meterworkpreprocess.model.MeterWorkPreProcess;
+import com.steerinfo.meterwork.meterworkprewgttype.mapper.MeterWorkPreWgttypeMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.mapper.MeterWorkRailwayActFirstMapper;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
@@ -111,6 +112,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Resource
     private MeterBaseHisTareDetailMapper meterBaseHisTareDetailMapper;
 
+    @Resource
+    private MeterWorkPreWgttypeMapper meterWorkPreWgttypeMapper;
+
     @Resource
     private MeterWorkImageMapper meterWorkImageMapper;
 
@@ -181,6 +185,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             //保存日志
             saveNote(note);
+
+            //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+            updatePreWeight(model.getCarNo());
             int num = meterWorkCarActualFirstMapper.insertSelective(model);
             rm.setData(model.getActualFirstNo());
             rm.setMessage(enStr);
@@ -1012,6 +1019,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         RESTfulResult rm = new RESTfulResult();
         rm.setCode("200");
 
+
         //1、存储当前计量的数据
         SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
         String afl = formatter.format(secondDb.getCreateTime());
@@ -1113,6 +1121,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //保存日志
         saveNote(note);
 
+        //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+        updatePreWeight(secondDb.getCarNo());
+
         updateMonitorOver(secondDb.getActualFirstNo(), secondDb.getBaseSpotNo());
 
         //重量类型为毛重则调用接口为
@@ -2542,6 +2553,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         //保存日志
         saveNote(note);
 
+        //当存储一次数据或者结净时，将本车辆的预处理重量改为已使用
+        updatePreWeight(secondDb.getCarNo());
+
         updateMonitorOver(secondDb.getActualFirstNo(), secondDb.getBaseSpotNo());
 
         //重量类型为毛重则调用接口为
@@ -2562,5 +2576,9 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         rm.setMessage(flag);
         return rm;
     }
+
+    private void updatePreWeight(String CarNo) throws MarkerMetException{
+        meterWorkPreWgttypeMapper.updatePreWeight(CarNo);
+    }
 }
 

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.java

@@ -4,8 +4,11 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype;
 import java.math.*;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface MeterWorkPreWgttypeMapper extends IBaseMapper<MeterWorkPreWgttype, String> {
     String GetNewID();
+
+    void updatePreWeight(@Param("CarNo") String CarNo);
 }

src/main/java/com/steerinfo/meterwork/meterworkprewgttype/mapper/MeterWorkPreWgttypeMapper.xml

@@ -395,4 +395,8 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(WGT_TYPE_ID, LENGTH(WGT_TYPE_ID) -3))),0) + 1,4,'0') WGT_TYPE_ID
     FROM METER_WORK_PRE_WGTTYPE
   </select>
+
+  <update id="updatePreWeight" parameterType="java.lang.String">
+    update METER_WORK_PRE_WGTTYPE set VALUE_FLAG = '2' where VALUE_FLAG = '1' and CarNo = #{CarNo}
+  </update>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -94,6 +94,7 @@
     <result column="DATA_SOURCE" jdbcType="VARCHAR" property="dataSource" />
     <result column="NOTE" jdbcType="VARCHAR" property="note" />
     <result column="TRAIN_NUMBER_NO" jdbcType="VARCHAR" property="trainNumberNo" />
+    <result column="IS_PRE_SACALE" jdbcType="VARCHAR" property="isPreSacale" />
   </resultMap>
   <sql id="columns">
     ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
@@ -112,7 +113,7 @@
     CONVEYANCE_TYPE, RESOURCE_SYSTEM, GROUP_PACKAGE_AMOUNT, GROUP_PACKAGE_UNIT, PACKAGE_AMOUNT, 
     PACKAGE_UNIT, THEORY_AMOUNT, MEASURE_BATCH, MEASURE_BATCH_COUNT, SENDER_TYPE, SENDER_REMARK, 
     RECEIVER_TYPE, RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, 
-    DATA_SOURCE, NOTE, TRAIN_NUMBER_NO
+    DATA_SOURCE, NOTE, TRAIN_NUMBER_NO, IS_PRE_SACALE
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, 
@@ -133,7 +134,7 @@
     t.GROUP_PACKAGE_UNIT, t.PACKAGE_AMOUNT, t.PACKAGE_UNIT, t.THEORY_AMOUNT, t.MEASURE_BATCH, 
     t.MEASURE_BATCH_COUNT, t.SENDER_TYPE, t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, 
     t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, t.MEASURE_TASK_NUM, t.DATA_SOURCE, t.NOTE, 
-    t.TRAIN_NUMBER_NO
+    t.TRAIN_NUMBER_NO, t.IS_PRE_SACALE
   </sql>
   <sql id="select">
     SELECT <include refid="columns"/> FROM METER_WORK_RAILWAY_ACT_FIRST
@@ -419,8 +420,8 @@
       <if test="trainNumberNo != null and trainNumberNo != ''">
         and TRAIN_NUMBER_NO = #{trainNumberNo}
       </if>
-      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-        and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE = #{isPreSacale}
       </if>
     </where>
   </sql>
@@ -702,6 +703,9 @@
       <if test="trainNumberNo != null and trainNumberNo != ''">
         and TRAIN_NUMBER_NO LIKE '%${trainNumberNo}%'
       </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        and IS_PRE_SACALE LIKE '%${isPreSacale}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
@@ -984,6 +988,9 @@
       <if test="trainNumberNo != null and trainNumberNo != ''">
         or TRAIN_NUMBER_NO = #{trainNumberNo}
       </if>
+      <if test="isPreSacale != null and isPreSacale != ''">
+        or IS_PRE_SACALE = #{isPreSacale}
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
     insert into METER_WORK_RAILWAY_ACT_FIRST (ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, 
@@ -1017,7 +1024,7 @@
       SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
       RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
       MEASURE_TASK_NUM, DATA_SOURCE, NOTE, 
-      TRAIN_NUMBER_NO)
+      TRAIN_NUMBER_NO, IS_PRE_SACALE)
     values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR}, 
       #{railwaySpeed,jdbcType=DECIMAL}, #{matterNo,jdbcType=VARCHAR}, #{matterName,jdbcType=VARCHAR}, 
@@ -1049,7 +1056,7 @@
       #{senderType,jdbcType=VARCHAR}, #{senderRemark,jdbcType=VARCHAR}, #{receiverType,jdbcType=VARCHAR}, 
       #{receiverRemark,jdbcType=VARCHAR}, #{amountUnit,jdbcType=VARCHAR}, #{measureObjectType,jdbcType=VARCHAR}, 
       #{measureTaskNum,jdbcType=VARCHAR}, #{dataSource,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
-      #{trainNumberNo,jdbcType=VARCHAR})
+      #{trainNumberNo,jdbcType=VARCHAR}, #{isPreSacale,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
     insert into METER_WORK_RAILWAY_ACT_FIRST
@@ -1330,6 +1337,9 @@
       <if test="trainNumberNo != null">
         TRAIN_NUMBER_NO,
       </if>
+      <if test="isPreSacale != null">
+        IS_PRE_SACALE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="actualFirstNo != null">
@@ -1608,6 +1618,9 @@
       <if test="trainNumberNo != null">
         #{trainNumberNo,jdbcType=VARCHAR},
       </if>
+      <if test="isPreSacale != null">
+        #{isPreSacale,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
@@ -1702,7 +1715,8 @@
       MEASURE_TASK_NUM = #{measureTaskNum,jdbcType=VARCHAR},
       DATA_SOURCE = #{dataSource,jdbcType=VARCHAR},
       NOTE = #{note,jdbcType=VARCHAR},
-      TRAIN_NUMBER_NO = #{trainNumberNo,jdbcType=VARCHAR}
+      TRAIN_NUMBER_NO = #{trainNumberNo,jdbcType=VARCHAR},
+      IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR}
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst">
@@ -1981,6 +1995,9 @@
       <if test="trainNumberNo != null">
         TRAIN_NUMBER_NO = #{trainNumberNo,jdbcType=VARCHAR},
       </if>
+      <if test="isPreSacale != null">
+        IS_PRE_SACALE = #{isPreSacale,jdbcType=VARCHAR},
+      </if>
     </set>
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
@@ -2035,7 +2052,7 @@
       SENDER_TYPE, SENDER_REMARK, RECEIVER_TYPE, 
       RECEIVER_REMARK, AMOUNT_UNIT, MEASURE_OBJECT_TYPE, 
       MEASURE_TASK_NUM, DATA_SOURCE, NOTE, 
-      TRAIN_NUMBER_NO)
+      TRAIN_NUMBER_NO, IS_PRE_SACALE)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualFirstNo,jdbcType=VARCHAR}, 
@@ -2075,7 +2092,7 @@
       #{item.senderType,jdbcType=VARCHAR}, #{item.senderRemark,jdbcType=VARCHAR}, #{item.receiverType,jdbcType=VARCHAR}, 
       #{item.receiverRemark,jdbcType=VARCHAR}, #{item.amountUnit,jdbcType=VARCHAR}, #{item.measureObjectType,jdbcType=VARCHAR}, 
       #{item.measureTaskNum,jdbcType=VARCHAR}, #{item.dataSource,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, 
-      #{item.trainNumberNo,jdbcType=VARCHAR} from dual  
+      #{item.trainNumberNo,jdbcType=VARCHAR}, #{item.isPreSacale,jdbcType=VARCHAR} from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -2449,6 +2466,10 @@
        <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.trainNumberNo,jdbcType=VARCHAR}
        </foreach>
+       ,IS_PRE_SACALE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case ACTUAL_FIRST_NO" close="end">
+          when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.isPreSacale,jdbcType=VARCHAR}
+       </foreach>
      where ACTUAL_FIRST_NO in 
      <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
     #{item.actualFirstNo,jdbcType=VARCHAR}
@@ -2464,8 +2485,6 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-
-
   <sql id="whereTime">
     <if test="startTime != null and startTime != null and endTime != '' and endTime != ''">
       and  CREATE_TIME  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and CREATE_TIME  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/model/MeterWorkRailwayActFirst.java

@@ -560,6 +560,12 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
     @ApiModelProperty(value="车次号",required=false)
     private String trainNumberNo;
 
+    /**
+     * 是否匹配委托(0：未匹配,1：已匹配)(IS_PRE_SACALE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否匹配委托(0：未匹配,1：已匹配)",required=false)
+    private String isPreSacale;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1308,6 +1314,14 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
         this.trainNumberNo = trainNumberNo == null ? null : trainNumberNo.trim();
     }
 
+    public String getIsPreSacale() {
+        return isPreSacale;
+    }
+
+    public void setIsPreSacale(String isPreSacale) {
+        this.isPreSacale = isPreSacale == null ? null : isPreSacale.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1406,6 +1420,7 @@ public class MeterWorkRailwayActFirst implements IBasePO<String> {
         sb.append(", dataSource=").append(dataSource);
         sb.append(", note=").append(note);
         sb.append(", trainNumberNo=").append(trainNumberNo);
+        sb.append(", isPreSacale=").append(isPreSacale);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -606,4 +606,29 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value = "计量票据录入", notes = "根据MeterWorkRailwayActual对象创建")
+    @ApiImplicitParam(name = "MeterWorkRailwayActual", value = "详细实体MeterWorkRailwayActual", required = true, dataType = "MeterWorkRailwayActual")
+    //@RequiresPermissions("meterworkcaractualfirst:create")
+    @PostMapping(value = "/checkandadditional")
+    public RESTfulResult checkandadditional(@RequestBody MeterWorkRailwayActual model) {
+        RESTfulResult rm = failed();
+        try {
+            int num = meterWorkRailwayActualService.checkandadditional(model);
+            if (num == 1) {
+                return success(num);
+            } else {
+                return failed("新增失败");
+            }
+        } 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/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -1,10 +1,8 @@
 package com.steerinfo.meterwork.meterworkrailwayactual.model;
 
-
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -353,9 +351,9 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String netMode;
 
     /**
-     * 状态（0=有效，1=作废 ）(VALUE_FLAG,VARCHAR,1)
+     * 状态（0=作废，1=有效-未发布，2=有效-已发布，3=未匹配委托 ）(VALUE_FLAG,VARCHAR,1)
      */
-    @ApiModelProperty(value="状态（0=有效，1=作废 ）",required=false)
+    @ApiModelProperty(value="状态（0=作废，1=有效-未发布，2=有效-已发布，3=未匹配委托 ）",required=false)
     private String valueFlag;
 
     /**
@@ -616,6 +614,12 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     @ApiModelProperty(value="操作原因",required=false)
     private String note;
 
+    /**
+     * 是否匹配委托(0：未匹配,1：已匹配)(IS_PRE_SACALE,VARCHAR,1)
+     */
+    @ApiModelProperty(value="是否匹配委托(0：未匹配,1：已匹配)",required=false)
+    private String isPreSacale;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -1436,6 +1440,14 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         this.note = note == null ? null : note.trim();
     }
 
+    public String getIsPreSacale() {
+        return isPreSacale;
+    }
+
+    public void setIsPreSacale(String isPreSacale) {
+        this.isPreSacale = isPreSacale == null ? null : isPreSacale.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -1543,6 +1555,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
         sb.append(", createTime=").append(createTime);
         sb.append(", dataSource=").append(dataSource);
         sb.append(", note=").append(note);
+        sb.append(", isPreSacale=").append(isPreSacale);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -72,4 +72,6 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     int batchEditActFirsts(List<MeterWorkRailwayActFirst> actualFirsts);
 
     double getGrossAvg(HashMap actual);
+
+    int checkandadditional(MeterWorkRailwayActual model);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -1259,4 +1259,157 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             scale.setShipmentGrossWeight(first.getShipmentGrossWeight());
         return scale;
     }
+
+    @Override
+    @Transactional
+    public int checkandadditional(MeterWorkRailwayActual model) {
+        try{
+            int num = 0;
+//            UserPayload payload = UserPayload.getCurrUser();
+//            String userId = payload.getId();
+//            String userName = payload.getUserName();
+            String userId = "admin";
+            String userName = "admins";
+            if(model.getGrossWeight() == null || model.getGrossWeight().equals(""))
+            {
+                throw new MarkerMetException(500, "毛重数据不能为空");
+            }
+            if(model.getTareWeight() == null || model.getTareWeight().equals(""))
+            {
+                throw new MarkerMetException(500,"皮重数据不能为空");
+            }
+            if(model.getRailwayNo() == null || model.getRailwayNo().equals(""))
+            {
+                throw new MarkerMetException(500, "车号不能为空");
+            }
+            if(new BigDecimal(model.getGrossWeight().toString()).compareTo(new BigDecimal(model.getTareWeight().toString())) == -1)
+            {
+                throw new MarkerMetException(500, "毛重重量小于皮重");
+            }
+            if(model.getNetWeight() == null || model.getNetWeight().equals(""))
+            {
+                throw new MarkerMetException(500, "净重数据不能为空");
+            }
+            String predictionNo = model.getPredictionNo()==null?"":model.getPredictionNo();
+            MeterWorkRailwayActFirst mwraf1 = new MeterWorkRailwayActFirst();
+            MeterWorkRailwayActFirst mwraf2 = new MeterWorkRailwayActFirst();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            if(predictionNo == "" || "".equals(predictionNo)){
+                //添加毛重一次计量数据
+                String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+                mwraf1.setActualFirstNo(actualFirstNo);
+                mwraf1.setValueFlag("2");
+                mwraf1.setCreateTime(new Date());
+                mwraf1.setCreateManNo(userId);
+                mwraf1.setCreateManName(userName);
+                mwraf1.setRailwayNo(model.getRailwayNo());
+                mwraf1.setMeterWeight(model.getGrossWeight());
+                mwraf1.setDataSource("4");
+                mwraf1.setMeterMode("3");
+                mwraf1.setIsPreSacale("0");
+                meterWorkRailwayActFirstMapper.insertSelective(mwraf1);
+                //添加皮重一次计量数据
+                String dataNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+                mwraf2.setActualFirstNo(dataNo);
+                mwraf2.setValueFlag("2");
+                mwraf2.setCreateTime(new Date());
+                mwraf2.setCreateManNo(userId);
+                mwraf2.setCreateManName(userName);
+                mwraf2.setRailwayNo(model.getRailwayNo());
+                mwraf2.setMeterWeight(model.getTareWeight());
+                mwraf2.setDataSource("4");
+                mwraf2.setMeterMode("3");
+                mwraf2.setIsPreSacale("0");
+                meterWorkRailwayActFirstMapper.insertSelective(mwraf2);
+                //添加净重重一次计量数据
+                String ActualNo = sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(afl);
+                model.setActualNo(ActualNo);
+                model.setValueFlag("2");
+                model.setActualFirst1No(actualFirstNo);
+                model.setGrossManNo(userId);
+                model.setGrossManName(userName);
+                model.setGrossTime(mwraf1.getCreateTime());
+                model.setGrossMode("3");
+                model.setActualFirst2No(dataNo);
+                model.setTareManNo(userId);
+                model.setTareManName(userName);
+                model.setTareTime(mwraf2.getCreateTime());
+                model.setTareMode("3");
+                model.setNetManNo(userId);
+                model.setNetManName(userName);
+                model.setNetTime(new Date());
+                model.setNetMode("3");
+                model.setDataSource("4");
+                model.setIsPreSacale("0");
+                meterWorkRailwayActualMapper.insertSelective(model);
+                num++;
+            }
+            else {
+                PreRailwayScale preRailwayScale = preRailwayScaleMapper.selectBypredictionNo(predictionNo);
+                preRailwayScale.setValueFlag("2");
+                preRailwayScale.setUpdateTime(new Date());
+                preRailwayScale.setUpdateManNo("system");
+                preRailwayScale.setUpdateManName("计量洁净数据手动录入");
+                preRailwayScaleMapper.updateByPrimaryKey(preRailwayScale);
+                //添加毛重一次计量数据
+                String actualFirstNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+                BeanUtils.copyProperties(preRailwayScale, mwraf1);
+                mwraf1.setActualFirstNo(actualFirstNo);
+                mwraf1.setIsPreSacale("1");
+                mwraf1.setValueFlag("2");
+                mwraf1.setCreateTime(new Date());
+                mwraf1.setCreateManNo(userId);
+                mwraf1.setCreateManName(userName);
+                mwraf1.setRailwayNo(model.getRailwayNo());
+                mwraf1.setMeterWeight(model.getGrossWeight());
+                mwraf1.setDataSource("4");
+                mwraf1.setMeterMode("3");
+                meterWorkRailwayActFirstMapper.insertSelective(mwraf1);
+                //添加皮重一次计量数据
+                String dataNo = sdf.format(new Date()) + meterWorkRailwayActFirstMapper.getNewID(afl);
+                BeanUtils.copyProperties(preRailwayScale, mwraf2, predictionNo);
+                mwraf2.setActualFirstNo(dataNo);
+                mwraf2.setIsPreSacale("1");
+                mwraf2.setValueFlag("2");
+                mwraf2.setCreateTime(new Date());
+                mwraf2.setCreateManNo(userId);
+                mwraf2.setCreateManName(userName);
+                mwraf2.setRailwayNo(model.getRailwayNo());
+                mwraf2.setMeterWeight(model.getTareWeight());
+                mwraf2.setDataSource("4");
+                mwraf2.setMeterMode("3");
+                meterWorkRailwayActFirstMapper.insertSelective(mwraf2);
+                //添加净重重一次计量数据
+                String ActualNo = sdf.format(new Date()) + meterWorkRailwayActualMapper.getNewID(afl);
+                BeanUtils.copyProperties(preRailwayScale, model);
+                model.setActualNo(ActualNo);
+                model.setIsPreSacale("1");
+                model.setValueFlag("2");
+                model.setActualFirst1No(actualFirstNo);
+                model.setGrossManNo(userId);
+                model.setGrossManName(userName);
+                model.setGrossTime(mwraf1.getCreateTime());
+                model.setGrossMode("3");
+                model.setActualFirst2No(dataNo);
+                model.setTareManNo(userId);
+                model.setTareManName(userName);
+                model.setTareTime(mwraf2.getCreateTime());
+                model.setTareMode("3");
+                model.setNetManNo(userId);
+                model.setNetManName(userName);
+                model.setNetTime(new Date());
+                model.setNetMode("3");
+                model.setDataSource("4");
+                meterWorkRailwayActualMapper.insertSelective(model);
+                num++;
+            }
+            return num;
+        }
+        catch (Exception e){
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return -1;
+        }
+    }
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.pretrack.prerailwayscale.mapper;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.pretrack.dto.PreRailwayScaleDto;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
+import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -47,4 +48,6 @@ public interface PreRailwayScaleMapper extends IBaseMapper<PreRailwayScale, Stri
     List<PreRailwayScale> doQueryJLByCarUsed(HashMap param);
 
     void updateMeterWorkRailwayReceiveds(String s);
+
+    PreRailwayScale selectBypredictionNo(@Param( value = "predictionNo") String predictionNo);
 }

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

@@ -3027,4 +3027,11 @@
     <update id="updateMeterWorkRailwayReceiveds">
         update METER_WORK_RAILWAY_RECEIVED set value_flag='1' where ACTUAL_FIRST_NO=#{actualFirstNo}
     </update>
+
+    <select id="selectBypredictionNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <where>
+            PREDICTION_NO = #{predictionNo}
+        </where>
+    </select>
 </mapper>

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

@@ -7,6 +7,8 @@ import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.framework.utils.collection.ListUtils;
 import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkprewgttype.mapper.MeterWorkPreWgttypeMapper;
+import com.steerinfo.meterwork.meterworkprewgttype.model.MeterWorkPreWgttype;
 import com.steerinfo.pretrack.pretrackscale.mapper.PreTrackScaleMapper;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.pretrack.pretrackscale.service.IPreTrackScaleService;
@@ -450,5 +452,27 @@ public class PreTrackScaleController extends BaseRESTfulController {
         return rm;
     }
 
-
+    @ApiOperation(value = "车号获取", notes = "根据车号获取预报信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", dataType = "Integer")
+    })
+    @PostMapping(value = "/selectByCarNo")
+    public RESTfulResult selectByCarNo(@RequestBody HashMap model) {
+        RESTfulResult rm = failed();
+        try {
+            Integer pageNum =model.get("pageNum") == null ?1: Integer.parseInt(model.get("pageNum").toString());
+            Integer pageSize =model.get("pageSize") == null ?20: Integer.parseInt(model.get("pageSize").toString());
+            PageHelper.startPage(pageNum,pageSize);
+            List<PreTrackScale> rows = preTrackScaleService.selectByCarNo(model.get("carNo").toString());
+            return success(rows);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        }
+        return rm;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import feign.Param;
+import oracle.jdbc.proxy.annotation.Pre;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -29,4 +30,8 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
     List<PreTrackScale> selectScaleValidPeriod();
 
     List<PreTrackScale> selectValueFlag(Map<String, Object> parameters);
+
+    List<PreTrackScale> selectByCarNo(@Param( value = "carNo") String carNo);
+
+    PreTrackScale selectBypredictionNo(@Param( value = "predictionNo") String predictionNo);
 }

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

@@ -3148,4 +3148,18 @@
             PREDICTION_NO != #{predictionNo} and CAR_NO = #{carNo} and VALUE_FLAG = '4'
         </where>
     </select>
+
+    <select id="selectByCarNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <where>
+            CAR_NO = #{carNo} and TRUST_AVAILABILITY_TIME > SYSDATE
+        </where>
+    </select>
+
+    <select id="selectBypredictionNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <where>
+            PREDICTION_NO = #{predictionNo}
+        </where>
+    </select>
 </mapper>

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

@@ -24,6 +24,8 @@ public interface IPreTrackScaleService extends IBaseService<PreTrackScale, Strin
 
     List<PreTrackScale> selectlist(String carNo);
 
+    List<PreTrackScale> selectByCarNo(String carNo);
+
     List<PreTrackScale> selectView(HashMap param);
 
     PreTrackScale checkandadd(PreTrackScale model);

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

@@ -734,4 +734,17 @@ public class PreTrackScaleServiceImpl extends BaseServiceImpl<PreTrackScale, Str
         }
         System.out.println("updateValueFlagByMatter接口自动作废在" + sdf.format(new Date()) + "执行完成");
     }
+
+    @Override
+    public List<PreTrackScale> selectByCarNo(String carNo) {
+        try {
+            if (StringUtils.isEmpty(carNo)) {
+                throw new MarkerMetException(500, "车号为空!!");
+            }
+            List<PreTrackScale> list = preTrackScaleMapper.selectByCarNo(carNo);
+            return list;
+        } catch (MarkerMetException e) {
+            throw e;
+        }
+    }
 }