静轨标识皮修改

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

@@ -47,7 +47,10 @@ public class SecurityFilter implements Filter {
         //app:https://app.jiugang.com/jgjl/v1/meterbasecars/applogin
         //网页代理ip：https://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1/meterbasecars/applogin
         //本地：http://10.104.4.105:9004/v1/meterbasecars/applogin
-        if(request.getRemoteAddr().equals("10.1.201.188") ||request.getRemoteAddr().equals("10.104.4.105")) {
+        if(request.getRemoteAddr().equals("10.1.201.188")
+                ||request.getRemoteAddr().equals("10.104.4.105")
+                ||request.getRemoteAddr().equals("0:0:0:0:0:0:0:1")
+            ) {
             filterChain.doFilter(servletRequest,servletResponse);
             return;
         }

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

@@ -5269,6 +5269,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return rm;
     }
 
+
+    //静轨标识皮结净
     @Override
     public RESTfulResult doIdentifyWeight(MeterWorkRailwayActFirst model) {
         RESTfulResult rm = new RESTfulResult();
@@ -5288,12 +5290,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             grossModel.setCreateTime(new Date());
             meterWorkRailwayActFirstMapper.insertSelective(grossModel);
             //标识皮重保存
-            MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
-            tareModel.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
-            tareModel.setMeterWeight(model.getRailwayFactoryWeight());
-            tareModel.setWeightType("1");
-            tareModel.setCreateTime(new Date());
-            meterWorkRailwayActFirstMapper.insertSelective(tareModel);
+
+            MeterWorkRailwayActFirst tareModel = new MeterWorkRailwayActFirst();
+            BeanUtils.copyProperties(grossModel, tareModel);
+
+//            MeterWorkRailwayActFirst tareModel = meterWorkRailwayActFirstMapper.selectByPrimaryKey(grossModel.getActualFirstNo());
+//            tareModel.setActualFirstNo(afl + meterWorkRailwayActFirstMapper.getNewID(afl));
+//            tareModel.setMeterWeight(model.getRailwayFactoryWeight());
+//            tareModel.setWeightType("1");
+//            tareModel.setCreateTime(new Date());
+//            meterWorkRailwayActFirstMapper.insertSelective(tareModel);
 
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
             if (StringUtils.isNotEmpty(model.getPredictionNo())) {
@@ -5314,14 +5320,14 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     //将委托中的编号和收发货的等数据拷贝进一次数据中
                     MeterWorkRailwayActFirst first1 = meterWorkRailwayActFirstMapper.selectAndMatch(model01.getActualFirstNo(), scale.getPredictionNo());
                     BeanUtils.copyProperties(first1, model01);
-                    MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale.getPredictionNo());
-                    BeanUtils.copyProperties(first2, model02);
+//                    MeterWorkRailwayActFirst first2 = meterWorkRailwayActFirstMapper.selectAndMatch(model02.getActualFirstNo(), scale.getPredictionNo());
+//                    BeanUtils.copyProperties(first2, model02);
 
                     //修改委托编号
                     scale.setValueFlag(DbConstants.NET);
                     scale.setUpdateTime(new Date());
                     scale.setUpdateManNo("system");
-                    scale.setUpdateManName("标志皮洁净更新");
+                    scale.setUpdateManName("标识皮洁净更新");
                     scale.setUploadFlag("1");
                     scale.setPredictionType("1");
                     preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
@@ -5329,7 +5335,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     //修改毛重一次数据状态
                     model01.setValueFlag(DbConstants.NET);
                     model01.setUpdateManName("system");
-                    model01.setUpdateManName("标志皮洁净更新");
+                    model01.setUpdateManName("标识皮洁净更新");
                     model01.setUpdateTime(new Date());
                     model01.setWeightType("0");
                     model01.setIsPreSacale("1");
@@ -5337,15 +5343,15 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     model01.setPredictionType("1");
                     meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model01);
                     //修改皮重一次数据状态
-                    model02.setValueFlag(DbConstants.NET);
-                    model02.setUpdateManName("system");
-                    model02.setUpdateManName("标志皮洁净更新");
-                    model02.setUpdateTime(new Date());
-                    model02.setWeightType("1");
-                    model02.setIsPreSacale("1");
-                    model02.setPredictionNo(scale.getPredictionNo());
-                    model02.setPredictionType("1");
-                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
+//                    model02.setValueFlag(DbConstants.NET);
+//                    model02.setUpdateManName("system");
+//                    model02.setUpdateManName("标识皮洁净更新");
+//                    model02.setUpdateTime(new Date());
+//                    model02.setWeightType("1");
+//                    model02.setIsPreSacale("1");
+//                    model02.setPredictionNo(scale.getPredictionNo());
+//                    model02.setPredictionType("1");
+//                    meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model02);
 
                     MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(model01.getActualFirstNo(), model02.getActualFirstNo(), scale.getPredictionNo());
                     BeanUtils.copyProperties(mwca1, actualRow);
@@ -5354,16 +5360,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     actualRow.setActualNo(sdf.format(new Date()) + no);
                     actualRow.setNetTime(new Date());
                     actualRow.setNetMode(DbConstants.TYPE);
-                    actualRow.setNote("标志皮匹配洁净");
+                    actualRow.setNote("标识皮匹配洁净");
+                    actualRow.setTareWeight(model.getRailwayFactoryWeight());
                     actualRow.setNetMode("1");
                     actualRow.setUploadFlag("1");
                     actualRow.setValueFlag("1");
                     actualRow.setIsPreSacale("1");
                     actualRow.setPredictionNo(scale.getPredictionNo());
                     actualRow.setPredictionType("1");
-                    actualRow.setNetWeight(model01.getMeterWeight().subtract(model02.getMeterWeight()));
+                    actualRow.setNetWeight(model01.getMeterWeight().subtract(model.getRailwayFactoryWeight()));
                     meterWorkRailwayActualMapper.insertSelective(actualRow);
-
                     firsts.add(model01);
                 } else {
                     rm.setMessage("委托信息表未查询到委托信息！！");
@@ -5373,19 +5379,19 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 //修改毛重一次数据状态
                 grossModel.setValueFlag(DbConstants.NET);
                 grossModel.setUpdateManName("system");
-                grossModel.setUpdateManName("标志皮洁净更新");
+                grossModel.setUpdateManName("标识皮洁净更新");
                 grossModel.setUpdateTime(new Date());
                 grossModel.setWeightType("0");
                 grossModel.setIsPreSacale("0");
                 meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(grossModel);
                 //修改皮重一次数据状态
-                tareModel.setValueFlag(DbConstants.NET);
-                tareModel.setUpdateManName("system");
-                tareModel.setUpdateManName("标志皮洁净更新");
-                tareModel.setUpdateTime(new Date());
-                tareModel.setWeightType("1");
-                tareModel.setIsPreSacale("0");
-                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(tareModel);
+//                tareModel.setValueFlag(DbConstants.NET);
+//                tareModel.setUpdateManName("system");
+//                tareModel.setUpdateManName("标志皮洁净更新");
+//                tareModel.setUpdateTime(new Date());
+//                tareModel.setWeightType("1");
+//                tareModel.setIsPreSacale("0");
+//                meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(tareModel);
 
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
                 BeanUtils.copyProperties(mwca1, actualRow);
@@ -5394,18 +5400,18 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setActualNo(sdf.format(new Date()) + no);
                 actualRow.setNetTime(new Date());
                 actualRow.setNetMode(DbConstants.TYPE);
-                actualRow.setNote("标志皮洁净");
+                actualRow.setNote("标识皮洁净");
+                actualRow.setTareWeight(model.getRailwayFactoryWeight());
                 actualRow.setNetMode("1");
                 actualRow.setUploadFlag("1");
                 actualRow.setValueFlag("1");
                 actualRow.setIsPreSacale("0");
-                actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));
+                actualRow.setNetWeight(grossModel.getMeterWeight().subtract(model.getRailwayFactoryWeight()));
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
                 firsts.add(grossModel);
             }
             actuals.add(actualRow);
