后端修改

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

@@ -462,7 +462,7 @@ FS_RECEIVERNAME RECEIVING_UINT_NAME,
 FS_RECEIVERREMARK RECEIVER_REMARK,
 FS_MATERIALNAME MATTER_NAME,
 '老系统' as remark
-from JGWEIGHT.VIEW_TRAIN_DYNAMIC_NET
+from JGWEIGHT.VIEW_TRAIN_NET
 where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or FS_BALANCETYPE='铁水轨道衡')
         <if test="remark != null and remark != ''">
             and '老系统' LIKE '%${remark}%'
@@ -528,7 +528,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         sender_remark,
         '新系统' remark
         from meter_work_railway_act_first
-        where VALUE_FLAG in ('2') and RAILWAY_TYPE_NO = '001019001'
+        where VALUE_FLAG in ('1','2') and RAILWAY_TYPE_NO = '001019001'
         <if test="remark != null and remark != ''">
             and '新系统' LIKE '%${remark}%'
         </if>
@@ -586,7 +586,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         FS_materialName matter_name,
         FS_SENDERREMARK sender_remark,
         '老系统' remark
-        from jgweight.VIEW_TRAIN_DYNAMIC_FIRST
+        from jgweight.VIEW_TRAIN_FIRST
         where FS_DELETEDTAG='N' and FS_BALANCETYPE='静态'
         <if test="remark != null and remark != ''">
             and '老系统' LIKE '%${remark}%'
@@ -701,7 +701,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         fs_receiver receiving_uint_no,
         fs_receiverName receiving_uint_name,
         '老系统' remark
-        from JGWEIGHT.VIEW_TRAIN_DYNAMIC_NET
+        from JGWEIGHT.VIEW_TRAIN_NET
         where 1 = 1
         and FS_TRAINNO is not null
         and FS_DELETEDTAG='N'
@@ -886,7 +886,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         </if>
     </select>
 
-    <select id="doQueryRailwayFirstDynamicNew" parameterType="java.util.HashMap" resultType="HashMap">
+    <select id="doQueryRailwayDynamicFirstNew" parameterType="java.util.HashMap" resultType="HashMap">
         select actual_first_no,
         prediction_no,
         RAILWAY_NO,
@@ -945,7 +945,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         </if>
     </select>
 
-    <select id="doQueryRailwayFirstDynamicOld" parameterType="java.util.HashMap" resultType="HashMap">
+    <select id="doQueryRailwayDynamicFirstOld" parameterType="java.util.HashMap" resultType="HashMap">
         select FS_WEIGHTNO actual_first_no,
         FS_noticeNO prediction_no,
         FS_TRAINNO RAILWAY_NO,

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

@@ -94,28 +94,28 @@ public class MeterWorkOldAndNewService implements IMeterWorkOldAndNewService {
     @Override
     @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
     public List<HashMap> getRailwayDynamicOld(HashMap params) {
-        return meterWorkOldAndNewMapper.doQueryRailwayOld(params);
+        return meterWorkOldAndNewMapper.doQueryRailwayDynamicOld(params);
     }
 
     @Override
     public List<HashMap> getRailwayDynamicFirstNew(HashMap params) {
-        return meterWorkOldAndNewMapper.doQueryRailwayFirstNew(params);
+        return meterWorkOldAndNewMapper.doQueryRailwayDynamicFirstNew(params);
     }
 
     @Override
     @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
     public List<HashMap> getRailwayDynamicFirstOld(HashMap params) {
-        return meterWorkOldAndNewMapper.doQueryRailwayFirstOld(params);
+        return meterWorkOldAndNewMapper.doQueryRailwayDynamicFirstOld(params);
     }
 
     @Override
     public List<HashMap> countRailwayDynamicNew(HashMap params) {
-        return meterWorkOldAndNewMapper.countRailwayNew(params);
+        return meterWorkOldAndNewMapper.countRailwayDynamicNew(params);
     }
 
     @Override
     @TargetDataSource(dataSourceKey = DataSourceKey.DB_SLAVE1)
     public List<HashMap> countRailwayDynamicOld(HashMap params) {
-        return meterWorkOldAndNewMapper.countRailwayOld(params);
+        return meterWorkOldAndNewMapper.countRailwayDynamicOld(params);
     }
 }

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

