后端修改

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

@@ -2,6 +2,8 @@ package com.steerinfo.meterwork.meterworkcaractual.service.impl;
 
 import com.steerinfo.baseinfo.meterbasematterinfomatch.mapper.MeterBaseMatterInfoMatchMapper;
 import com.steerinfo.baseinfo.meterbasematterinfomatch.model.MeterBaseMatterInfoMatch;
+import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbasetermtaredata.mapper.MeterBaseTermTareDataMapper;
 import com.steerinfo.baseinfo.meterbasetermtaredata.model.MeterBaseTermTareData;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -34,6 +36,7 @@ import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
+import org.apache.catalina.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,6 +86,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     @Resource
     private MeterWorkPreLinkMapper meterWorkPreLinkMapper;
 
+    @Resource
+    private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
+
     @Autowired
     IMeterWorkPreLinkService meterWorkPreLinkService;
 
@@ -599,7 +605,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     }
                 }
             }
-
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             for (MeterWorkCarActual model : models) {
                 //毛重
                 MeterWorkCarActualFirst mwcaf1 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
@@ -610,8 +625,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 MeterWorkCarActualFirst mwcafg = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
                 mwcafg.setValueFlag(DbConstants.VALID);
                 mwcafg.setNote(model.getNote());
-                mwcafg.setUpdateManName("system");
-                mwcafg.setUpdateManName("二次计量解除更新");
+                mwcafg.setUpdateManNo(userId);
+                mwcafg.setUpdateManName(userName);
+                mwcafg.setNote("二次计量解除作废");
                 mwcafg.setUpdateTime(new Date());
                 mwcafg.setIsPreScale("0");
 //                mwcafg.setDataSource("1");
@@ -626,15 +642,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     MeterWorkCarActualFirst mwcaft = meterWorkCarActualFirstMapper.selectAndRemove(mwcaf2.getActualFirstNo());
                     if ("2".equals(mwcaft.getWeightType())) {
                         mwcaft.setValueFlag(DbConstants.INVALID); //期限皮重置为作废
-                        mwcaft.setUpdateManName("system");
-                        mwcaft.setUpdateManName("二次计量解除作废");
+                        mwcaft.setUpdateManNo(userId);
+                        mwcaft.setUpdateManName(userName);
+                        mwcaft.setNote(model.getNote());
                         mwcaft.setIsPreScale("0");
 //                        mwcaft.setDataSource("1");
                         mwcaft.setUpdateTime(new Date());
                     } else {
                         mwcaft.setValueFlag(DbConstants.VALID);
-                        mwcaft.setUpdateManName("system");
-                        mwcaft.setUpdateManName("二次计量解除更新");
+                        mwcaft.setUpdateManNo(userId);
+                        mwcaft.setUpdateManName(userName);
                         mwcaft.setNote(model.getNote());
                         mwcaft.setIsPreScale("0");
 //                        mwcaft.setDataSource("1");
@@ -665,7 +682,24 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 model.setUploadFlag("1");
                 model.setValueFlag("0");
                 model.setIsPreScale("0");
+                model.setUpdateManNo(userId);
+                model.setUpdateManName(userName);
+                model.setUpdateTime(new Date());
                 meterWorkCarActualMapper.updateByPrimaryKey(model);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("汽车衡净重数据维护");
+                logModel.setOperationFunction("汽车衡结净毛皮分解");
+                logModel.setOperationId(model.getActualNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getCarNo());
+                logModel.setOperationBeforeFix(model.toString());
+                logModel.setOperationAfterFix("");
+                meterBaseOperationLogMapper.insertSelective(logModel);
                 num++;
             }
 
@@ -800,8 +834,29 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         removeFirstEl(firstTare);
                         meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
                     }
