后端修改

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

@@ -255,10 +255,10 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 List<MeterBaseCar> queryList01 = meterBaseCarService.query(queryCar);
                 //查询停役、删除状态的车辆信息
                 List<MeterBaseCar> queryList02 = meterBaseCarMapper.selectByMap(queryCar);
+                MeterBaseCar car = new MeterBaseCar();
                 // 车辆表未查询到车辆信息，则新增车辆信息和司机信息
                 if (queryList01.size()+queryList02.size() == 0) {
                     // 新增车辆
-                    MeterBaseCar car = new MeterBaseCar();
                     car.setCarNo(params.get("carNo").toString());
                     car.setValidFlag("0");
                     HashMap<String, Object> unitMap = new HashMap<>();
@@ -312,7 +312,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     }
                     // 修改车辆
                     queryList01 = meterBaseCarService.query(queryCar);
-                    MeterBaseCar car = queryList01.get(0);
+                    car = queryList01.get(0);
                     car.setValidFlag("0");
                     HashMap<String, Object> unitMap = new HashMap<>();
                     unitMap.put("unitNo", params.get("unitNo").toString());
@@ -343,16 +343,22 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     }
                 }
 
-                //查询该车辆是否为内部车辆，内部车辆不允许批量注册司机和修改司机信息
-                HashMap<String, Object> findCar = new HashMap<>();
-                findCar.put("carNo", carNo);
-                findCar.put("validFlag", "0");
-                findCar.put("carTypeNo", "001004003");
-                List<MeterBaseCar> carModel = meterBaseCarMapper.selectByParameters(findCar);
-                if(carModel.size() >= 1) {
-                    rm.setMessage("内部车辆不允许批量注册司机和修改司机信息，请联系车辆管理部门");
-                    return rm;
+                //润源公司（吉瑞）
+                if(car.getUsetDepartmentNo() != null && StringUtils.isNotEmpty(car.getUsetDepartmentNo())) {
+                    if(!car.getUsetDepartmentNo().equals("123456")) {
+                        //查询该车辆是否为内部车辆，内部车辆不允许批量注册司机和修改司机信息
+                        HashMap<String, Object> findCar = new HashMap<>();
+                        findCar.put("carNo", carNo);
+                        findCar.put("validFlag", "0");
+                        findCar.put("carTypeNo", "001004003");
+                        List<MeterBaseCar> carModel = meterBaseCarMapper.selectByParameters(findCar);
+                        if(carModel.size() >= 1) {
+                            rm.setMessage("内部车辆不允许批量注册司机和修改司机信息，请联系车辆管理部门");
+                            return rm;
+                        }
+                    }
                 }
+
                 // 拆分司机list，新增司机表
                 List<MeterBaseDriver> driverList = JSONObject.parseArray(params.get("driverList").toString(), MeterBaseDriver.class);
                 for (MeterBaseDriver driver : driverList) {
@@ -590,8 +596,13 @@ public class MeterBaseCarController extends BaseRESTfulController {
                 carMap.put("carTypeNo", "001004003");
                 List<MeterBaseCar> carModel = meterBaseCarMapper.selectByParameters(carMap);
                 if(carModel.size() >= 1) {
-                    rm.setMessage("内倒车辆不允许重置密码！！");
-                    return rm;
+                    //润源公司（吉瑞）
+                    if(carModel.get(0).getUsetDepartmentNo() != null && StringUtils.isNotEmpty(carModel.get(0).getUsetDepartmentNo())) {
+                        if (!carModel.get(0).getUsetDepartmentNo().equals("123456")) {
+                            rm.setMessage("内倒车辆不允许重置密码！！");
+                            return rm;
+                        }
+                    }
                 }
                 HashMap<String, Object> map = new HashMap<>();
                 map.put("carNo", carNo);

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

@@ -1321,4 +1321,28 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value = "内倒双委托---不使用期限皮结净，保存两条一次毛重")
+    @PostMapping(value = "/doDoubleAdd", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doDoubleAdd(@RequestBody PreTrackScale scale, MeterWorkCarActualFirst model) {
+        try {
+            RESTfulResult rm = meterWorkCarActualFirstService.doDoubleAdd(model, scale);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
+
+    @ApiOperation(value = "内倒双委托---使用期限皮结净,直接保存四条数据和两个结净")
+    @PostMapping(value = "/doTermTareNetDouble", produces = "application/json;charset=UTF-8")
+    public RESTfulResult doTermTareNetDouble(@RequestBody PreTrackScale scale, MeterWorkCarActualFirst model) {
+        try {
+            RESTfulResult rm = meterWorkCarActualFirstService.doTermTareNetDouble(model, scale);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
+
 }

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

@@ -143,4 +143,7 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     RESTfulResult furConversion(HashMap<String, Object> params);
     RESTfulResult doNetByTermData(HashMap<String, Object> params);
+
+    RESTfulResult doDoubleAdd(MeterWorkCarActualFirst model, PreTrackScale scale);
+    RESTfulResult doTermTareNetDouble(MeterWorkCarActualFirst model, PreTrackScale scale);
 }

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

@@ -5498,6 +5498,107 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return rm;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public RESTfulResult doDoubleAdd(MeterWorkCarActualFirst model, PreTrackScale scale) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+
+            PreTrackScale pre = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+            if(StringUtils.isNotEmpty(model.getPredictionNo())){
+                MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectAndMatch(model.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(modelTemp, model);
+                String no = PublicMethod.IdCreate(3);
+                model.setActualFirstNo(no);
+                model.setMeterMode("2");
+                model.setWeightType("0");
+                model.setDataSource("1");
+                model.setValueFlag("1");
+                model.setIsPreScale("1");
+                model.setPredictionType("5");
+                model.setCreateManNo("SYSTEM");
+                model.setCreateManName("system");
+                model.setCreateTime(new Date());
+                meterWorkCarActualFirstMapper.insertSelective(model);
+                model.setNote("内倒双委托一次复制:" + model.getActualFirstNo());
+                model.setActualFirstNo(PublicMethod.IdCreate(3));
+                meterWorkCarActualFirstMapper.insertSelective(model);
+                //预约信息重置委托
+                pre.setPredictionType("5");
+                pre.setMeasureStation(model.getBaseSpotNo());
+                pre.setMeasureStationName(model.getBaseSpotName());
+                pre.setUpdateManNo("SYSTEM");
+                pre.setUpdateManName("system");
+                pre.setUpdateTime(new Date());
+                pre.setValueFlag("4");
+                pre.setUploadFlag("1");
+                pre.setLineDesc("0");
+                preTrackScaleMapper.updateByPrimaryKeySelective(pre);
+
+                rm.setSucceed(true);
+                rm.setCode("200");
+                rm.setData(model.getActualFirstNo());
+                rm.setMessage("操作成功");
+            }
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常，" + e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult doTermTareNetDouble(MeterWorkCarActualFirst model, PreTrackScale scale) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+
+            PreTrackScale pre = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+            if(StringUtils.isNotEmpty(model.getPredictionNo())){
+                MeterWorkCarActualFirst modelTemp = meterWorkCarActualFirstMapper.selectAndMatch(model.getActualFirstNo(), scale.getPredictionNo());
+                BeanUtils.copyProperties(modelTemp, model);
+                String no = PublicMethod.IdCreate(3);
+                model.setActualFirstNo(no);
+                model.setMeterMode("2");
+                model.setWeightType("0");
+                model.setDataSource("1");
+                model.setValueFlag("1");
+                model.setIsPreScale("1");
+                model.setPredictionType("5");
+                model.setCreateManNo("SYSTEM");
+                model.setCreateManName("system");
+                model.setCreateTime(new Date());
+                meterWorkCarActualFirstMapper.insertSelective(model);
+                model.setNote("内倒双委托一次复制:" + model.getActualFirstNo());
+                model.setActualFirstNo(PublicMethod.IdCreate(3));
+                meterWorkCarActualFirstMapper.insertSelective(model);
+                //预约信息重置委托
+                pre.setPredictionType("5");
+                pre.setMeasureStation(model.getBaseSpotNo());
+                pre.setMeasureStationName(model.getBaseSpotName());
+                pre.setUpdateManNo("SYSTEM");
+                pre.setUpdateManName("system");
+                pre.setUpdateTime(new Date());
+                pre.setValueFlag("4");
+                pre.setUploadFlag("1");
+                pre.setLineDesc("0");
+                preTrackScaleMapper.updateByPrimaryKeySelective(pre);
+
+                rm.setSucceed(true);
+                rm.setCode("200");
+                rm.setData(model.getActualFirstNo());
+                rm.setMessage("操作成功");
+            }
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常，" + e.getMessage());
+        }
+        return rm;
+    }
+
     @Override
     public RESTfulResult doNetAddMuchGross(List<MeterWorkCarActualFirst> gross, MeterWorkCarActualFirst tare, MeterMonitorNote note) throws Exception {
         RESTfulResult rm = new RESTfulResult();

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

@@ -7147,7 +7147,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetMode("2");
                     actualRow.setUploadFlag("0");
                     actualRow.setIsPreSacale("1");
-                    actualRow.setValueFlag("1");
+                    actualRow.setValueFlag("2");
                     actualRow.setPredictionType("1");
                     actualRow.setPredictionNo(railwayScale.getPredictionNo());
                     actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
@@ -7319,7 +7319,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetMode("2");
                     actualRow.setUploadFlag("0");
                     actualRow.setIsPreSacale("1");
-                    actualRow.setValueFlag("1");
+                    actualRow.setValueFlag("2");
                     actualRow.setPredictionType("1");
                     actualRow.setPredictionNo(railwayScale.getPredictionNo());
                     actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
@@ -7507,7 +7507,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetMode("2");
                     actualRow.setUploadFlag("0");
                     actualRow.setIsPreSacale("1");
-                    actualRow.setValueFlag("1");
+                    actualRow.setValueFlag("2");
                     actualRow.setPredictionType("1");
                     actualRow.setPredictionNo(railwayScale.getPredictionNo());
                     actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
@@ -7684,7 +7684,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setNetMode("2");
                     actualRow.setUploadFlag("0");
                     actualRow.setIsPreSacale("1");
-                    actualRow.setValueFlag("1");
+                    actualRow.setValueFlag("2");
                     actualRow.setPredictionType("1");
                     actualRow.setPredictionNo(railwayScale.getPredictionNo());
                     actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.java

@@ -21,5 +21,5 @@ public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRai
     HashMap getCount(HashMap params);
     MeterWorkRailwayReceived selectAndRemove(@Param(value = "actualFirstNo")String actualFirstNo);
 
-
+    int deleteByPrimaryKeyLike(@Param(value = "actualFirstNo")String actualFirstNo);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -2034,4 +2034,8 @@
     select count(1) as countNum from meter_work_railway_received A where railway_work_no = #{railwayWorkNo} and  value_flag = '1'
   </select>
 
+  <delete id="deleteByPrimaryKeyLike" parameterType="java.lang.String">
+    delete from METER_WORK_RAILWAY_RECEIVED
+    where ACTUAL_FIRST_NO like '%${actualFirstNo}%'
+  </delete>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -488,11 +488,12 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{
-            meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
-            PreRailwayScale preRailwayScale = new PreRailwayScale();
+            PreRailwayScale preRailwayScale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             preRailwayScale.setValueFlag("4");
-            preRailwayScale.setPredictionNo(model.getPredictionNo());
             preRailwayScaleMapper.updateByPrimaryKeySelective(preRailwayScale);
+
+            model.setRailwayTypeNo(preRailwayScale.getRailwayNo());
+            meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
             rm.setSucceed();
             rm.setMessage("操作成功");
             rm.setCode("200");

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/service/impl/MeterWorkRailwayRecMainServiceImpl.java

@@ -86,16 +86,15 @@ public class MeterWorkRailwayRecMainServiceImpl extends BaseServiceImpl<MeterWor
                     .replaceAll("动态", "") + "-" + afl + lcNo + "(" + receivedList.size() + ")");
             meterWorkRailwayRecMainMapper.insertSelective(mainModel);
             for (MeterWorkRailwayReceived model: receivedList) {
-                meterWorkRailwayReceivedMapper.deleteByPrimaryKey(model.getActualFirstNo());
-//                rm.setData(model.getActualFirstNo());
-                if(model.getRailwayNo() == null && StringUtils.isEmpty(model.getRailwayNo())) {
+                meterWorkRailwayReceivedMapper.deleteByPrimaryKeyLike(model.getActualFirstNo());
+            }
+            for (MeterWorkRailwayReceived model: receivedList) {
+                if(model.getRailwayNo() == null || StringUtils.isEmpty(model.getRailwayNo())) {
                     model.setRailwayNo("车号异常");
                 }
-//            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-//            String afl = sdf.format(new Date());
-//            String no = meterWorkRailwayReceivedMapper.getNewID(afl);
-//            model.setActualFirstNo(sdf.format(new Date()) + no);
-                model.setActualFirstNo(PublicMethod.IdCreate(3));
+                SimpleDateFormat sdfD = new SimpleDateFormat("yyyyMMddHHmmss");
+                String key = model.getBaseSpotNo() + sdfD.format(model.getCreateTime()) + PublicMethod.RandomCreate(3);
+                model.setActualFirstNo(key);
                 model.setRailwayWorkNo(mainModel.getSoundName());
                 meterWorkRailwayReceivedMapper.insertSelective(model);
             }