动轨单个AI标志皮结净

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

@@ -1132,6 +1132,26 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "动态衡维护界面--对从表数据进行AI标志皮洁净", notes = "根据毛皮的MeterWorkRailwayActFirst对象进行批量匹配洁净保存")
+    @PostMapping(value = "/doAddNetInnerWf")
+    public RESTfulResult doAddNetInnerWf(@RequestBody CommonCombination<MeterBaseRailwayAiweight,MeterWorkRailwayMotorialReceived, MeterBaseRailwayWeight,MeterBaseRailwayWeight> com) {
+        RESTfulResult rm = failed();
+        try {
+            if(Objects.nonNull(com.getOne()) && Objects.nonNull(com.getTwo())) {
+                rm = meterWorkRailwayActFirstService.doAddNetInnerWf(com.getTwo(),com.getOne());
+            }else if(Objects.isNull(com.getOne())){
+                rm.setMessage("选择一条AI标志皮重数据进行匹配洁净保存，请确认！！");
+            }else if(Objects.isNull(com.getTwo())) {
+                rm.setMessage("选择一条一次数据进行匹配洁净保存，请确认！！");
+            }
+            return rm;
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！>>>>" + e.getMessage());
+            return rm;
+        }
+    }
+
     @ApiOperation(value = "动态衡维护界面--毛皮匹配洁净保存", notes = "根据毛皮的List<MeterWorkRailwayActFirst>对象进行批量匹配洁净保存")
     @PostMapping(value = "/selfServiceMeasurement")
     public RESTfulResult selfServiceMeasurement(@RequestBody MeterWorkRailwayActFirst first) {

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

@@ -112,6 +112,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     RESTfulResult doAddRailWf(List<MeterWorkRailwayActFirst> models);
     RESTfulResult doAddRailNetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterWorkRailwayActFirst> tareModels);
     RESTfulResult doAddRailAINetWf(List<MeterWorkRailwayMotorialReceived> grossModels, List<MeterBaseRailwayAiweight> tareModels);
+    RESTfulResult doAddNetInnerWf(MeterWorkRailwayMotorialReceived grossModel, MeterBaseRailwayAiweight tareModel);
 
     RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first);
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActFirst> models);

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

@@ -2,6 +2,7 @@ package com.steerinfo.meterwork.meterworkrailwayactfirst.service.impl;
 
 import com.google.inject.internal.cglib.proxy.$UndeclaredThrowableException;
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
+import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwayhistaredata.mapper.MeterBaseRailwayHisTareDataMapper;
 import com.steerinfo.baseinfo.meterbaserailwayhistaredata.model.MeterBaseRailwayHisTareData;
@@ -89,6 +90,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterWorkRailwayScheduledHelpMapper meterWorkRailwayScheduledHelpMapper;
 
+    @Resource
+    private MeterBaseRailwayAiweightMapper meterBaseRailwayAiweightMapper;
+
     @Resource
     private PreRailwayScaleMapper preRailwayScaleMapper;
 
@@ -4188,6 +4192,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         AIFirst.setConveyanceType(first.getRailwayType());
                         meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
 
+                        //作废AI标志皮
+                        first.setValueFlag("1");
+                        meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(first);
+
                         //新增一条毛重信息
                         MeterWorkRailwayActFirst second = new MeterWorkRailwayActFirst();
                         second.setActualFirstNo(received.getActualFirstNo());
@@ -4226,12 +4234,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setBaseSpot1No(received.getBaseSpotNo());
                         netRail.setBaseSpot1Name(received.getBaseSpotName());
                         netRail.setActualFirst1No(second.getActualFirstNo());
-
                         netRail.setRailwayTypeNo(received.getRailwayTypeNo());
                         netRail.setRailwayTypeName(received.getRailwayTypeName());
                         netRail.setConveyanceType(received.getRailwayModel());
                         //netRail.setRailwayModelName(received.getRailwayModel());
-
                         netRail.setTareWeight(AIFirst.getMeterWeight());
                         netRail.setTareManNo(userId);
                         netRail.setTareManName(userName);
@@ -4242,7 +4248,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setBaseSpot2No(second.getBaseSpotNo());
                         netRail.setBaseSpot2Name(second.getBaseSpotName());
                         netRail.setActualFirst2No(second.getActualFirstNo());
-
                         netRail.setNetMode("1");
                         netRail.setNetWeight(second.getMeterWeight().subtract(AIFirst.getMeterWeight()));
                         netRail.setNetTime(new Date());
@@ -4250,13 +4255,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         netRail.setNetManName(userName);
                         netRail.setNetSpot3No(received.getBaseSpotNo());
                         netRail.setNetSpot3Name(received.getBaseSpotName());
-
                         netRail.setValueFlag("0");
                         netRail.setUploadFlag("0");
-
                         netRail.setMeterTypeNo(received.getMeterTypeNo());
                         netRail.setMeterTypeName(received.getMeterTypeName());