-                    removeEl(model);
-                    meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+                    MeterWorkCarActual modelTemp = meterWorkCarActualMapper.cleanPredcition(model.getActualNo());
+                    removeEl(modelTemp);
+                    meterWorkCarActualMapper.updateByPrimaryKeySelective(modelTemp);
+
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(modelTemp.getUpdateManNo());
+                    logModel.setCreateManName(modelTemp.getUpdateManName());
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("汽车衡净重数据维护");
+                    if(type.equals("5")){
+                        logModel.setOperationFunction("汽车衡双委托洁净作废");
+                    }else if(type.equals("6")) {
+                        logModel.setOperationFunction("汽车衡混卸委托洁净作废");
+                    }else if(type.equals("7")) {
+                        logModel.setOperationFunction("汽车衡混装委托洁净作废");
+                    }
+                    logModel.setOperationId(model.getActualNo());
+                    logModel.setOperationPredictionNo(model.getPredictionNo());
+                    logModel.setOperationCarnNo(model.getCarNo());
+                    logModel.setOperationBeforeFix(model.toString());
+                    logModel.setOperationAfterFix(modelTemp.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                 }
                 rm.setSucceed();
                 rm.setMessage("操作成功！！");
@@ -881,10 +936,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         rm.setFailed();
         rm.setData(null);
         rm.setCode("500");
-
         try{
-
-
             MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(params.get("actualNo").toString());
             if(actualModel == null){
                 rm.setMessage("未找到结净计量数据，请确认！！！");
@@ -892,7 +944,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             }
             List<MeterWorkCarActual> models = new ArrayList<MeterWorkCarActual>();
             models.add(actualModel);
-
             for(MeterWorkCarActual modelTemp: models) {
                 if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
                     PreTrackScale scaleTemp = preTrackScaleMapper.selectByPrimaryKey(modelTemp.getPredictionNo());
@@ -906,6 +957,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     }
                 }
             }
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             for (MeterWorkCarActual model: models) {
                 //循环每一个结净记录
                 //委托不能为空
@@ -916,8 +977,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         scale.setValueFlag("1");
                         scale.setUploadFlag("1");
                         scale.setUpdateTime(new Date());
-                        scale.setUpdateManNo("system");
-                        scale.setUpdateManName("结净废除操作");
+                        scale.setUpdateManNo(userId);
+                        scale.setUpdateManName(userName);
                         preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                     }
                 }
@@ -933,8 +994,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 }
                 if(firstGross != null){
                     firstGross.setValueFlag(DbConstants.VALID);
-                    firstGross.setUpdateManName("system");
-                    firstGross.setUpdateManName("结净废除更新");
+                    firstGross.setUpdateManNo(userId);
+                    firstGross.setUpdateManName(userName);
                     firstGross.setNote(model.getNote());
                     firstGross.setUpdateTime(new Date());
                     firstGross.setIsPreScale("0");
@@ -943,8 +1004,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 }
                 if(firstTare != null){
                     firstTare.setValueFlag(DbConstants.VALID);
-                    firstTare.setUpdateManName("system");
-                    firstTare.setUpdateManName("结净废除更新");
+                    firstTare.setUpdateManNo(userId);
+                    firstTare.setUpdateManName(userName);
                     firstTare.setNote(model.getNote());
                     firstTare.setUpdateTime(new Date());
                     firstTare.setIsPreScale("0");
@@ -952,11 +1013,30 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
                 }
                 // 作废结净
-                model.setUploadFlag("1");
-                model.setValueFlag("0");
-                meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+                MeterWorkCarActual modelTemp = meterWorkCarActualMapper.cleanPredcition(model.getActualNo());
+                modelTemp.setUploadFlag("1");
+                modelTemp.setValueFlag("0");
+                modelTemp.setIsPreScale("0");
+                modelTemp.setUpdateManNo(userId);
+                modelTemp.setUpdateManName(userName);
+                modelTemp.setUpdateTime(new Date());
+                meterWorkCarActualMapper.updateByPrimaryKey(modelTemp);
                 //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("汽车衡净重数据维护");
