后端修改

src/main/java/com/steerinfo/baseinfo/meterbasecustomersupplier/controller/MeterBaseCustomerSupplierController.java

@@ -308,5 +308,26 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "获取打印特定的发货单位", notes = "根据参数进行查询")
+    @GetMapping(value = "/selectPrint/")
+    public RESTfulResult selectPrint() {
+        RESTfulResult rm = failed();
+        try {
+            List<MeterBaseCustomerSupplier> rows = meterBaseCustomerSupplierService.selectPrint();
+            if (rows == null || rows.size() <= 0) {
+                return failed("无发货单位信息！！");
+            }
+            return success(rows);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+        }
+        return rm;
+    }
+
 }
 

src/main/java/com/steerinfo/baseinfo/meterbasecustomersupplier/mapper/MeterBaseCustomerSupplierMapper.java

@@ -21,6 +21,8 @@ public interface MeterBaseCustomerSupplierMapper extends IBaseMapper<MeterBaseCu
 
     List<MeterBaseCustomerSupplier> selectByType();
 
+    List<MeterBaseCustomerSupplier> selectPrint();
+
     //皮带秤客户查询 预报接收
     String selectByIdForBelt(@org.apache.ibatis.annotations.Param("customerSupplierName") String customerSupplierName);
 

src/main/java/com/steerinfo/baseinfo/meterbasecustomersupplier/mapper/MeterBaseCustomerSupplierMapper.xml

@@ -601,4 +601,17 @@
       </if>
     </where>
   </select>
+
+  <select id="selectPrint" resultMap="BaseResultMap">
+    SELECT * FROM METER_BASE_CUSTOMER_SUPPLIER
+    WHERE (CUSTOMER_SUPPLIER_NAME LIKE '%股份大棒线成品库%'
+    OR "CUSTOMER_SUPPLIER_NAME" LIKE '%1558-不锈钢酸洗销售库%'
+    OR "CUSTOMER_SUPPLIER_NAME" LIKE '%股份综合成品库%'
+    OR "CUSTOMER_SUPPLIER_NAME" LIKE '%股份二高线成品库%'
+    OR "CUSTOMER_SUPPLIER_NAME" LIKE '%甘肃酒钢物流有限公司%'
+    OR "CUSTOMER_SUPPLIER_NAME" LIKE '%2104-嘉北综合料场%'
+    OR "CUSTOMER_SUPPLIER_NAME" LIKE '%724B-90万吨购销原料库%'
+    OR "CUSTOMER_SUPPLIER_NAME" LIKE '%2103-原料综合料场%')
+    AND CUSTOMER_SUPPLIER_NO != '1150520'
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasecustomersupplier/service/IMeterBaseCustomerSupplierService.java

@@ -35,6 +35,8 @@ public interface IMeterBaseCustomerSupplierService extends IBaseService<MeterBas
 
     List<MeterBaseCustomerSupplierDto> selectOut();
 
+    List<MeterBaseCustomerSupplier> selectPrint();
+
     List<MeterBaseCustomerSupplier> queryAll(Map<String,Object> parmas);
 
     String audit(List<MeterBaseCustomerSupplier> models);

src/main/java/com/steerinfo/baseinfo/meterbasecustomersupplier/service/impl/MeterBaseCustomerSupplierServiceImpl.java

