'提交'

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/controller/MeterBaseRailwayAiweightController.java

@@ -77,7 +77,7 @@ public class MeterBaseRailwayAiweightController extends BaseRESTfulController {
         List<MeterBaseRailwayAiweight> list = meterBaseRailwayAiweightService.noPage(parmas);
         return success(list);
     }
-    
+
     @ApiOperation(value="创建", notes="根据MeterBaseRailwayAiweight对象创建")
     @ApiImplicitParam(name = "meterBaseRailwayAiweight", value = "详细实体meterBaseRailwayAiweight", required = true, dataType = "MeterBaseRailwayAiweight")
     //@RequiresPermissions("meterbaserailwayaiweight:create")
@@ -126,7 +126,7 @@ public class MeterBaseRailwayAiweightController extends BaseRESTfulController {
     @PostMapping(value = "/checkAdd")
     public RESTfulResult checkAdd(@RequestBody List<MeterBaseRailwayAiweight> models){
         RESTfulResult rm = meterBaseRailwayAiweightService.checkAdd(models);
-        return success(rm);
+        return rm;
     }
 
     @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的meterWorkRailwayReceived信息来更新详细信息")

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/impl/MeterBaseRailwayAiweightServiceImpl.java

@@ -85,39 +85,20 @@ public class MeterBaseRailwayAiweightServiceImpl extends BaseServiceImpl<MeterBa
                     model.setRailwayTypeName("动态轨道衡");
                     model.setCreateManNo("admin");
                     model.setCreateManName("admins");
-                    if(model.getCreateTime() == null && StringUtils.isEmpty(model.getCreateTime().toString())) {
+                    if(model.getCreateTime() == null) {
                         model.setCreateTime(new Date());
                     }
                     meterBaseRailwayAiweightMapper.insertSelective(model);
                 }
             }
-            try {
-                StringBuffer railwayNos = new StringBuffer("");
-                for(MeterBaseRailwayAiweight model: models) {
-                    railwayNos.append( model.getRailwayNo());
-                    railwayNos.append( ",");
-                }
-                MeterBaseOperationLog operationLog = new MeterBaseOperationLog();
-                String id = PublicMethod.IdCreate(2);
-                operationLog.setId(id);
-                operationLog.setOperationPage("ai重量维护"); //操作界面-页面名称
-                operationLog.setOperationFunction("车号写入");//操作界面-功能名称
-                //operationLog.setOperationId(model.getId());//操作界面-数据主键
-                operationLog.setOperationCarnNo(railwayNos.toString());//操作界面-车号
-                operationLog.setCreateManNo("admin");
-                operationLog.setCreateManName("admin");
-                operationLog.setCreateTime(new Date());
-                meterBaseOperationLogMapper.insertSelective(operationLog);
-            }catch (Exception e){
-                e.printStackTrace();
-                logger.error("日志写入失败");
-            }
+
             rm.setSucceed();
             rm.setCode("200");
             rm.setData(models);
             rm.setMessage("操作成功！！");
         }catch(Exception e) {
             e.printStackTrace();
+            rm.setFailed();
             rm.setMessage("操作失败，请确认！！>>>" + e.getMessage());
         }
         return rm;

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -27,6 +27,7 @@ import com.steerinfo.baseinfo.meterbaseunloadtime.mapper.MeterBaseUnloadTimeMapp
 import com.steerinfo.baseinfo.meterbaseunloadtime.model.MeterBaseUnloadTime;
 import com.steerinfo.baseinfo.meterbasevideoinfo.mapper.MeterBaseVideoinfoMapper;
 import com.steerinfo.baseinfo.meterbasevideoinfo.model.MeterBaseVideoinfo;
+import com.steerinfo.filter.SqlInjectFilter;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
@@ -69,6 +70,8 @@ import com.steerinfo.pretrack.pretrackscale.model.PreTrackScale;
 import com.steerinfo.util.*;
 import org.apache.http.util.TextUtils;
 import org.apache.shiro.crypto.hash.Hash;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -188,6 +191,8 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Resource
     private MeterBaseMatterUnitMapper meterBaseMatterUnitMapper;
 