+                logModel.setOperationFunction("汽车衡洁净作废");
+                logModel.setOperationId(model.getActualNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationBeforeFix(model.toString());
+                logModel.setOperationAfterFix(modelTemp.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
             }
             rm.setSucceed();
             rm.setMessage("操作成功！！");

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/controller/MeterWorkOldAndNew.java

@@ -459,4 +459,33 @@ public class MeterWorkOldAndNew extends BaseRESTfulController {
 
         return pageInfo;
     }
+
+
+    /*
+     * 轨道衡新老计量系统联合查询接口
+     */
+    @ApiOperation(value="查询铁水衡吊钩秤结净老系统和新系统", notes="返回List<HashMap>对象")
+    @PostMapping(value = "/railwayHook/doQueryFirstOldAndNew2")
+    public RESTfulResult doQueryRailwayHookFirstOldAndNew2(@RequestBody HashMap params) {
+        RESTfulResult rm = success();
+        try {
+            // 新系统结净数据
+            List<HashMap> newList = meterWorkOldAndNewService.getRailwayHookFirstNew(params);
+            // 老系统结净数据
+            List<HashMap> oldList = meterWorkOldAndNewService.getRailwayHookFirstOld(params);
+            // 新老系统数据联合查询
+            List<HashMap> totalList = Stream.of(newList, oldList)
+                    .flatMap(x -> x.stream())
+                    .collect(Collectors.toList());
+            //PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), 200);
+            PageList pageInfo = this.helpPage(params, totalList);
+            rm.setCode("200");
+            rm.setMessage("操作成功！！");
+            rm.setData(pageInfo);
+        }catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常:>>>" + e.getMessage());
+        }
+        return rm;
+    }
 }

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

@@ -51,4 +51,10 @@ public interface MeterWorkOldAndNewMapper {
     List<HashMap> countRailwayDynamicNew(Map<String, Object> params);
 
     List<HashMap> countRailwayDynamicOld(Map<String, Object> params);
+
+
+    //静态贴水衡、吊钩秤
+    List<HashMap> doQueryRailwayHookFirstNew(Map<String, Object> params);
+
+    List<HashMap> doQueryRailwayHookFirstOld(Map<String, Object> params);
 }

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

@@ -1194,4 +1194,137 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
             and matter_name LIKE '%${matterName}%'
         </if>
     </select>