@@ -1037,7 +1037,7 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
     @ApiOperation(value = "C#——动态轨道衡净重撤销委托")
     @Transactional
     @PostMapping(value = "/updatePreCancel")
-    public RESTfulResult updatePreCancel(@RequestBody MeterWorkRailwayActual models) {
+    public RESTfulResult updatePreCancel(@RequestBody List<MeterWorkRailwayActual> models) {
         try {
             RESTfulResult rm = meterWorkRailwayActualService.updatePreCancel(models);
             return rm;

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

@@ -68,7 +68,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
 
     RESTfulResult updatePre(MeterWorkRailwayActual model);
 
-    RESTfulResult updatePreCancel(MeterWorkRailwayActual model);
+    RESTfulResult updatePreCancel(List<MeterWorkRailwayActual> models);
     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

@@ -252,7 +252,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 //循环每一个结净记录
                 MeterWorkRailwayActual model = meterWorkRailwayActualMapper.selectByPrimaryKey(modelTemp.getActualNo());
                 //委托不能为空
-                if(model.getPredictionNo() != null){
+                if(model.getPredictionNo() != null && StringUtils.isNotEmpty(model.getPredictionNo())){
                     // 改委托
                     if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                         PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
@@ -264,9 +264,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                     }
                 }
+
                 // 清空一次毛重、皮重委托信息
                 MeterWorkRailwayActFirst firstGross = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
-                MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
                 if(firstGross != null){
                     firstGross = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst1No());
                     firstGross.setValueFlag(DbConstants.VALID);
@@ -282,6 +282,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     preRailwayScaleMapper.updateMeterWorkRailwayReceiveds(firstGross.getActualFirstNo());
                 }
 
+                MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
                 if(firstTare != null){
                     firstTare =  meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
                     firstTare.setValueFlag(DbConstants.VALID);
@@ -291,7 +292,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     firstTare.setUpdateTime(new Date());
                     firstTare.setIsPreSacale("0");
                     firstTare.setValueFlag("0");
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTare);
+                    meterWorkRailwayActFirstMapper.deleteByPrimaryKey(firstTare.getActualFirstNo());
+                    //恢复从表数据
+                    preRailwayScaleMapper.updateMeterWorkRailwayReceiveds(firstTare.getActualFirstNo());
                 }
                 // 作废结净数据并解除委托
                 MeterWorkRailwayActual actualRow = meterWorkRailwayActualMapper.cleanPredcition(model.getActualNo());
@@ -3286,7 +3289,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
     //动态衡净重数据撤销委托
     @Override
-    public RESTfulResult updatePreCancel(MeterWorkRailwayActual model) {
+    public RESTfulResult updatePreCancel(List<MeterWorkRailwayActual> models) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {
@@ -3301,59 +3304,59 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 userId = "admin";
                 userName = "admin";
             }
-            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() +"对应的委托信息已结算");
+            int count = 0;
+            for(MeterWorkRailwayActual model:models){
+                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.setUpdateManNo(userId);
+                        grossModel.setUpdateManName(userName);
+                        grossModel.setUpdateTime(new Date());
+                        grossModel.setNote("动态衡撤销委托");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
+                    }
+                    if(tareModel != null) {
+                        tareModel = meterWorkRailwayActFirstMapper.selectAndRemove(tareModel.getActualFirstNo());
+                        tareModel.setIsPreSacale("0");
+                        tareModel.setUpdateManNo(userId);
+                        tareModel.setUpdateManName(userName);
+                        tareModel.setUpdateTime(new Date());
+                        tareModel.setNote("动态衡撤销委托");
+                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
+                    }
 
-                MeterWorkRailwayActFirst grossModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst1No());
-                MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(modelTemp.getActualFirst2No());
-                if(grossModel != null) {        //作废毛重数据、恢复从表信息
-                    grossModel = meterWorkRailwayActFirstMapper.selectAndRemove(grossModel.getActualFirstNo());
-                    grossModel.setIsPreSacale("0");
-                    grossModel.setUpdateManNo(userId);
-                    grossModel.setUpdateManName(userName);
-                    grossModel.setUpdateTime(new Date());
-                    grossModel.setNote("动态衡撤销委托");
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossModel);
-                }
-                if(tareModel != null) {
-                    tareModel = meterWorkRailwayActFirstMapper.selectAndRemove(tareModel.getActualFirstNo());
-                    tareModel.setIsPreSacale("0");
-                    tareModel.setUpdateManNo(userId);
-                    tareModel.setUpdateManName(userName);
-                    tareModel.setUpdateTime(new Date());
-                    tareModel.setNote("动态衡撤销委托");
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(tareModel);
+                    MeterWorkRailwayActual actualRow = meterWorkRailwayActualMapper.cleanPredcition(modelTemp.getActualNo());
+                    actualRow.setUploadFlag("1");
+                    actualRow.setValueFlag("1");
+                    actualRow.setIsPreSacale("0");
+                    actualRow.setUpdateManNo(userId);
+                    actualRow.setUpdateManName(userName);
+                    actualRow.setUpdateTime(new Date());
+                    actualRow.setNote("动态衡撤销委托");
+                    meterWorkRailwayActualMapper.updateByPrimaryKey(actualRow);
+
+                    scale.setValueFlag("1");
+                    scale.setUploadFlag("1");
+                    scale.setUpdateManNo(userId);
+                    scale.setUpdateManName(userName);
+                    scale.setUpdateTime(new Date());
+                    preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                    count ++;
                 }