+    private static final Logger log = LoggerFactory.getLogger(MeterWorkCarActualFirstServiceImpl.class);
+
     @Override
     protected IBaseMapper<MeterWorkCarActualFirst, String> getMapper() {
         return meterWorkCarActualFirstMapper;
@@ -4415,6 +4420,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     }
 
     @Override
+    @Transactional
     public RESTfulResult doubleEntrustmentMatch(String actualNo1, String actualNo2, String predictionNo1, String predictionNo2) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
@@ -4537,81 +4543,89 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             //将委托中的编号和收发货的等数据拷贝进一次数据中
             MeterWorkCarActualFirst first1 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo1, predictionNo1);
-            BeanUtils.copyProperties(first1,mwcaf01);
+            //BeanUtils.copyProperties(first1,mwcaf01);
             MeterWorkCarActualFirst first2 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo2, predictionNo1);
-            BeanUtils.copyProperties(first2, mwcaf02);
+            //BeanUtils.copyProperties(first2, mwcaf02);
             MeterWorkCarActualFirst first3 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo1, predictionNo2);
-            BeanUtils.copyProperties(first3,mwcaf03);
+            //BeanUtils.copyProperties(first3,mwcaf03);
             MeterWorkCarActualFirst first4 = meterWorkCarActualFirstMapper.selectAndMatch(actualNo2, predictionNo2);
-            BeanUtils.copyProperties(first4, mwcaf04);
+            //BeanUtils.copyProperties(first4, mwcaf04);
 
             //更新一次数据
             //更新第一次毛重数据库
-            mwcaf01.setValueFlag(DbConstants.NET);
-            mwcaf01.setUpdateManNo(userId);
-            mwcaf01.setUpdateManName(userName);
-            mwcaf01.setNote("双委托结净更新");
-            mwcaf01.setUpdateTime(new Date());
-            mwcaf01.setIsPreScale("1");
-            mwcaf01.setWeightType("0");
-            mwcaf01.setPredictionNo(predictionNo1);
-            mwcaf01.setPredictionType("5");
-            mwcaf01.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf01);
+            first1.setValueFlag(DbConstants.NET);
+            first1.setUpdateManNo(userId);
+            first1.setUpdateManName(userName);
+            first1.setNote("双委托结净更新");
+            first1.setUpdateTime(new Date());
+            first1.setIsPreScale("1");
+            first1.setWeightType("0");
+            first1.setPredictionNo(predictionNo1);
+            first1.setPredictionType("5");
+            first1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkCarActualFirstMapper.updateByPrimaryKey(first1);
             //更新第一次皮重数据库
-            mwcaf02.setValueFlag(DbConstants.NET);
-            mwcaf02.setUpdateManNo(userId);
-            mwcaf02.setUpdateManName(userName);
-            mwcaf02.setNote("手动双委托结净更新");
-            mwcaf02.setUpdateTime(new Date());
-            mwcaf02.setIsPreScale("1");
-            mwcaf02.setWeightType("1");
-            mwcaf02.setPredictionNo(predictionNo1);
-            mwcaf02.setPredictionType("5");
-            mwcaf02.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf02);
+            first2.setValueFlag(DbConstants.NET);
+            first2.setUpdateManNo(userId);
+            first2.setUpdateManName(userName);
+            first2.setNote("手动双委托结净更新");
+            first2.setUpdateTime(new Date());
+            first2.setIsPreScale("1");
+            first2.setWeightType("1");
+            first2.setPredictionNo(predictionNo1);
+            first2.setPredictionType("5");
+            first2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkCarActualFirstMapper.updateByPrimaryKey(first2);
             //添加历史皮重