+
+
+
+    <!--静态铁水衡、吊钩秤 -->
+    <select id="doQueryRailwayHookFirstNew" parameterType="java.util.HashMap" resultType="HashMap">
+        select actual_first_no,
+        prediction_no,
+        RAILWAY_NO,
+        meter_weight,
+        create_time,
+        base_spot_no,
+        base_spot_name,
+        forwarding_unit_no,
+        forwarding_unit_name,
+        receiving_uint_no,
+        receiving_uint_name,
+        matter_no,
+        matter_name,
+        sender_remark,
+        '新系统' remark
+        from meter_work_railway_act_first
+        where VALUE_FLAG in ('1') and RAILWAY_TYPE_NO in ('001019003', '001019005')
+        <if test="remark != null and remark != ''">
+            and '新系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and prediction_no LIKE '%${predictionNo}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and sender_remark LIKE '%${senderRemark}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and RAILWAY_NO like '%${railwayNo}%'
+        </if>
+        <if test="baseSpotNo != null and baseSpotNo != ''">
+            and base_spot_no like '%${baseSpotNo}%'
+        </if>
+        <if test="baseSpotName != null and baseSpotName != ''">
+            and base_spot_name like '%${baseSpotName}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and matter_no LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and matter_name LIKE '%${matterName}%'
+        </if>
+        <if test="minWgt != null and minWgt != ''">
+            and meter_weight/1000 >= '${minWgt}'
+        </if>
+        <if test="maxWgt != null and maxWgt != ''">
+            and meter_weight/1000 &lt;= '${maxWgt}'
+        </if>
+    </select>
+
+    <select id="doQueryRailwayHookFirstOld" parameterType="java.util.HashMap" resultType="HashMap">
+        select FS_WEIGHTNO actual_first_no,
+        FS_noticeNO prediction_no,
+        FS_TRAINNO RAILWAY_NO,
+        FN_weight*1000 meter_weight,
+        FD_weightTime create_time,
+        fs_pointId base_spot_no,
+        FS_pointName base_spot_name,
+        FS_sender forwarding_unit_no,
+        FS_senderName forwarding_unit_name,
+        FS_receiver receiving_uint_no,
+        FS_receiverName receiving_uint_name,
+        FS_material matter_no,
+        FS_materialName matter_name,
+        FS_SENDERREMARK sender_remark,
+        '老系统' remark
+        from jgweight.VIEW_TRAIN_FIRST
+        where FS_DELETEDTAG='N' and FS_BALANCETYPE='静态'
+        <if test="remark != null and remark != ''">
+            and '老系统' LIKE '%${remark}%'
+        </if>
+        <if test="predictionNo != null and predictionNo != ''">
+            and FS_noticeNO LIKE '%${predictionNo}%'
+        </if>
+        <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+            and FD_weightTime >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and FD_weightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="senderRemark != null and senderRemark != ''">
+            and FS_SENDERREMARK LIKE '%${senderRemark}%'
+        </if>
+        <if test="railwayNo != null and railwayNo != ''">
+            and FS_TRAINNO like '%${railwayNo}%'
+        </if>
+        <if test="baseSpotNo != null and baseSpotNo != ''">
+            and fs_pointId like '%${baseSpotNo}%'
+        </if>
+        <if test="baseSpotName != null and baseSpotName != ''">
+            and FS_pointName like '%${baseSpotName}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+            and FS_sender LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+            and FS_senderName LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+            and FS_receiver LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+            and FS_receiverName LIKE '%${receivingUintName}%'
+        </if>
+        <if test="matterNo != null and matterNo != ''">
+            and FS_material LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+            and FS_materialName LIKE '%${matterName}%'
+        </if>
+        <if test="minWgt != null and minWgt != ''">
+            and FN_weight >= '${minWgt}'
+        </if>
+        <if test="maxWgt != null and maxWgt != ''">
+            and FN_weight &lt;= '${maxWgt}'
+        </if>
+    </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/service/IMeterWorkOldAndNewService.java

@@ -48,4 +48,9 @@ public interface IMeterWorkOldAndNewService {
     List<HashMap> countRailwayDynamicNew(HashMap params);
 
     List<HashMap> countRailwayDynamicOld(HashMap params);
+
+
+    List<HashMap> getRailwayHookFirstNew(HashMap params);
+
+    List<HashMap> getRailwayHookFirstOld(HashMap params);
 }

src/main/java/com/steerinfo/meterwork/meterworkoldandnew/service/impl/MeterWorkOldAndNewService.java

@@ -118,4 +118,15 @@ public class MeterWorkOldAndNewService implements IMeterWorkOldAndNewService {
     public List<HashMap> countRailwayDynamicOld(HashMap params) {
         return meterWorkOldAndNewMapper.countRailwayDynamicOld(params);
     }
+
+    @Override
+    public List<HashMap> getRailwayHookFirstNew(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryRailwayHookFirstNew(params);
+    }
+
+    @Override
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
+    public List<HashMap> getRailwayHookFirstOld(HashMap params) {
+        return meterWorkOldAndNewMapper.doQueryRailwayHookFirstOld(params);
+    }
 }

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