-
                         int i = meterWorkRailwayActualMapper.insertSelective(netRail);
 
                         if (i >= 1) {
@@ -4277,6 +4279,127 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public RESTfulResult doAddNetInnerWf(MeterWorkRailwayMotorialReceived received, MeterBaseRailwayAiweight first) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            String afl = sdf.format(new Date());
+            String userId = "", userName = "";
+            try {
+                UserPayload payload = UserPayload.getCurrUser();
+                userId = payload.getId();
+                userName = payload.getUserName();
+            } catch (Exception ex) {
+                userId = "admin";
+                userName = "admins";
+            }
+
+            Assert.isTrue(received.getRailwayNo().equals(first.getRailwayNo()), "车号不一致,请重新选择！");
+            //两个车号一样则匹配，否则则不匹配
+            if (received.getRailwayNo().equals(first.getRailwayNo())) {
+                MeterWorkRailwayActFirst AIFirst = new MeterWorkRailwayActFirst();
+                //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
+                preRailwayScaleMapper.updateMeterWorkRailwayReceived(received.getActualFirstNo());
+
+                //将一次表中的皮重设置为已洁净
+                String firstNo = afl + meterWorkRailwayActFirstMapper.getNewID(afl);
+                AIFirst.setActualFirstNo(firstNo);
+                AIFirst.setValueFlag("2");
+                AIFirst.setRailwayNo(first.getRailwayNo());
+                AIFirst.setMeterWeight(first.getMeterWeight());
+                AIFirst.setRailwayTypeNo(first.getRailwayTypeNo());
+                AIFirst.setRailwayTypeName(first.getRailwayTypeName());
+                AIFirst.setCreateManNo(first.getCreateManNo());
+                AIFirst.setCreateManName(first.getCreateManName());
+                AIFirst.setCreateTime(first.getCreateTime());
+                AIFirst.setRailwaySpeed(first.getRailwaySpeed());
+                AIFirst.setConveyanceType(first.getRailwayType());
+                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(AIFirst);
+
+                //作废AI标志皮
+                first.setValueFlag("1");
+                meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(first);
+
+                //新增一条毛重信息
+                MeterWorkRailwayActFirst second = new MeterWorkRailwayActFirst();
+                second.setActualFirstNo(received.getActualFirstNo());
+                second.setValueFlag("2");
+                second.setRailwayNo(received.getRailwayNo());
+                second.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                second.setRailwaySpeed(received.getRailwaySpeed());
+                second.setMeterWeight(received.getMeterWeight());
+                second.setCreateTime(received.getCreateTime());
+                second.setCreateManNo(userId);
+                second.setCreateManName(userName);
+                second.setWeightType("0");
+                second.setRailwayTypeNo(received.getRailwayTypeNo());
+                second.setRailwayTypeName(received.getRailwayTypeName());
+                second.setBaseSpotNo(received.getBaseSpotNo());
+                second.setBaseSpotName(received.getBaseSpotName());
+                second.setShipmentGrossWeight(received.getShipmentGrossWeight());
+                second.setShipmentNetWeight(received.getShipmentNetWeight());
+                second.setRailwayModelName(received.getRailwayModel());
+                meterWorkRailwayActFirstMapper.insertSelective(second);
+
+                //新增一条洁净数据
+                MeterWorkRailwayActual netRail = new MeterWorkRailwayActual();
+                String netNo = meterWorkRailwayActualMapper.getNewID(afl);
+                netRail.setActualNo(afl + netNo);
+                netRail.setRailwayNo(received.getRailwayNo());
+                netRail.setRailwayCarriageNo(received.getRailwayCarriageNo());
+                netRail.setGrossWeight(received.getMeterWeight());
+                netRail.setGrossMode("1");
+                netRail.setGrossManNo(userId);
+                netRail.setGrossManName(userName);
+                netRail.setGrossTime(received.getCreateTime());
+                netRail.setGrossClass(received.getShipmentGrossWeight() + ""); //左右偏载
+                netRail.setGrossGroup(received.getShipmentNetWeight() + "");//前后偏载
+                netRail.setBaseSpot1No(received.getBaseSpotNo());
+                netRail.setBaseSpot1Name(received.getBaseSpotName());
+                netRail.setActualFirst1No(second.getActualFirstNo());
+                netRail.setRailwayTypeNo(received.getRailwayTypeNo());
+                netRail.setRailwayTypeName(received.getRailwayTypeName());
+                netRail.setConveyanceType(received.getRailwayModel());
+                //netRail.setRailwayModelName(received.getRailwayModel());
+                netRail.setTareWeight(AIFirst.getMeterWeight());
+                netRail.setTareManNo(userId);
+                netRail.setTareManName(userName);
+                netRail.setTareTime(AIFirst.getCreateTime());
+                netRail.setTareMode("1");
+                netRail.setTareClass(second.getShipmentGrossWeight() + ""); //左右偏载
+                netRail.setTareGroup(second.getShipmentNetWeight() + "");//前后偏载
+                netRail.setBaseSpot2No(second.getBaseSpotNo());
+                netRail.setBaseSpot2Name(second.getBaseSpotName());
+                netRail.setActualFirst2No(second.getActualFirstNo());
+                netRail.setNetMode("1");
+                netRail.setNetWeight(second.getMeterWeight().subtract(AIFirst.getMeterWeight()));
+                netRail.setNetTime(new Date());
+                netRail.setNetManNo(userId);
+                netRail.setNetManName(userName);
+                netRail.setNetSpot3No(received.getBaseSpotNo());
+                netRail.setNetSpot3Name(received.getBaseSpotName());
+                netRail.setValueFlag("0");
+                netRail.setUploadFlag("0");
+                netRail.setMeterTypeNo(received.getMeterTypeNo());
+                netRail.setMeterTypeName(received.getMeterTypeName());
+                int i = meterWorkRailwayActualMapper.insertSelective(netRail);
+
+                if (i >= 1) {
+                    meterWorkRailwayActFirstMapper.deleteByPrimaryKey(firstNo);
+                }
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setMessage("操作成功,匹配AI标志皮洁净成功！！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常,请确认！！！>>>" + e.getMessage());
+        }
+        return rm;
+    }
+
     @Override
     public RESTfulResult selfServiceMeasurement(MeterWorkRailwayActFirst first) {
         RESTfulResult rm = new RESTfulResult();