后端修改

src/main/java/com/steerinfo/filter/SecurityFilter.java

@@ -37,17 +37,13 @@ public class SecurityFilter implements Filter {
         StringBuffer url = request.getRequestURL();
         //不拦截
         ///apifox导入请求路径：v2/api-docs
-        if ("/jgjl/v1/meterbasecars/appregister".equals(path)
-                ||"/jgjl/v1/meterbasecars/applogin".equals(path)
-                ||"/v1/MeterWorkZnlc/GetWeightFromJL".equals(path)
-                ||"/v1/MeterWorkZnlc/HasPermissionGivenByJL".equals(path)
-                ||"/v1/MeterWorkZnlc/IsRecorded".equals(path)
-                ||"/v1/MeterWorkZnlc/SendTruckInPlaceToJL".equals(path)
+        if (path.contains("/v1/meterbasecars/appregister")
+                ||path.contains("/v1/meterbasecars/applogin")
+                ||path.contains("/v1/MeterWorkZnlc")
                 ||"/v2/api-docs".equals(path)){
             filterChain.doFilter(servletRequest,servletResponse);
             return;
         }
-
         //邓义晶：10.104.4.105  app：10.1.201.188
         //app:https://app.jiugang.com/jgjl/v1/meterbasecars/applogin
         //网页代理ip：https://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1/meterbasecars/applogin

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

@@ -900,9 +900,9 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
         receiving_uint_name,
         matter_no,
         matter_name,
-        sender_remark,
+        '' sender_remark,
         '新系统' remark
-        from meter_work_railway_act_first
+        from METER_WORK_RAILWAY_RECEIVED
         where VALUE_FLAG in ('1','2') and RAILWAY_TYPE_NO in ('001019002', '001019004')
         <if test="remark != null and remark != ''">
             and '新系统' LIKE '%${remark}%'
@@ -911,10 +911,7 @@ where FS_ISVALID = '1' and FS_DELETEDTAG = 'N' and (FS_BALANCETYPE='静态' or F
             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}%'
+            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="railwayNo != null and railwayNo != ''">
             and RAILWAY_NO like '%${railwayNo}%'

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

@@ -5044,33 +5044,27 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         rm.setFailed();
         try {
             int count = 0;
+
             for (MeterWorkRailwayActFirst model: models) {
-                if(model.getCreateTime() == null || StringUtils.isEmpty(model.getCreateTime().toString())) {
+                MeterWorkRailwayReceived modelTemp = meterWorkRailwayReceivedMapper.selectByPrimaryKey(model.getActualFirstNo());
+                if(modelTemp.getPredictionNo() != null && StringUtils.isNotEmpty(modelTemp.getPredictionNo())) {
+                    rm.setMessage("一次计量数据带有委托，请撤销完委托之后在保存皮重");
+                    return rm;
+                }
+                if(modelTemp.getCreateTime() == null || StringUtils.isEmpty(modelTemp.getCreateTime().toString())) {
                     rm.setMessage("计量时间不能为空");
                     return rm;
                 }
             }
             for (MeterWorkRailwayActFirst model : models) {
-                //若存在相同车号的数据，则将之前的数据状态还原，然后再删除一次计量表的数据，之后再新增一次计量表数据，以及修改数据状态
-                Map<String, Object> mp = new HashMap<>();
-                mp.put("railwayNo", model.getRailwayNo());
-                mp.put("valueFlag", "1");
-                mp.put("railwayTypeNo", "001019002");
-                List<MeterWorkRailwayActFirst> ll = meterWorkRailwayActFirstMapper.selectByParameters(mp);
-                if (ll != null && ll.size() > 0) {
-                    for (MeterWorkRailwayActFirst fs : ll) {
-                        meterWorkRailwayActFirstMapper.deleteByPrimaryKey(fs.getActualFirstNo());
-                        preRailwayScaleMapper.updateMeterWorkRailwayReceiveds(fs.getActualFirstNo());
-                    }
-                }
                 meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceived(model.getActualFirstNo());
                 MeterWorkRailwayActFirst mwrac = model;
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
                 String afl = sdf.format(new Date());
 //                String netNo = meterWorkRailwayActFirstMapper.getNewID(afl);
 //                mwrac.setActualFirstNo(afl + netNo);
-                String netNo = PublicMethod.IdCreate(3);
-                mwrac.setActualFirstNo(netNo);
+//                String netNo = PublicMethod.IdCreate(3);
+//                mwrac.setActualFirstNo(netNo);
                 mwrac.setLcNo(model.getRailwayWorkNo());
                 mwrac.setWeightType("1");
 //                mwrac.setCreateTime(new Date());
@@ -8510,20 +8504,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             for(MeterWorkRailwayActFirst model: models) {
                 MeterWorkRailwayActFirst modelTmep = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirstNo());
                 if(modelTmep != null) {
+                    //删除一次皮重数据、还原从表
+                    meterWorkRailwayActFirstMapper.deleteByPrimaryKey(modelTmep.getActualFirstNo());
                     //还原从表信息
                     meterWorkRailwayReceivedMapper.updateMeterWorkRailwayReceiveds(modelTmep.getActualFirstNo());
-                    //判断是否匹配了委托，匹配了委托还原委托信息
-                    if(modelTmep.getPredictionNo() != null && StringUtils.isNotEmpty(modelTmep.getPredictionNo())) {
-                        PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(modelTmep.getPredictionNo());
-                        Assert.isTrue(!scale.getValueFlag().equals("9"), "一次数据匹配的委托已结算，不允许还原皮重");
-                        MeterWorkRailwayActFirst modelTemp = meterWorkRailwayActFirstMapper.selectAndRemove(modelTmep.getActualFirstNo());
-                        meterWorkRailwayActFirstMapper.updateByPrimaryKey(modelTemp);
-                        scale.setValueFlag("1");
-                        scale.setUploadFlag("1");
-                        preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
-                    }
-                    //删除一次皮重数据
-                    meterWorkRailwayActFirstMapper.deleteByPrimaryKey(modelTmep.getActualFirstNo());
                     //还原主表为未处理状态
                     MeterWorkRailwayReceived receivedModel = meterWorkRailwayReceivedMapper.selectByPrimaryKey(modelTmep.getActualFirstNo());
                     if(receivedModel != null){

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

@@ -1796,7 +1796,7 @@
     </update>
   <update id="updateMeterWorkRailwayReceiveds">
         update METER_WORK_RAILWAY_RECEIVED set value_flag='1' where ACTUAL_FIRST_NO=#{actualFirstNo}
-    </update>
+  </update>
 
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_FIRST_NO, LENGTH(ACTUAL_FIRST_NO) - 3))),0) + 1,4,'0') ACTUAL_FIRST_NO