@@ -257,4 +257,15 @@ public class MeterBaseCustomerSupplierServiceImpl extends BaseServiceImpl<MeterB
         }
         return "";
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<MeterBaseCustomerSupplier> selectPrint() {
+        try {
+            List<MeterBaseCustomerSupplier> mbcsds = meterBaseCustomerSupplierMapper.selectPrint();
+            return mbcsds;
+        } catch (MarkerMetException e) {
+            throw e;
+        }
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasematterinfo/controller/MeterBaseMatterInfoController.java

@@ -1,6 +1,7 @@
 package com.steerinfo.baseinfo.meterbasematterinfo.controller;
 
 import com.steerinfo.baseinfo.dto.SelectMatterDemo;
+import com.steerinfo.baseinfo.meterbasecustomersupplier.model.MeterBaseCustomerSupplier;
 import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
 import com.steerinfo.baseinfo.meterbasematterinfo.service.IMeterBaseMatterInfoService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -373,4 +374,26 @@ throw new MarkerMetException(500, "操作异常！！");
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "获取打印特定的物料", notes = "根据参数进行查询")
+    @GetMapping(value = "/selectPrint/")
+    public RESTfulResult selectPrint() {
+        RESTfulResult rm = failed();
+        try {
+            List<MeterBaseMatterInfo> rows = meterBaseMatterInfoService.selectPrint();
+            if (rows == null || rows.size() <= 0) {
+                return failed("无发货单位信息！！");
+            }
+            return success(rows);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/baseinfo/meterbasematterinfo/mapper/MeterBaseMatterInfoMapper.java

@@ -25,6 +25,8 @@ public interface MeterBaseMatterInfoMapper extends IBaseMapper<MeterBaseMatterIn
 
     List<MeterBaseMatterInfo> selectByMeterCode();
 
+    List<MeterBaseMatterInfo> selectPrint();
+
     List<MeterBaseMatterInfo> listMeterCode(HashMap<String, Object> obj);
 
     //皮带秤物料查询

src/main/java/com/steerinfo/baseinfo/meterbasematterinfo/mapper/MeterBaseMatterInfoMapper.xml

@@ -1010,6 +1010,37 @@
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.matterNo,jdbcType=VARCHAR}
         </foreach>-->
-
     </update>
+
+    <select id="selectPrint" resultMap="BaseResultMap">
+        SELECT * FROM METER_BASE_MATTER_INFO WHERE MATTER_NAME in ('DBX带肋钢筋\HRB500E Φ32.0 5m-9m',
+        'DBX带肋钢筋\HRB500E Φ22.0 5m-9m','奥氏体热轧钢板\347H 41×1500×>6m QT','奥氏体热轧钢板\S31603 20×1920×>6m QT',
+        '奥氏体热轧钢板\S30408 18×1920×>6m QT','奥氏体热轧钢板\S30408 32×1890×>6m QT','奥氏体热轧钢板\S31608 24×2300×>6m QT',
+        '奥氏体热轧钢板\S30408 24×1525×>6m QT','奥氏体热轧钢板\S31603 28×1565×>6m QT','奥氏体热轧钢板\S30408 30×2345×>6m QT',
+        '奥氏体热轧钢板\S31603 20×2000×>6m QT','DBX带肋钢筋\HRB400E Φ18.0 5m-9m','DBX带肋钢筋\HRB400E Φ22.0 5m-9m',
+        'DBX带肋钢筋\HRB400E Φ28.0 5m-9m','DBX带肋钢筋\HRB400E Φ25.0 5m-9m','DBX带肋钢筋\HRB400E Φ20.0 5m-9m DBX带肋钢筋\HRB500E Φ28.0 5m-9m',
+        'DBX带肋钢筋\HRB500E Φ32.0 5m-9m','DBX带肋钢筋\HRB500E Φ22.0 5m-9m','XB1带肋钢筋\HRB400E Φ16.0 5m-9m','XB1带肋钢筋\HRB400E Φ14.0 5m-9m',
+        'XB1带肋钢筋\HRB400E Φ12.0 5m-9m','XB1通尺带肋钢筋HRB400E(∮16.0mm/6m-9m)','XB1定尺带肋钢筋HRB400E(∮12.0mm/12m)',
+        '低合金钢板Q355B/32.0*1.5-2.7m*2-6.2m短尺切边','低合金钢板Q355B/30.0*1.5-2.7m*2-6.2m短尺切边','低合金钢板Q355B/20.0*1.5-2.7m*2-6.2m短尺切边',
+        '低合金钢板Q355B/16.0*1.5-2.7m*2-6.2m短尺切边','低合金钢板Q355B/12.0*1.5-2.7m*2-6.2m短尺切边','低合金钢板Q355B/10.0*1.5-2.7m*2-6.2m短尺切边',
+        '低合金钢板Q355B/32.0*通尺切边(非计划)','低合金钢板Q355B/10.0*通尺切边(非计划)','普碳钢板Q235B/25.0*1.5-2.7m*短尺切边',
+        'DBX带肋钢筋\HRB400E Φ18.0 5m-9m','DBX带肋钢筋\HRB400E Φ22.0 5m-9m','DBX带肋钢筋\HRB400E Φ28.0 5m-9m','DBX带肋钢筋\HRB400E Φ25.0 5m-9m',
+        'DBX带肋钢筋\HRB400E Φ20.0 5m-9m','DBX带肋钢筋\HRB500E Φ28.0 5m-9m','DBX带肋钢筋\HRB500E Φ32.0 5m-9m','DBX带肋钢筋\HRB500E Φ22.0 5m-9m',
+        'XB1带肋钢筋\HRB400E Φ16.0 5m-9m','XB1带肋钢筋\HRB400E Φ14.0 5m-9m','XB1带肋钢筋\HRB400E Φ12.0 5m-9m','XB1通尺带肋钢筋HRB400E(∮16.0mm/6m-9m)',
+        'XB1定尺带肋钢筋HRB400E(∮12.0mm/12m)','XB2优碳盘条J82B∮12.5mm','XB2优碳盘条82B∮12.5mm','XB2优碳盘条70∮6.5mm','XB2焊接盘条ER70S-6X∮6.5mm',
+        'XB2焊接盘条H08A∮6.5mm','XB2弹簧盘条65Mn∮10.0mm','XB2低碳盘条Q235∮6.5mm','XB2热轧带肋钢筋HRB400E∮12.0mm','XB2热轧带肋钢筋HRB400E∮10.0mm',
+        'XB2热轧带肋钢筋HRB400E∮8.0mm','XB2弹簧盘条65Mn∮10.0mm','XB2低碳盘条Q235∮6.5mm','XB2焊接盘条ER70S-6X∮6.5mm','XB2焊接盘条H08A∮6.5mm',
+        'XB2热轧带肋钢筋HRB400E∮12.0mm','XB2热轧带肋钢筋HRB400E∮10.0mm','XB2热轧带肋钢筋HRB400E∮8.0mm','XB2优碳盘条82B∮12.5mm','XB2优碳盘条70∮6.5mm',
+        'DBX带肋钢筋\HRB400E Φ18.0 5m-9m','DBX带肋钢筋\HRB400E Φ22.0 5m-9m','DBX带肋钢筋\HRB400E Φ28.0 5m-9m','DBX带肋钢筋\HRB400E Φ25.0 5m-9m',
+        'DBX带肋钢筋\HRB400E Φ20.0 5m-9m','DBX带肋钢筋\HRB500E Φ28.0 5m-9m','奥氏体热轧钢板\S31603 20×2000×6m QT','奥氏体热轧钢板\S31603 25×2000×6m QT',
+        '奥氏体热轧钢板\S31603 16×2000×6m QT','奥氏体热轧钢板\S31603 18×2000×6m QT','奥氏体热轧钢板\S31603 22×1800×>6m QT',
+        '奥氏体热轧钢板\S30408 20×1500×>6m QT','奥氏体热轧钢板\S30408 18×2000×6m QT','奥氏体热轧钢板\S30408 18×2000×>6m QT',
+        '奥氏体热轧钢板\S30408 22×1500×>6m QT','奥氏体热轧钢板\S30408 22×1800×6m QT','奥氏体热轧钢板\S30408 26×2000×>6m QT',
+        '奥氏体热轧钢板\S30408 20×1800×>6m QT','奥氏体热轧钢板\S30408 25×1500×>6m QT','奥氏体热轧钢板\S30408 25×2000×>6m QT',
+        '奥氏体热轧钢板\S30408 36×1500×>6m QT','奥氏体热轧钢板\S30408 30×2000×>6m QT','奥氏体热轧钢板\S30408 60×1500×>6m QT',
+        '奥氏体热轧钢板\S30408 16×2000×6m QT','奥氏体热轧钢板\S31603 20×1900×>6m QT','奥氏体热轧钢板\S31603 24×1600×>6m QT',
+        '奥氏体热轧钢板\S30408 8×2000×>6m QT','双相体热轧钢板\S22053 22×1500×>6m QT','高炉水渣\湿','自制3','4号焦炉大块焦',
+        'XB1带肋钢筋\\HRB400E Φ16.0 5m-9m','氧化铝\GB/T24487 氧化锂:0.01-0.05','肥煤\高硫 低灰 乌达','喷吹改质煤','喷吹无烟煤',
+        '气煤\策克','主焦煤\288口岸','主焦煤\山西','主焦煤\中硫 高灰 乌达','球团')
+    </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasematterinfo/service/IMeterBaseMatterInfoService.java

@@ -1,6 +1,7 @@
 package com.steerinfo.baseinfo.meterbasematterinfo.service;
 
 import com.steerinfo.baseinfo.dto.SelectMatterDemo;
+import com.steerinfo.baseinfo.meterbasecustomersupplier.model.MeterBaseCustomerSupplier;
 import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.framework.service.pagehelper.PageList;
@@ -29,6 +30,8 @@ public interface IMeterBaseMatterInfoService extends IBaseService<MeterBaseMatte
 
     String Recovery(List<MeterBaseMatterInfo> models);
 
+    List<MeterBaseMatterInfo> selectPrint();
+
     String abolish(List<MeterBaseMatterInfo> models);
 
     List<MeterBaseMatterInfo> queryAll(Map<String,Object> parmas);

src/main/java/com/steerinfo/baseinfo/meterbasematterinfo/service/impl/MeterBaseMatterInfoServiceImpl.java

@@ -4,6 +4,7 @@ package com.steerinfo.baseinfo.meterbasematterinfo.service.impl;
 import com.steerinfo.baseinfo.dto.SelectMatterDemo;
 import com.steerinfo.baseinfo.meterbasebillprint.mapper.MeterBaseBillPrintMapper;
 import com.steerinfo.baseinfo.meterbasebillprint.model.MeterBaseBillPrint;
+import com.steerinfo.baseinfo.meterbasecustomersupplier.model.MeterBaseCustomerSupplier;
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
 import com.steerinfo.baseinfo.meterbasematterinfo.model.MeterBaseMatterInfo;
 import com.steerinfo.baseinfo.meterbasematterinfo.service.IMeterBaseMatterInfoService;
@@ -359,4 +360,14 @@ public class MeterBaseMatterInfoServiceImpl extends BaseServiceImpl<MeterBaseMat
         return meterBaseMatterInfoMapper.doUpdateBeltType(list);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<MeterBaseMatterInfo> selectPrint() {
+        try {
+            List<MeterBaseMatterInfo> mbcsds = meterBaseMatterInfoMapper.selectPrint();
+            return mbcsds;
+        } catch (MarkerMetException e) {
+            throw e;
+        }
+    }
 }

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