-            doSaveHisTare(mwcaf02,"5");
+            try {
+                doSaveHisTare(first2,"5");
+            }catch (Exception e){
+                log.error("新增历史皮重异常",e);
+                e.printStackTrace();
+            }
             //添加第一次毛重数据库
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
             String afl = sdf.format(new Date());
 //            String actualFirstNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
 //            mwcaf03.setActualFirstNo(actualFirstNo);
             String actualFirstNo = PublicMethod.IdCreate(3);
-            mwcaf03.setActualFirstNo(actualFirstNo);
-
-            mwcaf03.setValueFlag(DbConstants.NET);
-            mwcaf03.setUpdateManNo(userId);
-            mwcaf03.setUpdateManName(userName);
-            mwcaf03.setNote("手动双委托结净更新");
-            mwcaf03.setUpdateTime(new Date());
-            mwcaf03.setIsPreScale("1");
-            mwcaf03.setWeightType("0");
-            mwcaf03.setPredictionNo(predictionNo2);
-            mwcaf03.setPredictionType("5");
-            mwcaf03.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkCarActualFirstMapper.insertSelective(mwcaf03);
+            first3.setActualFirstNo(actualFirstNo);
+            first3.setValueFlag(DbConstants.NET);
+            first3.setUpdateManNo(userId);
+            first3.setUpdateManName(userName);
+            first3.setNote("手动双委托结净更新");
+            first3.setUpdateTime(new Date());
+            first3.setIsPreScale("1");
+            first3.setWeightType("0");
+            first3.setPredictionNo(predictionNo2);
+            first3.setPredictionType("5");
+            first3.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkCarActualFirstMapper.insertSelective(first3);
             //添加第二次皮重数据库
             SimpleDateFormat sdf01 = new SimpleDateFormat("yyyyMMdd");
             String afl01 = sdf01.format(new Date());
 //            String actualSecondNo = sdf01.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl01);
 //            mwcaf04.setActualFirstNo(actualSecondNo);
             String actualSecondNo = PublicMethod.IdCreate(3);
-            mwcaf04.setActualFirstNo(actualSecondNo);
-
-            mwcaf04.setValueFlag(DbConstants.NET);
-            mwcaf04.setUpdateManNo(userId);
-            mwcaf04.setUpdateManName(userName);
-            mwcaf04.setNote("手动双委托结净更新");
-            mwcaf04.setUpdateTime(new Date());
-            mwcaf04.setIsPreScale("1");
-            mwcaf04.setWeightType("1");
-            mwcaf04.setPredictionNo(predictionNo2);
-            mwcaf04.setPredictionType("5");
-            mwcaf04.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            meterWorkCarActualFirstMapper.insertSelective(mwcaf04);
+            first4.setActualFirstNo(actualSecondNo);
+            first4.setValueFlag(DbConstants.NET);
+            first4.setUpdateManNo(userId);
+            first4.setUpdateManName(userName);
+            first4.setNote("手动双委托结净更新");
+            first4.setUpdateTime(new Date());
+            first4.setIsPreScale("1");
+            first4.setWeightType("1");
+            first4.setPredictionNo(predictionNo2);
+            first4.setPredictionType("5");
+            first4.setPredictionCombination(predictionNo1 + "," + predictionNo2);
+            meterWorkCarActualFirstMapper.insertSelective(first4);
             //添加历史皮重
-            doSaveHisTare(mwcaf02,"5");
+            try {
+                doSaveHisTare(first4,"5");
+            }catch (Exception e){
+                log.error("新增历史皮重异常",e);
+                e.printStackTrace();
+            }
 
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
             MeterWorkCarActual mwca1 = meterWorkCarActualMapper.manualAddPre(actualNo1, actualNo2, predictionNo1);