@@ -1583,4 +1583,20 @@ throw new MarkerMetException(500, "操作异常！！");
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "铁水吊钩秤web端--降序获取列表", notes = "分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    @GetMapping(value = "/hookFirstPageList/")
+    public RESTfulResult hookFirstPageList(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.hookFirstPageList(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -162,5 +162,6 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     //铁水吊钩秤web端
     List<String> distinctHookRailwayNo(HashMap<String, Object> param);
     List<MeterWorkRailwayActFirst> hookFirstByDesc(HashMap<String, Object> parameters);
+    PageList<MeterWorkRailwayActFirst> hookFirstPageList(HashMap<String, Object> param, Integer pageNum, Integer pageSize);
 }
 

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

@@ -9184,5 +9184,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rows;
     }
 
+    @Override
+    public PageList<MeterWorkRailwayActFirst> hookFirstPageList(HashMap<String, Object> param, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.hookFirstByDesc(param);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
 
 }

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

@@ -1136,6 +1136,23 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "铁水吊钩秤web端--降序获取列表", notes = "web端分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayactual:view")
+    @GetMapping(value = "/hookActualPageList/")
+    public RESTfulResult hookActualPageList(@RequestParam HashMap parmas, Integer pageNum, Integer pageSize) {
+        try {
+            PageList<MeterWorkRailwayActual> list = meterWorkRailwayActualService.hookActualPageList(parmas, pageNum, pageSize);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "铁水吊钩秤web端--根据实绩id获取一次计量信息和委托信息", notes = "根据实绩id获取一次计量信息和委托信息")
     @PostMapping(value = "/hookFirstAndEntrustById")
     public RESTfulResult hookFirstAndEntrustById(@RequestBody HashMap params) {

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

@@ -120,6 +120,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     //铁水吊钩秤web端
     List<String> distinctHookRailwayNo(HashMap<String, Object> param);
     List<MeterWorkRailwayActual> hookActualByDesc(HashMap<String, Object> parameters);
+    PageList<MeterWorkRailwayActual> hookActualPageList(HashMap parmas, Integer pageNum, Integer pageSize);
     //根据实绩id获取一次计量信息和委托信息
     RESTfulResult hookFirstAndEntrustById(String actualNo);
     RESTfulResult cleanByHookFirstNo(String actFirstNo01, String actFirstNo02, String PredictionNo);

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

@@ -1155,8 +1155,25 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                 }
 //                meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("轨道衡净重数据维护");
+                logModel.setOperationFunction("轨道衡撤销委托");
+                logModel.setOperationId(model.getActualNo());
+                logModel.setOperationPredictionNo(model.getPredictionNo());
+                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationBeforeFix(model.toString());
+
+                model.setIsPreSacale("0");
+                model.setUploadFlag("1");
                 model.setValueFlag("0");
                 meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+
+                logModel.setOperationAfterFix(model.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
                 num++;
             }
             return num;
@@ -2725,7 +2742,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 MeterWorkRailwayActual cleanModel = meterWorkRailwayActualMapper.cleanPredcition(model.getActualNo());
                 cleanModel.setUploadFlag("1");
                 cleanModel.setValueFlag("0");
-                meterWorkRailwayActualMapper.updateByPrimaryKeySelective(cleanModel);
+                cleanModel.setIsPreSacale("0");
+                meterWorkRailwayActualMapper.updateByPrimaryKey(cleanModel);
                 //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
             }
@@ -3288,6 +3306,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 model.setUpdateManNo(userId);
                 model.setUpdateManName(userName);
                 model.setUpdateTime(new Date());
+                model.setNote("净重信息修改");
                 meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
                 count++;
             }
@@ -3326,15 +3345,29 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                 Assert.isTrue(scale != null, "未找到" + model.getPredictionNo() + "对应的委托信息");
 