@@ -57,6 +57,7 @@ import com.steerinfo.util.StringUtils;
 import io.micrometer.core.instrument.Meter;
 import org.apache.poi.hssf.record.ArrayRecord;
 import org.apache.shiro.crypto.hash.Hash;
+import org.bytedeco.tesseract.STRING;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
@@ -1556,6 +1557,26 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         List<MeterWorkRailwayActFirst> firsts = new ArrayList<>();
         List<MeterWorkRailwayActual> actuals = new ArrayList<>();
         try {
+            String scaleNo = "";
+            //从勾选的委托、两个一次数据中赋值委托号
+            if(scale != null && scale.getPredictionNo() != null && StringUtils.isNotEmpty(scale.getPredictionNo())){
+                if((first01.getPredictionNo() != null && StringUtils.isNotEmpty(first01.getPredictionNo())
+                        && (!scale.getPredictionNo().equals(first01.getPredictionNo()) && !first01.getPredictionNo().equals("混装混卸复制")))){
+                    rm.setMessage("毛重一次计量数据与勾选中的委托号不一致,请确认！！");
+                    return rm;
+                }else if(first02.getPredictionNo() != null && StringUtils.isNotEmpty(first02.getPredictionNo())
+                        && (!scale.getPredictionNo().equals(first02.getPredictionNo())&& !first01.getPredictionNo().equals("混装混卸复制"))){
+                    rm.setMessage("皮重一次计量数据与勾选中的委托号不一致,请确认！！");
+                    return rm;
+                }
+                scaleNo = scale.getPredictionNo();
+            }else if((first01.getPredictionNo() != null && StringUtils.isNotEmpty(first01.getPredictionNo()) && !first01.getPredictionNo().equals("混装混卸复制"))){
+                scaleNo = first01.getPredictionNo();
+            }else if(first02.getPredictionNo() != null && StringUtils.isNotEmpty(first02.getPredictionNo()) && !first02.getPredictionNo().equals("混装混卸复制")){
+                scaleNo = first02.getPredictionNo();
+            }
+            scale = preRailwayScaleMapper.selectByPrimaryKey(scaleNo);
+
 
             if (StringUtils.isEmpty(scale.getPredictionNo())) {
                 //获取两个一次重量的差值
@@ -2022,6 +2043,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     first02.setValueFlag("1");
                     first02.setCreateTime(new Date());
                     meterWorkRailwayActFirstMapper.insertSelective(first02);
+                    firsts.add(first02);
+                }else {
+                    firsts.add(model02);
                 }
             /*//6、修改计量监控
             updateMonitor(first02.getBaseSpotNo());
@@ -2033,7 +2057,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             if (StringUtils.isNotEmpty(first02.getAddWgtPk())) {
                 insertAddWgtNo(first02.getActualFirstNo(), first02.getAddWgtPk(), first02.getCreateManNo(), first02.getCreateManName());
             }*/
-                firsts.add(first02);
+
                 actuals.add(actualRow);
                 map.put("firsts", firsts);
                 map.put("actuals", actuals);
@@ -4185,6 +4209,24 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 flag = "1";
             }
 
+            String scaleNo = "";
+            //从勾选的委托、两个一次数据中赋值委托号
+            if(scale != null && scale.getPredictionNo() != null && StringUtils.isNotEmpty(scale.getPredictionNo())){
+                if((grossModel.getPredictionNo() != null && StringUtils.isNotEmpty(grossModel.getPredictionNo()) && !scale.getPredictionNo().equals(grossModel.getPredictionNo()))){
+                    rm.setMessage("毛重一次计量数据与勾选中的委托号不一致,请确认！！");
+                    return rm;
+                }else if(tareModel.getPredictionNo() != null && StringUtils.isNotEmpty(tareModel.getPredictionNo()) && !scale.getPredictionNo().equals(tareModel.getPredictionNo())){
+                    rm.setMessage("皮重一次计量数据与勾选中的委托号不一致,请确认！！");
+                    return rm;
+                }
+                scaleNo = scale.getPredictionNo();
+            }else if((grossModel.getPredictionNo() != null && StringUtils.isNotEmpty(grossModel.getPredictionNo()))){
+                scaleNo = grossModel.getPredictionNo();
+            }else if(tareModel.getPredictionNo() != null && StringUtils.isNotEmpty(tareModel.getPredictionNo())){
+                scaleNo = tareModel.getPredictionNo();
+            }
+            scale = preRailwayScaleMapper.selectByPrimaryKey(scaleNo);
+
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
             //毛重一次
             MeterWorkRailwayActFirst model01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
@@ -7024,6 +7066,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
                     meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceived(receivedModel.getActualFirstNo());
 
+                    //更新主表状态METER_WORK_RAILWAY_REC_MAIN
+                    if(receivedModel.getRailwayWorkNo() != null && StringUtils.isNotEmpty(receivedModel.getRailwayWorkNo())) {
+                        HashMap<String, Object> objRec = new HashMap<>();
+                        objRec.put("railwayWorkNo", receivedModel.getRailwayWorkNo());
+                        objRec.put("valueFlag", "1");
+                        List<MeterWorkRailwayReceived> receiveds = meterWorkRailwayReceivedMapper.selectByParameters(objRec);
+                        if(receiveds.size() < 1) {
+                            HashMap<String, Object> objMap = new HashMap<>();
+                            objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                            List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                            if(recMains.size() >= 1) {
+                                recMains.get(0).setIsDispose("1");
+                                meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
+                            }
+                        }
+                    }
                     //作废AI标志皮
                     AiWeightModel.setValueFlag("1");
                     meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(AiWeightModel);
@@ -7075,7 +7133,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -7084,8 +7141,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                     //更新预报数
@@ -7114,10 +7171,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     HashMap<String, Object> countMap = meterWorkRailwayReceivedMapper.getCount(obj);
                     int countNum = Integer.parseInt(countMap.get("COUNTNUM").toString());
                     if(countNum < 1) {
-                        MeterWorkRailwayRecMain mainModel = meterWorkRailwayRecMainMapper.selectByPrimaryKey(receivedModel.getRailwayWorkNo());
-                        if(mainModel != null) {
-                            mainModel.setIsDispose("1");
-                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(mainModel);
+                        HashMap<String, Object> objMap = new HashMap<>();
+                        objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                        List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                        if(recMains.size() >= 1) {
+                            recMains.get(0).setIsDispose("1");
+                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
                         }
                     }
                 }
@@ -7136,8 +7195,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             rm.setMessage(strCar);
         }catch(Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常：>>>" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
         }
         return rm;
     }
@@ -7170,6 +7229,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
                     meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceived(receivedModel.getActualFirstNo());
 
+                    //更新主表状态METER_WORK_RAILWAY_REC_MAIN
+                    if(receivedModel.getRailwayWorkNo() != null && StringUtils.isNotEmpty(receivedModel.getRailwayWorkNo())) {
+                        HashMap<String, Object> objRec = new HashMap<>();
+                        objRec.put("railwayWorkNo", receivedModel.getRailwayWorkNo());
+                        objRec.put("valueFlag", "1");
+                        List<MeterWorkRailwayReceived> receiveds = meterWorkRailwayReceivedMapper.selectByParameters(objRec);
+                        if(receiveds.size() < 1) {
+                            HashMap<String, Object> objMap = new HashMap<>();
+                            objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                            List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                            if(recMains.size() >= 1) {
+                                recMains.get(0).setIsDispose("1");
+                                meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
+                            }
+                        }
+                    }
+
                     //从表赋值grossModel、AI也赋值tareModel并修改重量
                     BeanUtils.copyProperties(receivedModel, grossModel);
                     grossModel.setLcNo(receivedModel.getRailwayModelNo());