@@ -4633,7 +4647,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setPredictionNo(predictionNo1);
             actualRow1.setPredictionType("5");
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            actualRow1.setNetWeight(mwcaf01.getMeterWeight().subtract(mwcaf02.getMeterWeight()));
+            actualRow1.setNetWeight(first1.getMeterWeight().subtract(first2.getMeterWeight()));
             actualRow1.setCreateTime(new Date());
             if(actualRow1.getGrossTime().compareTo(actualRow1.getTareTime()) >= 0) {
                 actualRow1.setNetSpot3No(actualRow1.getBaseSpot1No());
@@ -4671,7 +4685,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setPredictionNo(predictionNo2);
             actualRow2.setPredictionType("5");
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
-            actualRow2.setNetWeight(mwcaf03.getMeterWeight().subtract(mwcaf04.getMeterWeight()));
+            actualRow2.setNetWeight(first3.getMeterWeight().subtract(first4.getMeterWeight()));
             actualRow2.setCreateTime(new Date());
             if(actualRow2.getGrossTime().compareTo(actualRow2.getTareTime()) >= 0) {
                 actualRow2.setNetSpot3No(actualRow2.getBaseSpot1No());
@@ -4756,6 +4770,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         }catch(Exception e){
             e.printStackTrace();
             rm.setMessage("操作异常，请确认");
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return rm;
         }
     }

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -1251,9 +1251,9 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                                 && modelDetail.getMatterNo() != null && modelActual.getMatterNo() != null && modelDetail.getMatterNo().equals(modelActual.getMatterNo())
                                 && modelDetail.getMatterName() != null && modelActual.getMatterName() != null && modelDetail.getMatterName().equals(modelActual.getMatterName())) {
                             //结净数据毛重-平均毛重大于等于输入值，就写入
-                            BigDecimal sub = (modelActual.getGrossWeight().subtract(modelDetail.getAvgGrossWeight())).abs();
+                            BigDecimal sub = (modelActual.getGrossWeight().subtract(modelDetail.getAvgGrossWeight()));
                             //avgGrossWeight < sub
-                            if(avgGrossWeight.compareTo(sub) == -1) {
+                            if(avgGrossWeight.compareTo(sub.abs()) == -1) {
                                 modelActual.setAvgGrossWeight(modelDetail.getAvgGrossWeight());
                                 modelActual.setAvgGrossWeightSub(sub);
                                 rows.add(modelActual);
@@ -1320,9 +1320,9 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                                 && modelDetail.getMatterNo() != null && modelActual.getMatterNo() != null && modelDetail.getMatterNo().equals(modelActual.getMatterNo())
                                 && modelDetail.getMatterName() != null && modelActual.getMatterName() != null && modelDetail.getMatterName().equals(modelActual.getMatterName())) {
                             //结净数据毛重-平均毛重大于等于输入值，就写入
-                            BigDecimal sub = (modelActual.getNetWeight().subtract(modelDetail.getAvgNetWeight())).abs();
+                            BigDecimal sub = (modelActual.getNetWeight().subtract(modelDetail.getAvgNetWeight()));
                             //avgGrossWeight < sub
-                            if(avgNetWeight.compareTo(sub) == -1) {
+                            if(avgNetWeight.compareTo(sub.abs()) == -1) {
                                 modelActual.setAvgNetWeight(modelDetail.getAvgNetWeight());
                                 modelActual.setAvgNetWeightSub(sub);
                                 rows.add(modelActual);

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

@@ -1433,7 +1433,7 @@ throw new MarkerMetException(500, "操作异常！！");
     }
 
     @ApiOperation(value = "动轨计量终端从表数据处理批量匹配标准皮", notes = "一定要有委托才能才能进行结净")
-    @Transactional
+    //@Transactional
     @PostMapping(value = "/DynamicBatchMatchCarriageWeight")
     public RESTfulResult DynamicBatchMatchCarriageWeight(@RequestBody List<MeterWorkRailwayReceived> receivedList) {
         RESTfulResult rm = failed();

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

@@ -7950,6 +7950,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetManName(userName);
                         actualRow.setNetTime(new Date());
                         actualRow.setMemo("标识皮结净");
+                        actualRow.setNote(receivedModel.getMemo());
                         actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -8039,6 +8040,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetManName(userName);
                         actualRow.setNetTime(new Date());
                         actualRow.setMemo("标识皮结净");
+                        actualRow.setNote(receivedModel.getMemo());
                         actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -8057,6 +8059,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     logModel.setOperationBeforeFix(receivedModel.toString());
                     logModel.setOperationAfterFix(grossModel.toString());
                     meterBaseOperationLogMapper.insertSelective(logModel);
+
+                    if(receivedModel.getMemo()!=null&&!"".equals(receivedModel)){
+                        MeterBaseOperationLog logModel2 = new MeterBaseOperationLog();
+                        logModel2.setId(PublicMethod.IdCreate(2));
+                        logModel2.setCreateManNo(userId);
+                        logModel2.setCreateManName(userName);
+                        logModel2.setCreateTime(new Date());
+                        logModel2.setOperationPage("C#端-动轨净重数据维护");
+                        logModel2.setOperationFunction("AI标识皮结净报警处理");
+                        logModel2.setOperationId(actualRow.getActualNo());
+                        logModel2.setOperationPredictionNo(actualRow.getPredictionNo());
+                        logModel2.setOperationCarnNo(actualRow.getRailwayNo());
+                        logModel2.setOperationBeforeFix(receivedModel.toString());
+                        logModel2.setOperationAfterFix(actualRow.toString());
+                        meterBaseOperationLogMapper.insertSelective(logModel2);
+                    }
                 }else {
                     carList.add(receivedModel.getRailwayNo());
                 }
@@ -8223,6 +8241,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetManName(userName);
                         actualRow.setNetTime(new Date());
                         actualRow.setMemo("规则皮结净");
+                        actualRow.setNote(receivedModel.getMemo());
                         actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -8311,6 +8330,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setNetManName(userName);
                         actualRow.setNetTime(new Date());
                         actualRow.setMemo("规则皮结净");
+                        actualRow.setNote(receivedModel.getMemo());
                         actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
@@ -8330,6 +8350,21 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     logModel.setOperationBeforeFix(receivedModel.toString());
                     logModel.setOperationAfterFix(grossModel.toString());
                     meterBaseOperationLogMapper.insertSelective(logModel);
+                    if(receivedModel.getMemo()!=null&&!"".equals(receivedModel)){
+                        MeterBaseOperationLog logModel2 = new MeterBaseOperationLog();
+                        logModel2.setId(PublicMethod.IdCreate(2));
+                        logModel2.setCreateManNo(userId);
+                        logModel2.setCreateManName(userName);
+                        logModel2.setCreateTime(new Date());
+                        logModel2.setOperationPage("C#端-动轨净重数据维护");
+                        logModel2.setOperationFunction("AI标识皮结净报警处理");
+                        logModel2.setOperationId(actualRow.getActualNo());
+                        logModel2.setOperationPredictionNo(actualRow.getPredictionNo());
+                        logModel2.setOperationCarnNo(actualRow.getRailwayNo());
+                        logModel2.setOperationBeforeFix(receivedModel.toString());
+                        logModel2.setOperationAfterFix(actualRow.toString());
+                        meterBaseOperationLogMapper.insertSelective(logModel2);
+                    }
                 }else {
                     carList.add(receivedModel.getRailwayNo());
                 }
@@ -8520,6 +8555,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setUpdateManName(userName);
                         actualRow.setUpdateTime(new Date());
                         actualRow.setMemo("回空皮结净");
+                        actualRow.setNote(receivedModel.getMemo());
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                         //更新预报数
@@ -8623,6 +8659,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         actualRow.setUpdateManName(userName);
                         actualRow.setUpdateTime(new Date());
                         actualRow.setMemo("回空皮结净");
+                        actualRow.setNote(receivedModel.getMemo());
                         meterWorkRailwayActualMapper.insertSelective(actualRow);
 
                         count++;
@@ -8640,6 +8677,21 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                     logModel.setOperationBeforeFix(receivedModel.toString());
                     logModel.setOperationAfterFix(grossModel.toString());
                     meterBaseOperationLogMapper.insertSelective(logModel);
+                    if(receivedModel.getMemo()!=null&&!"".equals(receivedModel)){
+                        MeterBaseOperationLog logModel2 = new MeterBaseOperationLog();
+                        logModel2.setId(PublicMethod.IdCreate(2));
+                        logModel2.setCreateManNo(userId);
+                        logModel2.setCreateManName(userName);
+                        logModel2.setCreateTime(new Date());
+                        logModel2.setOperationPage("C#端-动轨净重数据维护");
+                        logModel2.setOperationFunction("AI标识皮结净报警处理");
+                        logModel2.setOperationId(actualRow.getActualNo());
+                        logModel2.setOperationPredictionNo(actualRow.getPredictionNo());
+                        logModel2.setOperationCarnNo(actualRow.getRailwayNo());
+                        logModel2.setOperationBeforeFix(receivedModel.toString());
+                        logModel2.setOperationAfterFix(actualRow.toString());
+                        meterBaseOperationLogMapper.insertSelective(logModel2);
+                    }
                 }else {
                     carList.add(receivedModel.getRailwayNo());
                 }
@@ -9944,7 +9996,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         String no = PublicMethod.IdCreate(3);
                         actualModel.setActualNo(no);
                         actualModel.setNetMode("1");
-                        actualModel.setNote("一次批量匹配" + msg);
+                        actualModel.setNote("一次批量匹配" + msg+","+model.get("memo"));
                         actualModel.setMemo("一次批量匹配" + msg);
                         actualModel.setUploadFlag("1");
                         actualModel.setIsPreSacale("1");
@@ -9972,6 +10024,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         }
                         meterWorkRailwayActualMapper.insertSelective(actualModel);
 
+                        if(model.get("memo")!=null&&!"".equals((String)model.get("memo"))){
+                            MeterBaseOperationLog logModel2 = new MeterBaseOperationLog();
+                            logModel2.setId(PublicMethod.IdCreate(2));
+                            logModel2.setCreateManNo(userId);
+                            logModel2.setCreateManName(userName);
+                            logModel2.setCreateTime(new Date());
+                            logModel2.setOperationPage("web端-轨道衡净重数据维护");
+                            logModel2.setOperationFunction("web端一次批量处理结净报警");
+                            logModel2.setOperationId(actualModel.getActualNo());
+                            logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
+                            logModel2.setOperationCarnNo(actualModel.getRailwayNo());
+                            logModel2.setOperationBeforeFix(model.toString());
+                            logModel2.setOperationAfterFix(actualModel.toString());
+                            meterBaseOperationLogMapper.insertSelective(logModel2);
+                        }
+
                         scale.setValueFlag("2");
                         scale.setUpdateManNo(userId);
                         scale.setUpdateManName(userName);
@@ -10010,7 +10078,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualModel.setActualNo(no);
                             actualModel.setTareWeight(tareWeight);
                             actualModel.setNetMode("1");
-                            actualModel.setNote("一次批量匹配" + msg);
+                            actualModel.setNote("一次批量匹配" + msg+","+model.get("memo"));
                             actualModel.setMemo("一次批量匹配" + msg);
                             actualModel.setUploadFlag("1");
                             actualModel.setIsPreSacale("1");
@@ -10039,6 +10107,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             }
                             meterWorkRailwayActualMapper.insertSelective(actualModel);
 