-            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(tareModel.getActualFirstNo());
-
+//            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(tareModel.getActualFirstNo());
             map.put("firsts", firsts);
             map.put("actuals", actuals);
 

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

@@ -649,11 +649,26 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossrow);
                 //皮重
                 MeterWorkRailwayActFirst mwcaf2 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
-                MeterBaseRailwayWeight mbrw = meterBaseRailwayWeightMapper.selectByPrimaryKey(model.getActualFirst2No());
-                if (mwcaf2 == null && mbrw == null) {
-                    throw new MarkerMetException(500, "未查询到相应的皮重数据！！");
-                }
-                // 清空委托信息
+
+//                MeterBaseRailwayWeight mbrw = meterBaseRailwayWeightMapper.selectByPrimaryKey(model.getActualFirst2No());
+//                if (mwcaf2 == null) {
+//                    throw new MarkerMetException(500, "未查询到相应的皮重数据！！");
+//                }
+//                // 清空委托信息
+//                MeterWorkRailwayActFirst tarerow = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
+//                if (tarerow != null) {
+//                    //tarerow.setValueFlag("3");
+//                    tarerow.setIsPreSacale("0");
+//                    tarerow.setUpdateManNo("system");
+//                    tarerow.setUpdateManName("静态衡解除操作");
+//                    tarerow.setUpdateTime(new Date());
+//                    tarerow.setLcNo(model.getLcNo());
+//                    tarerow.setValueFlag("1");
+//                    meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
+//                }
+                //未查询到相应的标识皮直接跳过
+                if(mwcaf2 != null && mwcaf2.getMeterWeight().compareTo(model.getTareWeight().multiply(new BigDecimal(1000))) == 0) {
+                    // 清空委托信息
                 MeterWorkRailwayActFirst tarerow = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
                 if (tarerow != null) {
                     //tarerow.setValueFlag("3");
@@ -665,6 +680,17 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     tarerow.setValueFlag("1");
                     meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
                 }
+                    //恢复标志标识皮数据
+                    HashMap<String, Object> obj = new HashMap<>();
+                    obj.put("railwayNo", model.getRailwayNo());
+                    obj.put("valueFlag", "1");
+                    List<MeterBaseRailwayAiweight> AIModel = meterBaseRailwayAiweightMapper.selectByParameters(obj);
+                    if(AIModel.size() >= 1) {
+                        AIModel.get(0).setValueFlag("0");
+                        meterBaseRailwayAiweightMapper.updateByPrimaryKeySelective(AIModel.get(0));
+                    }
+                }
+
                 if (StringUtils.isNotEmpty(model.getPredictionNo())) {
                     PreRailwayScale scale = new PreRailwayScale();
                     scale.setPredictionNo(model.getPredictionNo());
@@ -679,7 +705,6 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 //meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
                 num++;
             }
-
             return num;
         } catch (MarkerMetException e) {
             throw e;