@@ -7217,7 +7293,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -7226,8 +7301,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                     //更新预报数
@@ -7256,10 +7331,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     HashMap<String, Object> countMap = meterWorkRailwayReceivedMapper.getCount(obj);
                     int countNum = Integer.parseInt(countMap.get("COUNTNUM").toString());
                     if(countNum < 1) {
-                        MeterWorkRailwayRecMain mainModel = meterWorkRailwayRecMainMapper.selectByPrimaryKey(receivedModel.getRailwayWorkNo());
-                        if(mainModel != null) {
-                            mainModel.setIsDispose("1");
-                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(mainModel);
+                        HashMap<String, Object> objMap = new HashMap<>();
+                        objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                        List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                        if(recMains.size() >= 1) {
+                            recMains.get(0).setIsDispose("1");
+                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
                         }
                     }
                 }
@@ -7278,8 +7355,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             rm.setMessage(strCar);
         }catch(Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常：>>>" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
         }
         return rm;
     }
@@ -7316,6 +7393,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
                     meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceived(receivedModel.getActualFirstNo());
 
+                    //更新主表状态METER_WORK_RAILWAY_REC_MAIN
+                    if(receivedModel.getRailwayWorkNo() != null && StringUtils.isNotEmpty(receivedModel.getRailwayWorkNo())) {
+                        HashMap<String, Object> objRec = new HashMap<>();
+                        objRec.put("railwayWorkNo", receivedModel.getRailwayWorkNo());
+                        objRec.put("valueFlag", "1");
+                        List<MeterWorkRailwayReceived> receiveds = meterWorkRailwayReceivedMapper.selectByParameters(objRec);
+                        if(receiveds.size() < 1) {
+                            HashMap<String, Object> objMap = new HashMap<>();
+                            objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                            List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                            if(recMains.size() >= 1) {
+                                recMains.get(0).setIsDispose("1");
+                                meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
+                            }
+                        }
+                    }
+
                     //从表赋值grossModel、AI也赋值tareModel并修改重量
                     BeanUtils.copyProperties(receivedModel, grossModel);
                     grossModel.setLcNo(receivedModel.getRailwayModelNo());
@@ -7413,10 +7507,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     HashMap<String, Object> countMap = meterWorkRailwayReceivedMapper.getCount(obj);
                     int countNum = Integer.parseInt(countMap.get("COUNTNUM").toString());
                     if(countNum < 1) {
-                        MeterWorkRailwayRecMain mainModel = meterWorkRailwayRecMainMapper.selectByPrimaryKey(receivedModel.getRailwayWorkNo());
-                        if(mainModel != null) {
-                            mainModel.setIsDispose("1");
-                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(mainModel);
+                        HashMap<String, Object> objMap = new HashMap<>();
+                        objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                        List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                        if(recMains.size() >= 1) {
+                            recMains.get(0).setIsDispose("1");
+                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
                         }
                     }
                 }
@@ -7435,8 +7531,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             rm.setMessage(strCar);
         }catch(Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常：>>>" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
         }
         return rm;
     }
@@ -7469,6 +7565,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     //已使用 METER_WORK_RAILWAY_RECEIVED表状态设置为已使用
                     meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceived(receivedModel.getActualFirstNo());
 
+                    //更新主表状态METER_WORK_RAILWAY_REC_MAIN
+                    if(receivedModel.getRailwayWorkNo() != null && StringUtils.isNotEmpty(receivedModel.getRailwayWorkNo())) {
+                        HashMap<String, Object> objRec = new HashMap<>();
+                        objRec.put("railwayWorkNo", receivedModel.getRailwayWorkNo());
+                        objRec.put("valueFlag", "1");
+                        List<MeterWorkRailwayReceived> receiveds = meterWorkRailwayReceivedMapper.selectByParameters(objRec);
+                        if(receiveds.size() < 1) {
+                            HashMap<String, Object> objMap = new HashMap<>();
+                            objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                            List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                            if(recMains.size() >= 1) {
+                                recMains.get(0).setIsDispose("1");
+                                meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
+                            }
+                        }
+                    }
+
                     //从表赋值grossModel、历史皮也赋值tareModel并修改重量
                     BeanUtils.copyProperties(receivedModel, grossModel);
                     grossModel.setLcNo(receivedModel.getRailwayModelNo());
@@ -7516,7 +7629,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getGrossTime());
                         actualRow.setCreateTime(actualRow.getGrossTime());
                         actualRow.setCreateManName(actualRow.getGrossManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     }else {
                         actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                         actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -7525,8 +7637,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetTime(actualRow.getTareTime());
                         actualRow.setCreateTime(actualRow.getTareTime());
                         actualRow.setCreateManName(actualRow.getTareManName());
-                        actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
                     }
+                    actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                     //更新预报数
@@ -7555,10 +7667,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     HashMap<String, Object> countMap = meterWorkRailwayReceivedMapper.getCount(obj);
                     int countNum = Integer.parseInt(countMap.get("COUNTNUM").toString());
                     if(countNum < 1) {
-                        MeterWorkRailwayRecMain mainModel = meterWorkRailwayRecMainMapper.selectByPrimaryKey(receivedModel.getRailwayWorkNo());
-                        if(mainModel != null) {
-                            mainModel.setIsDispose("1");
-                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(mainModel);
+                        HashMap<String, Object> objMap = new HashMap<>();
+                        objMap.put("soundName", receivedModel.getRailwayWorkNo());
+                        List<MeterWorkRailwayRecMain> recMains = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                        if(recMains.size() >= 1) {
+                            recMains.get(0).setIsDispose("1");
+                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMains.get(0));
                         }
                     }
                 }
@@ -7577,8 +7691,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             rm.setMessage(strCar);
         }catch(Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常：>>>" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
         }
         return rm;
     }
@@ -7740,8 +7854,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             rm.setMessage("操作成功,总共"+ models.size() +"条数据，共有：" + count + "条数据匹配标识皮成功");
         }catch(Exception e) {
             e.printStackTrace();
-            rm.setMessage("操作异常：>>>" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常：>>>" + e.getMessage());
         }
         return rm;
     }
@@ -8105,20 +8219,20 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
                             actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
                             actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
-                            actualModel.setNetManNo(actualModel.getGrossManNo());
-                            actualModel.setNetManName(actualModel.getGrossManName());
-                            actualModel.setNetTime(actualModel.getGrossTime());
-                            actualModel.setCreateTime(actualModel.getGrossTime());
-                            actualModel.setCreateManName(actualModel.getGrossManName());
+                            actualModel.setNetManNo(userId);
+                            actualModel.setNetManName(userName);
+                            actualModel.setNetTime(new Date());
+                            actualModel.setCreateTime(actualModel.getNetTime());
+                            actualModel.setCreateManName(userName);
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
                         }else {
                             actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
                             actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
-                            actualModel.setNetManNo(actualModel.getTareManNo());
-                            actualModel.setNetManName(actualModel.getTareManName());
-                            actualModel.setNetTime(actualModel.getTareTime());
-                            actualModel.setCreateTime(actualModel.getTareTime());
-                            actualModel.setCreateManName(actualModel.getTareManName());
+                            actualModel.setNetManNo(userId);
+                            actualModel.setNetManName(userName);
+                            actualModel.setNetTime(new Date());
+                            actualModel.setCreateTime(actualModel.getNetTime());
+                            actualModel.setCreateManName(userName);
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
                         }
                         meterWorkRailwayActualMapper.insertSelective(actualModel);