+                            if(model.get("memo")!=null&&!"".equals((String)model.get("memo"))){
+                                MeterBaseOperationLog logModel2 = new MeterBaseOperationLog();
+                                logModel2.setId(PublicMethod.IdCreate(2));
+                                logModel2.setCreateManNo(userId);
+                                logModel2.setCreateManName(userName);
+                                logModel2.setCreateTime(new Date());
+                                logModel2.setOperationPage("web端-轨道衡净重数据维护");
+                                logModel2.setOperationFunction("web端一次批量处理结净报警");
+                                logModel2.setOperationId(actualModel.getActualNo());
+                                logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
+                                logModel2.setOperationCarnNo(actualModel.getRailwayNo());
+                                logModel2.setOperationBeforeFix(model.toString());
+                                logModel2.setOperationAfterFix(actualModel.toString());
+                                meterBaseOperationLogMapper.insertSelective(logModel2);
+                            }
+
                             scale.setValueFlag("2");
                             scale.setUpdateManNo(userId);
                             scale.setUpdateManName(userName);
@@ -10085,7 +10169,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         String no = PublicMethod.IdCreate(3);
                         actualModel.setActualNo(no);
                         actualModel.setNetMode("1");
-                        actualModel.setNote("一次批量匹配" + msg);
+                        actualModel.setNote("一次批量匹配" + msg+","+model.get("memo"));
                         actualModel.setMemo("一次批量匹配" + msg);
                         actualModel.setUploadFlag("1");
                         actualModel.setIsPreSacale("0");