-                modelTemp = meterWorkRailwayActualMapper.mathPredcition(modelTemp.getActualNo(),model.getPredictionNo());
-                modelTemp.setUpdateManNo(userId);
-                modelTemp.setUpdateManName(userName);
-                modelTemp.setUpdateTime(new Date());
-                modelTemp.setIsPreSacale("1");
-                modelTemp.setPredictionType("1");
-                modelTemp.setUploadFlag("1");
-                modelTemp.setValueFlag("1");
-                meterWorkRailwayActualMapper.updateByPrimaryKeySelective(modelTemp);
+                MeterWorkRailwayActual actualRow = meterWorkRailwayActualMapper.mathPredcition(modelTemp.getActualNo(),model.getPredictionNo());
+                actualRow.setUpdateManNo(userId);
+                actualRow.setUpdateManName(userName);
+                actualRow.setUpdateTime(new Date());
+                actualRow.setIsPreSacale("1");
+                actualRow.setPredictionType("1");
+                actualRow.setUploadFlag("1");
+                actualRow.setValueFlag("2");
+                meterWorkRailwayActualMapper.updateByPrimaryKeySelective(actualRow);
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("C#端-动轨净重数据维护");
+                logModel.setOperationFunction("动态衡匹配委托");
+                logModel.setOperationId(modelTemp.getActualNo());
+                logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
+                logModel.setOperationCarnNo(modelTemp.getRailwayNo());
+                logModel.setOperationBeforeFix(modelTemp.toString());
+                logModel.setOperationAfterFix(actualRow.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
 
                 MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst1No());
                 MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst2No());
@@ -3375,6 +3408,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 scale.setUpdateManNo(userId);
                 scale.setUpdateManName(userName);
                 scale.setUpdateTime(new Date());
+                scale.setMeasureStation(model.getNetSpot3No());
+                scale.setMeasureStationName(model.getNetSpot3Name());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
 
                 rm.setSucceed();
@@ -3467,6 +3502,20 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     scale.setUpdateManName(userName);
                     scale.setUpdateTime(new Date());
                     preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                    MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                    logModel.setId(PublicMethod.IdCreate(2));
+                    logModel.setCreateManNo(userId);
+                    logModel.setCreateManName(userName);
+                    logModel.setCreateTime(new Date());
+                    logModel.setOperationPage("C#端-动轨净重数据维护");
+                    logModel.setOperationFunction("动态衡撤销委托");
+                    logModel.setOperationId(modelTemp.getActualNo());
+                    logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
+                    logModel.setOperationCarnNo(modelTemp.getRailwayNo());
+                    logModel.setOperationBeforeFix(modelTemp.toString());
+                    logModel.setOperationAfterFix(actualRow.toString());
+                    meterBaseOperationLogMapper.insertSelective(logModel);
                     count ++;
                 }
             }
@@ -3548,6 +3597,20 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNote("动态衡毛皮分解");
                 meterWorkRailwayActualMapper.updateByPrimaryKey(actualRow);
 //                meterWorkRailwayActualMapper.deleteByPrimaryKey(actualRow.getActualNo());
+
+                MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+                logModel.setId(PublicMethod.IdCreate(2));
+                logModel.setCreateManNo(userId);
+                logModel.setCreateManName(userName);
+                logModel.setCreateTime(new Date());
+                logModel.setOperationPage("C#端-动轨净重数据维护");
+                logModel.setOperationFunction("动态衡毛皮分解");
+                logModel.setOperationId(modelTemp.getActualNo());
+                logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
+                logModel.setOperationCarnNo(modelTemp.getRailwayNo());
+                logModel.setOperationBeforeFix(modelTemp.toString());
+                logModel.setOperationAfterFix(actualRow.toString());
+                meterBaseOperationLogMapper.insertSelective(logModel);
             }
             rm.setSucceed(true);
             rm.setMessage("毛皮分解成功");
@@ -3669,6 +3732,14 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return rows;
     }
 
+    @Override
+    public PageList<MeterWorkRailwayActual> hookActualPageList(HashMap parmas, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.hookActualByDesc(parmas);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
     @Override
     public RESTfulResult hookFirstAndEntrustById(String actualNo) {
         RESTfulResult rm = new RESTfulResult();