@@ -8134,7 +8248,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                         count ++;
                     }else {
-                        if(tareWeight.compareTo(new BigDecimal(0)) != 0 && tareWeight.compareTo(new BigDecimal(30000)) < 0) {
+                        if(tareWeight.compareTo(new BigDecimal(0)) != 0 && tareWeight.compareTo(new BigDecimal(35000)) < 0) {
                             grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossNo);
                             MeterWorkRailwayActual actualModel = new MeterWorkRailwayActual();
 
@@ -8171,20 +8285,20 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
                                 actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
                                 actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
-                                actualModel.setNetManNo(actualModel.getGrossManNo());
-                                actualModel.setNetManName(actualModel.getGrossManName());
-                                actualModel.setNetTime(actualModel.getGrossTime());
-                                actualModel.setCreateTime(actualModel.getGrossTime());
-                                actualModel.setCreateManName(actualModel.getGrossManName());
+                                actualModel.setNetManNo(userId);
+                                actualModel.setNetManName(userName);
+                                actualModel.setNetTime(new Date());
+                                actualModel.setCreateTime(actualModel.getNetTime());
+                                actualModel.setCreateManName(userName);
                                 actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
                             }else {
                                 actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
                                 actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
-                                actualModel.setNetManNo(actualModel.getTareManNo());
-                                actualModel.setNetManName(actualModel.getTareManName());
-                                actualModel.setNetTime(actualModel.getTareTime());
-                                actualModel.setCreateTime(actualModel.getTareTime());
-                                actualModel.setCreateManName(actualModel.getTareManName());
+                                actualModel.setNetManNo(userId);
+                                actualModel.setNetManName(userName);
+                                actualModel.setNetTime(new Date());
+                                actualModel.setCreateTime(actualModel.getNetTime());
+                                actualModel.setCreateManName(userName);
                                 actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
                             }
                             meterWorkRailwayActualMapper.insertSelective(actualModel);
@@ -8243,26 +8357,26 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
                             actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
                             actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
-                            actualModel.setNetManNo(actualModel.getGrossManNo());
-                            actualModel.setNetManName(actualModel.getGrossManName());
+                            actualModel.setNetManNo(userId);
+                            actualModel.setNetManName(userName);
                             actualModel.setNetTime(actualModel.getGrossTime());
                             actualModel.setCreateTime(actualModel.getGrossTime());
-                            actualModel.setCreateManName(actualModel.getGrossManName());
+                            actualModel.setCreateManName(userName);
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
                         }else {
                             actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
                             actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
-                            actualModel.setNetManNo(actualModel.getTareManNo());
-                            actualModel.setNetManName(actualModel.getTareManName());
+                            actualModel.setNetManNo(userId);
+                            actualModel.setNetManName(userName);
                             actualModel.setNetTime(actualModel.getTareTime());
                             actualModel.setCreateTime(actualModel.getTareTime());
-                            actualModel.setCreateManName(actualModel.getTareManName());
+                            actualModel.setCreateManName(userName);
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
                         }
                         meterWorkRailwayActualMapper.insertSelective(actualModel);
                         count ++;
                     }else {
-                        if(tareWeight.compareTo(new BigDecimal(0)) != 0 && tareWeight.compareTo(new BigDecimal(30000)) < 0) {
+                        if(tareWeight.compareTo(new BigDecimal(0)) != 0 && tareWeight.compareTo(new BigDecimal(35000)) < 0) {
                             grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossNo);
                             MeterWorkRailwayActual actualModel = new MeterWorkRailwayActual();
                             BeanUtils.copyProperties(grossModel, tareModel);
@@ -8293,20 +8407,20 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             if(actualModel.getGrossTime().compareTo(actualModel.getTareTime()) >= 0) {
                                 actualModel.setNetSpot3No(actualModel.getBaseSpot1No());
                                 actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
-                                actualModel.setNetManNo(actualModel.getGrossManNo());
-                                actualModel.setNetManName(actualModel.getGrossManName());
+                                actualModel.setNetManNo(userId);
+                                actualModel.setNetManName(userName);
                                 actualModel.setNetTime(actualModel.getGrossTime());
                                 actualModel.setCreateTime(actualModel.getGrossTime());
-                                actualModel.setCreateManName(actualModel.getGrossManName());
+                                actualModel.setCreateManName(userName);
                                 actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
                             }else {
                                 actualModel.setNetSpot3No(actualModel.getBaseSpot2No());
                                 actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
-                                actualModel.setNetManNo(actualModel.getTareManNo());
-                                actualModel.setNetManName(actualModel.getTareManName());
+                                actualModel.setNetManNo(userId);
+                                actualModel.setNetManName(userName);
                                 actualModel.setNetTime(actualModel.getTareTime());
                                 actualModel.setCreateTime(actualModel.getTareTime());
-                                actualModel.setCreateManName(actualModel.getTareManName());
+                                actualModel.setCreateManName(userName);
                                 actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
                             }
                             meterWorkRailwayActualMapper.insertSelective(actualModel);
@@ -8321,8 +8435,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             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/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -1048,6 +1048,20 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "C#——动态轨道衡批量撤销净重毛皮分解")
+    @Transactional
+    @PostMapping(value = "/resolveList")
+    public RESTfulResult resolveList(@RequestBody List<MeterWorkRailwayActual> models) {
+        try {
+            RESTfulResult rm = meterWorkRailwayActualService.resolveList(models);
+            return rm;
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return failed(null, "操作异常，请确认！");
+        }
+    }
+
     @ApiOperation(value = "C#——批量作废净重数据并撤销委托")
     @Transactional
     @PostMapping(value = "/deleteList")

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

@@ -69,6 +69,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     RESTfulResult updatePre(MeterWorkRailwayActual model);
 
     RESTfulResult updatePreCancel(MeterWorkRailwayActual model);
+    RESTfulResult resolveList(List<MeterWorkRailwayActual> model);
 
     PageList<MeterWorkRailwayActual> doQueryActWf(HashMap parmas, Integer pageNum, Integer pageSize);
 

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

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkrailwayactual.service.impl;
 
+import com.google.inject.internal.cglib.proxy.$FixedValue;
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
@@ -588,7 +589,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             }else if((actFirst01.getPredictionNo() != null && StringUtils.isNotEmpty(actFirst01.getPredictionNo()))){
                 scaleNo = actFirst01.getPredictionNo();
             }else if(actFirst02.getPredictionNo() != null && StringUtils.isNotEmpty(actFirst02.getPredictionNo())){
-                scaleNo = actFirst01.getPredictionNo();
+                scaleNo = actFirst02.getPredictionNo();
             }
 
             PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(scaleNo);
@@ -3285,43 +3286,142 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 userId = "admin";
                 userName = "admin";
             }