-
-                MeterWorkRailwayActual actualRow = meterWorkRailwayActualMapper.cleanPredcition(modelTemp.getActualNo());
-                actualRow.setUploadFlag("1");
-                actualRow.setValueFlag("1");
-                actualRow.setIsPreSacale("0");
-                actualRow.setUpdateManNo(userId);
-                actualRow.setUpdateManName(userName);
-                actualRow.setUpdateTime(new Date());
-                actualRow.setNote("动态衡撤销委托");
-                meterWorkRailwayActualMapper.updateByPrimaryKey(actualRow);
-
-                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("撤销成功");
-            }else {
-                rm.setMessage("委托号为空,无法撤销委托");
-                return rm;
             }
+            rm.setSucceed();
+            rm.setData(null);
+            rm.setMessage("共"+count+"条数据撤销成功");
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/controller/MeterWorkRailwayReceivedController.java

@@ -194,6 +194,24 @@ public class MeterWorkRailwayReceivedController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkRailwayReceived信息来更新详细信息")
+    @PostMapping(value = "/updateListStart", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updateListStart(@RequestBody List<MeterWorkRailwayReceived> models){
+        RESTfulResult rm = new RESTfulResult();
+        try {
+            rm = meterWorkRailwayReceivedService.updateListStart(models);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkRailwayReceived信息来更新详细信息")
     @PostMapping(value = "/addList", produces  = "application/json;charset=UTF-8")
     public RESTfulResult addList(@RequestBody List<MeterWorkRailwayReceived> models){
@@ -211,4 +229,58 @@ public class MeterWorkRailwayReceivedController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkRailwayReceived信息来更新详细信息")
+    @PostMapping(value = "/RemovePre", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult RemovePre(@RequestBody List<MeterWorkRailwayReceived> models){
+        RESTfulResult rm = new RESTfulResult();
+        try {
+            rm = meterWorkRailwayReceivedService.RemovePre(models);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkRailwayReceived信息来更新详细信息")
+    @PostMapping(value = "/matchPre", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult matchPre(@RequestBody MeterWorkRailwayReceived model){
+        RESTfulResult rm = new RESTfulResult();
+        try {
+            rm = meterWorkRailwayReceivedService.matchPre(model);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkRailwayReceived信息来更新详细信息")
+    @PostMapping(value = "/removeList", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult removeList(@RequestBody List<MeterWorkRailwayReceived> models){
+        RESTfulResult rm = new RESTfulResult();
+        try {
+            rm = meterWorkRailwayReceivedService.removeList(models);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
 }

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

@@ -19,4 +19,5 @@ public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRai
     List<MeterWorkRailwayReceived> noPage(HashMap<String, Object> map);
     MeterWorkRailwayReceived getPrimaryKey(HashMap params);
     HashMap getCount(HashMap params);
+    MeterWorkRailwayReceived selectAndRemove(@Param(value = "actualFirstNo")String actualFirstNo);
 }

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

@@ -1992,6 +1992,17 @@
     </if>
   </select>
 
+  <select id="selectAndRemove" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select  ACTUAL_FIRST_NO,  RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, railway_model,
+            RAILWAY_SPEED, RAILWAY_MODEL_NO,RAILWAY_MODEL_NAME, BIND_CARD_NO,  METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
+            WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
+            CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,
+            UPDATE_MAN_NO, UPDATE_MAN_NAME, UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME,
+            CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME,METER_TYPE_NO,METER_TYPE_NAME
+    from meter_work_railway_received
+    where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}
+  </select>
+
   <select id="getCount" parameterType="java.util.HashMap" resultType="HashMap">
     select count(1) as countNum from meter_work_railway_received A where railway_work_no = #{railwayWorkNo} and  value_flag = '1'
   </select>

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/IMeterWorkRailwayReceivedService.java

@@ -26,7 +26,11 @@ import java.util.List;
 public interface IMeterWorkRailwayReceivedService extends IBaseService<MeterWorkRailwayReceived, String>{
     RESTfulResult checkandadd(MeterWorkRailwayReceived model)  throws Exception;
     List<MeterWorkRailwayReceived> noPage(HashMap<String, Object> parmas);
+    RESTfulResult removeList(List<MeterWorkRailwayReceived> models);
     RESTfulResult updateList(List<MeterWorkRailwayReceived> models);
+    RESTfulResult updateListStart(List<MeterWorkRailwayReceived> models);
+    RESTfulResult RemovePre(List<MeterWorkRailwayReceived> models);
+    RESTfulResult matchPre(MeterWorkRailwayReceived model);
     RESTfulResult addList(List<MeterWorkRailwayReceived> models);
 
 }

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

@@ -20,6 +20,8 @@ import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayR
 import com.steerinfo.meterwork.meterworkrailwayreceived.service.IMeterWorkRailwayReceivedService;
 import com.steerinfo.meterwork.meterworkrailwayrecmain.mapper.MeterWorkRailwayRecMainMapper;
 import com.steerinfo.meterwork.meterworkrailwayrecmain.model.MeterWorkRailwayRecMain;
+import com.steerinfo.pretrack.prerailwayscale.mapper.PreRailwayScaleMapper;
+import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +69,9 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
 
+    @Resource
+    private PreRailwayScaleMapper preRailwayScaleMapper;
+
     @Override
     protected IBaseMapper<MeterWorkRailwayReceived, String> getMapper() {
         return meterWorkRailwayReceivedMapper;
@@ -198,6 +203,98 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+    @Override
+    public RESTfulResult updateListStart(List<MeterWorkRailwayReceived> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+            for (MeterWorkRailwayReceived model: models) {
+//                if(model.getMemo() != null && StringUtils.isNotEmpty(model.getMemo())) {
+//                    MeterBaseOperationLog note = new MeterBaseOperationLog();
+//                    String no = PublicMethod.IdCreate(3);
+//                    note.setId(no);
+//                    note.setCreateManNo(model.getCreateManNo());
+//                    note.setCreateManName(model.getCreateManName());
+//                    note.setCreateTime(new Date());
+//                    note.setOperationPage("终端-轨道衡从表数据维护");
+//                    note.setOperationFunction("修改");
+//                    note.setOperationCarnNo(model.getRailwayNo());
+//                    meterBaseOperationLogMapper.insertSelective(note);
+//                    model.setMemo("");
+//                }
+
+//                if(model.getAiWeight() != null && StringUtils.isNotEmpty(model.getAiWeight())) {
+//                    HashMap<String, Object> map = new HashMap<>();
+//                    map.put("railwayNo", model.getRailwayNo());
+//                    List<MeterBaseRailwayAiweight> AiModels = meterBaseRailwayAiweightMapper.selectByParameters(map);
+//                    MeterBaseRailwayAiweight AiModel = new MeterBaseRailwayAiweight();
+//                    if(AiModels.size() >= 1) {
+//                        AiModel = AiModels.get(0);
+//                        AiModel.setMeterWeight(new BigDecimal(model.getAiWeight()));
+//                        AiModel.setRailwayType(model.getRailwayModelName());
+//                        AiModel.setRailwaySpeed(model.getRailwaySpeed());
+//                        AiModel.setUpdateManNo("systemAdd");
+//                        AiModel.setUpdateManName("systemAdd");
+//                        AiModel.setUpdateTime(new Date());
+//                        AiModel.setValueFlag("1");
+//                        meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(AiModel);
+//                    }else {
+//                        AiModel.setActualFirstNo(model.getActualFirstNo());
+//                        AiModel.setRailwayNo(model.getRailwayNo());
+//                        AiModel.setMeterWeight(new BigDecimal(model.getAiWeight()));
+//                        AiModel.setRailwayType(model.getRailwayModelName());
+//                        AiModel.setRailwayTypeNo("001019002");
+//                        AiModel.setRailwayTypeNo("动态轨道衡");
+//                        AiModel.setValueFlag("1");
+//                        AiModel.setCreateManNo("systemAdd");
+//                        AiModel.setCreateManName("systemAdd");
+//                        AiModel.setCreateTime(new Date());
+//                        AiModel.setRailwaySpeed(model.getRailwaySpeed());
+//                        meterBaseRailwayAiweightMapper.insertSelective(AiModel);
+//                    }
+//                }
+//                meterWorkRailwayReceivedMapper.deleteByPrimaryKey(model.getActualFirstNo());
+//                rm.setData(model.getActualFirstNo());
+//                if(model.getRailwayNo() == null && StringUtils.isEmpty(model.getRailwayNo())) {
+//                    model.setRailwayNo("车号异常");
+//                }
+////            SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+////            String afl = sdf.format(new Date());
+////            String no = meterWorkRailwayReceivedMapper.getNewID(afl);
+////            model.setActualFirstNo(sdf.format(new Date()) + no);
+//                meterWorkRailwayReceivedMapper.insertSelective(model);
+                model.setValueFlag("1");
+                meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
+                count ++;
+            }
+            
+            //修改主表是否已处理完
+            if(models.size() >= 1) {
+                MeterWorkRailwayReceived receivedModel = meterWorkRailwayReceivedMapper.selectByPrimaryKey(models.get(0).getActualFirstNo());
+                if(receivedModel != null){
+                    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("0");
+                        meterWorkRailwayRecMainMapper.updateByPrimaryKeySelective(mainModel.get(0));
+                    }
+                }
+            }
+            rm.setMessage("操作成功，共有" + count + "条数据更新成功");
+            rm.setCode("200");
+            rm.setData(count);
+            rm.setSucceed(true);
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常");
+        }
+        return rm;
+    }
+
     @Override
     public RESTfulResult addList(List<MeterWorkRailwayReceived> models) {
         RESTfulResult rm = new RESTfulResult();
@@ -302,4 +399,105 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
         }
         return rm;
     }
+
+    @Override
+    public RESTfulResult RemovePre(List<MeterWorkRailwayReceived> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            for(MeterWorkRailwayReceived model: models){
+                MeterWorkRailwayReceived modelTemp =  meterWorkRailwayReceivedMapper.selectByPrimaryKey(model.getActualFirstNo());
+                if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())){
+                    PreRailwayScale scale = new PreRailwayScale();
+                    scale.setValueFlag("1");
+                    scale.setPredictionNo(modelTemp.getPredictionNo());
+                    preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+                }
+                modelTemp = meterWorkRailwayReceivedMapper.selectAndRemove(modelTemp.getActualFirstNo());
+                meterWorkRailwayReceivedMapper.updateByPrimaryKey(modelTemp);
+                count++;
+            }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功，共有" + count + "条数据更新成功");
+            rm.setCode("200");
+            rm.setData(count);
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常");
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult removeList(List<MeterWorkRailwayReceived> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            int count = 0;
+            for(MeterWorkRailwayReceived model: models){
+                model.setValueFlag("0");
+                meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
+                if(model.getPredictionNo() != null &&  StringUtils.isNotEmpty(model.getPredictionNo())){
+                    PreRailwayScale preRailwayScale = new PreRailwayScale();
+                    preRailwayScale.setValueFlag("1");
+                    preRailwayScale.setPredictionNo(model.getPredictionNo());
+                    preRailwayScaleMapper.updateByPrimaryKeySelective(preRailwayScale);
+                }
+                count++;
+            }
+
+            //修改主表是否已处理完
+            if(models.size() >= 1) {
+                MeterWorkRailwayReceived receivedModel = meterWorkRailwayReceivedMapper.selectByPrimaryKey(models.get(0).getActualFirstNo());
+                if(receivedModel != null){
+                    HashMap<String, Object> obj = new HashMap<>();
+                    obj.put("railwayWorkNo", receivedModel.getRailwayWorkNo());
+                    HashMap<String, Object> countMap = meterWorkRailwayReceivedMapper.getCount(obj);
+                    int countNum = Integer.parseInt(countMap.get("COUNTNUM").toString());
+                    if(countNum < 1) {
+                        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));
+                        }
+                    }
+                }
+            }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功，共有" + count + "条数据更新成功");
+            rm.setCode("200");
+            rm.setData(count);
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常");
+        }
+        return rm;
+    }
+
+    @Override
+    public RESTfulResult matchPre(MeterWorkRailwayReceived model) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
+            PreRailwayScale preRailwayScale = new PreRailwayScale();
+            preRailwayScale.setValueFlag("4");
+            preRailwayScale.setPredictionNo(model.getPredictionNo());
+            preRailwayScaleMapper.updateByPrimaryKeySelective(preRailwayScale);
+            rm.setSucceed();
+            rm.setMessage("操作成功");
+            rm.setCode("200");
+            rm.setData(null);
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常");
+        }
+        return rm;
+    }
 }

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

@@ -3084,7 +3084,7 @@
         update METER_WORK_RAILWAY_RECEIVED set value_flag='2' where ACTUAL_FIRST_NO=#{actualFirstNo}
     </update>
     <update id="updateMeterWorkRailwayReceiveds">
-        update METER_WORK_RAILWAY_RECEIVED set value_flag='1' where ACTUAL_FIRST_NO=#{actualFirstNo}
+        update METER_WORK_RAILWAY_RECEIVED set value_flag='0' where ACTUAL_FIRST_NO=#{actualFirstNo}
     </update>
     <update id="updateUnUseData"></update>