@@ -10111,6 +10195,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
                         }
                         meterWorkRailwayActualMapper.insertSelective(actualModel);
+
+                        if(model.get("memo")!=null&&!"".equals((String)model.get("memo"))){
+                            MeterBaseOperationLog logModel2 = new MeterBaseOperationLog();
+                            logModel2.setId(PublicMethod.IdCreate(2));
+                            logModel2.setCreateManNo(userId);
+                            logModel2.setCreateManName(userName);
+                            logModel2.setCreateTime(new Date());
+                            logModel2.setOperationPage("web端-轨道衡净重数据维护");
+                            logModel2.setOperationFunction("web端一次批量处理结净报警");
+                            logModel2.setOperationId(actualModel.getActualNo());
+                            logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
+                            logModel2.setOperationCarnNo(actualModel.getRailwayNo());
+                            logModel2.setOperationBeforeFix(model.toString());
+                            logModel2.setOperationAfterFix(actualModel.toString());
+                            meterBaseOperationLogMapper.insertSelective(logModel2);
+                        }
+
                         count ++;
                     }else {
                         if(tareWeight.compareTo(new BigDecimal(0)) != 0 && tareWeight.compareTo(new BigDecimal(35000)) < 0) {
@@ -10136,7 +10237,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualModel.setActualNo(no);
                             actualModel.setTareWeight(tareWeight);
                             actualModel.setNetMode("1");
-                            actualModel.setNote("一次批量匹配" + msg);
+                            actualModel.setNote("一次批量匹配" + msg+","+model.get("memo"));
                             actualModel.setMemo("一次批量匹配" + msg);
                             actualModel.setUploadFlag("1");
                             actualModel.setIsPreSacale("0");
@@ -10163,6 +10264,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             }
                             meterWorkRailwayActualMapper.insertSelective(actualModel);
 
+                            if(model.get("memo")!=null&&!"".equals((String)model.get("memo"))){
+                                MeterBaseOperationLog logModel2 = new MeterBaseOperationLog();
+                                logModel2.setId(PublicMethod.IdCreate(2));
+                                logModel2.setCreateManNo(userId);
+                                logModel2.setCreateManName(userName);
+                                logModel2.setCreateTime(new Date());
+                                logModel2.setOperationPage("web端-轨道衡净重数据维护");
+                                logModel2.setOperationFunction("web端一次批量处理结净报警");
+                                logModel2.setOperationId(actualModel.getActualNo());
+                                logModel2.setOperationPredictionNo(actualModel.getPredictionNo());
+                                logModel2.setOperationCarnNo(actualModel.getRailwayNo());
+                                logModel2.setOperationBeforeFix(model.toString());
+                                logModel2.setOperationAfterFix(actualModel.toString());
+                                meterBaseOperationLogMapper.insertSelective(logModel2);
+                            }
+
                             count ++;
                         }
                     }