-            HashMap selActual = new HashMap();
-            selActual.put("actualNo",model.getActualNo());
-            selActual.put("uploadFlag","2");
+            MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
+            Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的洁净数据");
+            Assert.isTrue(!(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")), model.getActualNo() + "对应的洁净数据已发布或者已作废,无法撤销委托");
+            if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())) {
+                PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
+                Assert.isTrue(scale != null, "未找到" + modelTemp.getPredictionNo() +"对应的委托信息");
+                Assert.isTrue(!scale.getValueFlag().equals("9"), modelTemp.getPredictionNo() +"对应的委托信息已结算");
+
+                MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst1No());
+                MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst2No());
+                if(grossModel != null) {
+                    grossModel = meterWorkRailwayActFirstMapper.selectAndRemove(grossModel.getActualFirstNo());
+                    grossModel.setIsPreSacale("0");
+                    grossModel.setValueFlag("1");
+                    grossModel.setUpdateManNo(userId);
+                    grossModel.setUpdateManName(userName);
+                    grossModel.setUpdateTime(new Date());
+                    grossModel.setNote("动态衡撤销委托");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(grossModel);
+                }
+                if(tareModel != null) {
+                    tareModel = meterWorkRailwayActFirstMapper.selectAndRemove(tareModel.getActualFirstNo());
+                    tareModel.setIsPreSacale("0");
+                    tareModel.setValueFlag("1");
+                    tareModel.setUpdateManNo(userId);
+                    tareModel.setUpdateManName(userName);
+                    tareModel.setUpdateTime(new Date());
+                    tareModel.setNote("动态衡撤销委托");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(tareModel);
+                }
 
-            HashMap selPre = new HashMap();
-            selPre.put("predictionNo",model.getPredictionNo());
-            selPre.put("valueFlag","1");
-            List<MeterWorkRailwayActual> meterWorkRailwayActual = meterWorkRailwayActualMapper.selectByParameter(selActual);
+                MeterWorkRailwayActual actualRow = meterWorkRailwayActualMapper.cleanPredcition(modelTemp.getActualNo());
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("1");
+                actualRow.setUpdateManNo(userId);
+                actualRow.setUpdateManName(userName);
+                actualRow.setUpdateTime(new Date());
+                actualRow.setNote("动态衡撤销委托");
+                actualRow.setIsPreSacale("0");
+                meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualRow);
 
-            List<PreRailwayScale> preRailwayScales = preRailwayScaleMapper.selectByParameters(selPre);
-            if(meterWorkRailwayActual.size() > 0){
-                rm.setFailed();
-                rm.setCode("500");
+                scale.setValueFlag("1");
+                scale.setUploadFlag("1");
+                scale.setUpdateManNo(userId);
+                scale.setUpdateManName(userName);
+                scale.setUpdateTime(new Date());
+                preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                rm.setSucceed();
                 rm.setData(null);
-                rm.setMessage("已发布无法撤销");
+                rm.setMessage("撤销成功");
+            }else {
+                rm.setMessage("委托号为空,无法撤销委托");
+                return rm;
             }
-            else if(preRailwayScales.size() == 0){
-                rm.setFailed();
-                rm.setCode("500");
-                rm.setData(null);
-                rm.setMessage("委托已经被使用或已过期");
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage(e.getMessage());
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult resolveList(List<MeterWorkRailwayActual> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            String userId = "";
+            String userName = "";
+            try {
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
             }
-            else {
-                MeterWorkRailwayActual mwra = meterWorkRailwayActualMapper.cleanPredcition(model.getActualNo());
-                mwra.setUpdateManNo(userId);
-                mwra.setUpdateManName(userName);
-                mwra.setUpdateTime(new Date());
-                mwra.setIsPreSacale("0");
-                meterWorkRailwayActualMapper.updateByPrimaryKeySelective(mwra);
+            catch (Exception e){
+                userId = "admin";
+                userName = "admin";
+            }
+
+            for (MeterWorkRailwayActual model: models) {
+                MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
+                if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())) {
+                    rm.setMessage("选择的结净数据中包含有委托，请撤销完委托之后才能进行毛皮分解");
+                    return rm;
+                }
+                if(modelTemp.getValueFlag().equals("2") && modelTemp.getValueFlag().equals("0")) {
+                    rm.setMessage("选择的结净数据中包含有已发布或者已作废，无法进行毛皮分解");
+                    return rm;
+                }
+            }
+            for (MeterWorkRailwayActual model: models) {
+                MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
+                Assert.isTrue(modelTemp != null, "未查询到"+ model.getActualNo() +"对应的洁净数据");
+
+                MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst1No());
+                MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst2No());
+                if(grossModel != null) {            //作废毛重数据、并回复从表数据
+                    grossModel = meterWorkRailwayActFirstMapper.selectAndRemove(grossModel.getActualFirstNo());
+                    grossModel.setIsPreSacale("0");
+                    grossModel.setValueFlag("0");
+                    grossModel.setUpdateManNo(userId);
+                    grossModel.setUpdateManName(userName);
+                    grossModel.setUpdateTime(new Date());
+                    grossModel.setNote("动态衡毛皮分解");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(grossModel);
+                }
+                if(tareModel != null) {
+                    tareModel = meterWorkRailwayActFirstMapper.selectAndRemove(tareModel.getActualFirstNo());
+                    tareModel.setIsPreSacale("0");
+                    tareModel.setValueFlag("1");
+                    tareModel.setUpdateManNo(userId);
+                    tareModel.setUpdateManName(userName);
+                    tareModel.setUpdateTime(new Date());
+                    tareModel.setNote("动态衡毛皮分解");
+                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(tareModel);
+                }
+
+                MeterWorkRailwayActual actualRow = meterWorkRailwayActualMapper.cleanPredcition(modelTemp.getActualNo());
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("0");
+                actualRow.setUpdateManNo(userId);
+                actualRow.setUpdateManName(userName);
+                actualRow.setUpdateTime(new Date());
+                actualRow.setNote("动态衡毛皮分解");
+                actualRow.setIsPreSacale("0");
+                meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualRow);
+
                 rm.setSucceed();
                 rm.setData(null);
                 rm.setMessage("撤销成功");
             }
         } catch (Exception e) {
             e.printStackTrace();
-            rm.setMessage(e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage(e.getMessage());
         }
         return rm;
     }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.meterwork.meterworkrailwayreceived.service.impl;
 
+import cn.hutool.db.handler.HandleHelper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
@@ -174,10 +175,12 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                     HashMap<String, Object> countMap = meterWorkRailwayReceivedMapper.getCount(obj);
                     int countNum = Integer.parseInt(countMap.get("COUNTNUM").toString());
                     if(countNum < 1) {
-                        MeterWorkRailwayRecMain mainModel = meterWorkRailwayRecMainMapper.selectByPrimaryKey(receivedModel.getRailwayWorkNo());
-                        if(mainModel != null) {
-                            mainModel.setIsDispose("1");
-                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(mainModel);
+                        HashMap<String, Object> mainMap = new HashMap<>();
+                        mainMap.put("soundName", receivedModel.getRailwayWorkNo());
+                        List<MeterWorkRailwayRecMain> mainModel = meterWorkRailwayRecMainMapper.selectByParameters(mainMap);
+                        if(mainModel.size() >= 1) {
+                            mainModel.get(0).setIsDispose("1");
+                            meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(mainModel.get(0));
                         }
                     }
                 }
@@ -210,8 +213,40 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
             for (String spotNo: spotList) {
                 List<MeterWorkRailwayReceived> receiveds = new ArrayList<>();
                 for(MeterWorkRailwayReceived receivedTemp: models){
-                    if(spotNo.equals(receivedTemp.getBaseSpotNo())){
-                        receiveds.add(receivedTemp);
+                    if(receivedTemp.getRailwayWorkNo() != null && StringUtils.isNotEmpty(receivedTemp.getRailwayWorkNo())) {
+                        HashMap<String, Object> objMap = new HashMap();
+                        objMap.put("soundName", receivedTemp.getRailwayWorkNo());
+                        List<MeterWorkRailwayRecMain> recMainTemp = meterWorkRailwayRecMainMapper.selectByParameters(objMap);
+                        if(recMainTemp.size() < 1) {
+                            rm.setMessage("未找到" + receivedTemp.getRailwayWorkNo()  + "列次号信息");
+                            return rm;
+                        }
+                        recMainTemp.get(0).setIsDispose("0");
+                        recMainTemp.get(0).setCarriageNum((short)(receiveds.size() + 1));
+                        meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(recMainTemp.get(0));
+
+                        if(receivedTemp.getMemo() != null && StringUtils.isNotEmpty(receivedTemp.getMemo())) {
+                            MeterBaseOperationLog note = new MeterBaseOperationLog();
+                            note.setId(PublicMethod.IdCreate(3));
+                            note.setCreateManNo(receivedTemp.getCreateManNo());
+                            note.setCreateManName(receivedTemp.getCreateManName());
+                            note.setCreateTime(new Date());
+                            note.setOperationPage("终端-轨道衡从表数据维护");
+                            note.setOperationFunction("新增");
+                            note.setOperationCarnNo(receivedTemp.getRailwayNo());
+                            meterBaseOperationLogMapper.insertSelective(note);
+                        }
+                        receivedTemp.setRailwayWorkNo(recMainTemp.get(0).getActualNo());
+                        receivedTemp.setActualFirstNo(PublicMethod.IdCreate(3));
+                        receivedTemp.setValueFlag("1");
+                        receivedTemp.setRailwayTypeNo("001019002");
+                        receivedTemp.setRailwayTypeName("动态轨道衡");
+                        meterWorkRailwayReceivedMapper.insertSelective(receivedTemp);
+                        count ++;
+                    }else {
+                        if(spotNo.equals(receivedTemp.getBaseSpotNo())){
+                            receiveds.add(receivedTemp);
+                        }
                     }
                 }
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayrecmain/mapper/MeterWorkRailwayRecMainMapper.xml

@@ -17,7 +17,7 @@
     TRACK_WAY, IS_DISPOSE
   </sql>
   <sql id="columns_alias">
-    t.ACTUAL_NO, t.CREATE_TIME, t.CARRIAGE_NUM, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.VIDEO_NAME, 
+    t.ACTUAL_NO, t.CREATE_TIME, t.CARRIAGE_NUM, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.VIDEO_NAME,
     t.SOUND_NAME, t.TRACK_WAY, t.IS_DISPOSE
   </sql>
   <sql id="select">
@@ -323,7 +323,8 @@
   </select>
 
   <select id="listBynoPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
+    select ACTUAL_NO, to_char(CREATE_TIME, 'YYYY-MM-dd HH:mi:ss') create_time, CARRIAGE_NUM, BASE_SPOT_NO, BASE_SPOT_NAME, VIDEO_NAME,
+    SOUND_NAME, TRACK_WAY, IS_DISPOSE from METER_WORK_RAILWAY_REC_MAIN
     <where> 1 = 1
       <if test="actualNo != null and actualNo != ''">
         and ACTUAL_NO LIKE '%${actualNo}%'

src/main/java/com/steerinfo/meterwork/meterworkznlc/controller/MeterWorkZnlcController.java

@@ -9,7 +9,10 @@ import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMappe
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkznlc.service.IMeterWorkZnlcService;
+import com.steerinfo.meterwork.meterworkznlc.service.impl.MeterWorkZnlcService;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,12 +25,12 @@ import java.util.List;
 @RestController
 @RequestMapping("/${api.version}/MeterWorkZnlc")
 public class MeterWorkZnlcController extends BaseRESTfulController {
+
+    @Autowired
+    MeterWorkZnlcService meterWorkZnlcService;
+
     @Resource
     MeterBaseCarMapper meterBaseCarMapper;
-    @Resource
-    MeterWorkCarActualMapper meterWorkCarActualMapper;
-    @Resource
-    MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
 
     @ApiOperation(value="根据车号返回是否允许计量", notes="是否允许计量")
     @PostMapping(value = "/HasPermissionGivenByJL")
@@ -71,48 +74,7 @@ public class MeterWorkZnlcController extends BaseRESTfulController {
     @ApiOperation(value="根据检斤号查询称重信息", notes="根据检斤号查询称重信息")
     @PostMapping(value = "/GetWeightFromJL")
     public RESTfulResult GetWeightFromJL(@RequestBody String weightVoucherNo) {
-        RESTfulResult rm = success();
-        rm.setCode("200");
-        rm.setMessage("操作成功！！");
-
-        if(com.steerinfo.util.StringUtils.isEmpty(weightVoucherNo)) {
-            rm.setData(null);
-            return rm;
-        }
-
-        HashMap<String, Object> map = new HashMap<>();
-        HashMap<String, Object> param = new HashMap<>();
-        map.put("predictionNo", weightVoucherNo);
-
-        List<MeterWorkCarActual> actualList = meterWorkCarActualMapper.selectByParameters(map);
-        if(actualList.size() >= 1) {
-            param.put("DeviceNo", actualList.get(0).getNetSpot3No());    //计量设备号
-            param.put("WeightVoucherNo", actualList.get(0).getPredictionNo()); //检斤委托号
-            param.put("ConveyanceNo", actualList.get(0).getCarNo());   //车牌号
-            param.put("GrossWeight", actualList.get(0).getGrossWeight());    //过磅量
-            param.put("TareWeight", actualList.get(0).getTareWeight());     //空车重
-            param.put("NetWeight", actualList.get(0).getNetWeight());      //过磅净重
-            param.put("MeteringTime", actualList.get(0).getNetTime());   //计量时刻
-            param.put("MetringPerson", actualList.get(0).getNetManName());  //计量人
-            rm.setData(param);
-            return rm;
-        }else {
-            List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.selectByParameters(map);
-            if(firstList.size() >= 1) {
-                param.put("DeviceNo", firstList.get(0).getBaseSpotNo());    //计量设备号
-                param.put("WeightVoucherNo", firstList.get(0).getPredictionNo()); //检斤委托号
-                param.put("ConveyanceNo", firstList.get(0).getCarNo());   //车牌号
-                param.put("GrossWeight", firstList.get(0).getMeterWeight());    //过磅量
-                param.put("TareWeight", null);     //空车重
-                param.put("NetWeight", null);      //过磅净重
-                param.put("MeteringTime", firstList.get(0).getCreateTime());   //计量时刻
-                param.put("MetringPerson", firstList.get(0).getCreateManName());  //计量人
-
-                rm.setData(param);
-                return rm;
-            }
-        }
-        rm.setData(null);
+        RESTfulResult rm = meterWorkZnlcService.getOldActual(weightVoucherNo);
         return rm;
     }
 

src/main/java/com/steerinfo/meterwork/meterworkznlc/mapper/MeterWorkZnlcMapper.java

@@ -0,0 +1,19 @@
+package com.steerinfo.meterwork.meterworkznlc.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Bourne.Cao
+ * @date 2022-08-06 10:50
+ */
+@Mapper
+public interface MeterWorkZnlcMapper {
+
+    // 汽车衡联合查询
+    List<HashMap> doQueryActualOld(Map<String, Object> params);
+    List<HashMap> doQueryFirstOld(Map<String, Object> params);
+}

src/main/java/com/steerinfo/meterwork/meterworkznlc/mapper/MeterWorkZnlcMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.meterwork.meterworkznlc.mapper.MeterWorkZnlcMapper">
+
+    <select id="doQueryActualOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select fs_netpointId as DeviceNo,
+        FS_carno as ConveyanceNo,
+        FS_noticeid as WeightVoucherNo,
+        FS_GROSSweight as GrossWeight,
+        FS_TareWeight as TareWeight,
+        FS_NetWeight as NetWeight,
+        FS_NETWeighttime as MeteringTime,
+        '系统' as MetringPerson
+        from view_car_net
+        where fs_noticeid = #{predictionNo}
+    </select>
+
+    <select id="doQueryFirstOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select fs_pointId as DeviceNo,
+                noticeId as WeightVoucherNo,
+                carNo as ConveyanceNo,
+                weight as GrossWeight,
+                weightTime as MeteringTime
+                from view_car_first
+        where fs_noticeid = #{predictionNo}
+    </select>
+
+</mapper>

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/IMeterWorkZnlcService.java

@@ -0,0 +1,16 @@
+package com.steerinfo.meterwork.meterworkznlc.service;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author Bourne.Cao
+ * @date 2022-08-06 10:45
+ */
+public interface IMeterWorkZnlcService {
+
+    // 汽车衡联合查询Service
+    RESTfulResult getOldActual(String predictionNo);
+}

src/main/java/com/steerinfo/meterwork/meterworkznlc/service/impl/MeterWorkZnlcService.java

@@ -0,0 +1,108 @@
+package com.steerinfo.meterwork.meterworkznlc.service.impl;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.datasource.DataSourceKey;
+import com.steerinfo.framework.datasource.TargetDataSource;
+import com.steerinfo.meterwork.meterworkcaractual.mapper.MeterWorkCarActualMapper;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
+import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
+import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
+import com.steerinfo.meterwork.meterworkznlc.mapper.MeterWorkZnlcMapper;
+import com.steerinfo.meterwork.meterworkznlc.service.IMeterWorkZnlcService;
+import com.steerinfo.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author Bourne.Cao
+ * @date 2022-08-06 10:46
+ */
+@Service(value = "MeterWorkZnlcService")
+public class MeterWorkZnlcService implements IMeterWorkZnlcService {
+
+    @Resource
+    private MeterWorkZnlcMapper meterWorkZnlcMapper;
+    @Resource
+    MeterWorkCarActualMapper meterWorkCarActualMapper;
+    @Resource
+    MeterWorkCarActualFirstMapper meterWorkCarActualFirstMapper;
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public RESTfulResult getOldActual(String predictionNo) {
+        RESTfulResult rm =new RESTfulResult();
+        rm.setSucceed();
+        rm.setCode("200");
+        rm.setMessage("操作成功！！");
+
+        if(StringUtils.isEmpty(predictionNo)) {
+            rm.setData(null);
+            return rm;
+        }
+
+        HashMap<String, Object> map = new HashMap<>();
+        HashMap<String, Object> param = new HashMap<>();
+        map.put("predictionNo", predictionNo);
+
+        //根据委托号查询洁净数据（新系统）
+        List<MeterWorkCarActual> actualList = meterWorkCarActualMapper.selectByParameters(map);
+        if(actualList.size() >= 1) {
+            param.put("DeviceNo", actualList.get(0).getNetSpot3No());    //计量设备号
+            param.put("WeightVoucherNo", actualList.get(0).getPredictionNo()); //检斤委托号
+            param.put("ConveyanceNo", actualList.get(0).getCarNo());   //车牌号
+            param.put("GrossWeight", actualList.get(0).getGrossWeight());    //过磅量
+            param.put("TareWeight", actualList.get(0).getTareWeight());     //空车重
+            param.put("NetWeight", actualList.get(0).getNetWeight());      //过磅净重
+            param.put("MeteringTime", actualList.get(0).getNetTime());   //计量时刻
+            param.put("MetringPerson", actualList.get(0).getNetManName());  //计量人
+            rm.setData(param);
+            return rm;
+        }else {
+            //根据委托号查询一次数据（新系统）
+            List<MeterWorkCarActualFirst> firstList = meterWorkCarActualFirstMapper.selectByParameters(map);
+            if(firstList.size() >= 1) {
+                param.put("DeviceNo", firstList.get(0).getBaseSpotNo());    //计量设备号
+                param.put("WeightVoucherNo", firstList.get(0).getPredictionNo()); //检斤委托号
+                param.put("ConveyanceNo", firstList.get(0).getCarNo());   //车牌号
+                param.put("GrossWeight", firstList.get(0).getMeterWeight());    //过磅量
+                param.put("TareWeight", null);     //空车重
+                param.put("NetWeight", null);      //过磅净重
+                param.put("MeteringTime", firstList.get(0).getCreateTime());   //计量时刻
+                param.put("MetringPerson", firstList.get(0).getCreateManName());  //计量人
+
+                rm.setData(param);
+                return rm;
+            }else {
+                List<HashMap> oldActuals = meterWorkZnlcMapper.doQueryActualOld(map);
+                if(oldActuals.size() >= 1) {
+                    param.put("DeviceNo", oldActuals.get(0).get("DEVICENO"));    //计量设备号
+                    param.put("WeightVoucherNo", oldActuals.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
+                    param.put("ConveyanceNo", oldActuals.get(0).get("CONVEYANCENO"));   //车牌号
+                    param.put("GrossWeight", oldActuals.get(0).get("GROSSWEIGHT"));    //过磅量
+                    param.put("TareWeight", oldActuals.get(0).get("TAREWEIGHT"));     //空车重
+                    param.put("NetWeight", oldActuals.get(0).get("NETWEIGHT"));      //过磅净重
+                    param.put("MeteringTime", oldActuals.get(0).get("METERINGTIME"));   //计量时刻
+                    param.put("MetringPerson", oldActuals.get(0).get("METRINGPERSON"));  //计量人
+                    rm.setData(param);
+                }else {
+                    List<HashMap> oldFirsts = meterWorkZnlcMapper.doQueryFirstOld(map);
+                    param.put("DeviceNo", oldFirsts.get(0).get("DEVICENO"));    //计量设备号
+                    param.put("WeightVoucherNo", oldFirsts.get(0).get("WEIGHTVOUCHERNO")); //检斤委托号
+                    param.put("ConveyanceNo", oldFirsts.get(0).get("CONVEYANCENO"));   //车牌号
+                    param.put("GrossWeight", oldFirsts.get(0).get("GROSSWEIGHT"));    //过磅量
+                    param.put("TareWeight", null);     //空车重
+                    param.put("NetWeight", null);      //过磅净重
+                    param.put("MeteringTime", oldFirsts.get(0).get("METERINGTIME"));   //计量时刻
+                    param.put("MetringPerson", null);  //计量人
+
+                    rm.setData(param);
+                    return rm;
+                }
+            }
+        }
+        return rm;
+    }
+}

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

@@ -2910,7 +2910,7 @@
     <select id="doQueryByCar" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <where>
-            (( VALUE_FLAG = '1' and TRUST_AVAILABILITY_TIME >= sysDate ) or value_flag = '4')
+            (( VALUE_FLAG = '1' and TRUST_AVAILABILITY_TIME >= sysDate ))
             <if test="railwayNo != null">
                 and RAILWAY_NO = #{railwayNo}
             </if>