后端修改

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/controller/MeterBaseTermTareDataController.java

@@ -261,7 +261,7 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
-    @ApiOperation(value = "根据Id手动保存期限皮")
+    @ApiOperation(value = "web端-根据Id手动保存期限皮")
     @Transactional
     @GetMapping(value = "/doSaveTerm")
     public RESTfulResult doSaveTerm(@RequestParam String id) {

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/service/impl/MeterBaseTermTareDataServiceImpl.java

@@ -6,6 +6,8 @@ import com.steerinfo.baseinfo.meterbasehistaredata.mapper.MeterBaseHisTareDataMa
 import com.steerinfo.baseinfo.meterbasehistaredata.model.MeterBaseHisTareData;
 import com.steerinfo.baseinfo.meterbasehistaredetail.mapper.MeterBaseHisTareDetailMapper;
 import com.steerinfo.baseinfo.meterbasehistaredetail.model.MeterBaseHisTareDetail;
+import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbasetermtarecar.mapper.MeterBaseTermTareCarMapper;
 import com.steerinfo.baseinfo.meterbasetermtarecar.model.MeterBaseTermTareCar;
 import com.steerinfo.baseinfo.meterbasetermtaretime.mapper.MeterBaseTermTareTimeMapper;
@@ -23,6 +25,7 @@ import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.util.FieldsCollector;
+import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,6 +61,9 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
     @Resource
     private MeterBaseCarMapper meterBaseCarMapper;
 
+    @Resource
+    private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
+
     @Resource
     private MeterBaseTermTareCarMapper meterBaseTermTareCarMapper;
 
@@ -368,6 +374,20 @@ public class MeterBaseTermTareDataServiceImpl extends BaseServiceImpl<MeterBaseT
                 model.setDataNo(modelTerm.getDataNo());
                 meterBaseTermTareDataMapper.updateByPrimaryKeySelective(model);
             }
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-汽车衡一次数据维护");
+            logModel.setOperationFunction("留存期限皮");
+            logModel.setOperationId(modelTemp.getActualFirstNo());
+            logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
+            logModel.setOperationCarnNo(modelTemp.getCarNo());
+            logModel.setOperationBeforeFix("重量：" + modelTemp.getMeterWeight().toString());
+            meterBaseOperationLogMapper.insertSelective(logModel);
+
             rm.setSucceed();
             rm.setCode("200");
             rm.setMessage("操作成功");

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

@@ -843,13 +843,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                     logModel.setCreateManNo(modelTemp.getUpdateManNo());
                     logModel.setCreateManName(modelTemp.getUpdateManName());
                     logModel.setCreateTime(new Date());
-                    logModel.setOperationPage("汽车衡净重数据维护");
+                    logModel.setOperationPage("web端-汽车衡净重数据维护");
                     if(type.equals("5")){
-                        logModel.setOperationFunction("汽车衡双委托洁净作废");
+                        logModel.setOperationFunction("取消双委托洁净");
                     }else if(type.equals("6")) {
-                        logModel.setOperationFunction("汽车衡混卸委托洁净作废");
+                        logModel.setOperationFunction("取消混卸洁净");
                     }else if(type.equals("7")) {
-                        logModel.setOperationFunction("汽车衡混装委托洁净作废");
+                        logModel.setOperationFunction("取消混装洁净");
                     }
                     logModel.setOperationId(model.getActualNo());
                     logModel.setOperationPredictionNo(model.getPredictionNo());
@@ -1029,8 +1029,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 logModel.setCreateManNo(userId);
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
-                logModel.setOperationPage("汽车衡净重数据维护");
-                logModel.setOperationFunction("汽车衡洁净作废");
+                logModel.setOperationPage("web端-汽车衡净重数据维护");
+                logModel.setOperationFunction("洁净废除");
                 logModel.setOperationId(model.getActualNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
                 logModel.setOperationCarnNo(model.getRailwayNo());
@@ -1264,6 +1264,20 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 preTrackScaleMapper.updateByPrimaryKeySelective(scale);
             }
 
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-汽车衡净重数据维护");
+            logModel.setOperationFunction("匹配委托");
+            logModel.setOperationId(model.getActualNo());
+            logModel.setOperationPredictionNo(predictionNo);
+            logModel.setOperationCarnNo(model.getCarNo());
+            logModel.setOperationBeforeFix(model.toString());
+            logModel.setOperationAfterFix(mwca.toString());
+            meterBaseOperationLogMapper.insertSelective(logModel);
+
             rm.setSucceed();
             rm.setCode("200");
             rm.setData(mwca);
@@ -1342,6 +1356,20 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         mwca.setIsPreScale("0");
         mwca.setUploadFlag("1");
         meterWorkCarActualMapper.updateByPrimaryKey(mwca);
+
+        MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+        logModel.setId(PublicMethod.IdCreate(2));
+        logModel.setCreateManNo(userId);
+        logModel.setCreateManName(userName);
+        logModel.setCreateTime(new Date());
+        logModel.setOperationPage("web端-汽车衡净重数据维护");
+        logModel.setOperationFunction("毛皮分解");
+        logModel.setOperationId(mwcaquery.getActualNo());
+        logModel.setOperationPredictionNo(mwcaquery.getPredictionNo());
+        logModel.setOperationCarnNo(mwcaquery.getCarNo());
+        logModel.setOperationBeforeFix(mwcaquery.toString());
+        logModel.setOperationAfterFix(mwca.toString());
+        meterBaseOperationLogMapper.insertSelective(logModel);
         return mwca;
     }
     /**

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

@@ -672,7 +672,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 logModel.setCreateManName(userName);
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("web端-汽车衡一次数据维护");
-                logModel.setOperationFunction("汽车衡撤销委托");
+                logModel.setOperationFunction("解绑委托");
                 logModel.setOperationId(model.getActualFirstNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
                 logModel.setOperationCarnNo(model.getCarNo());
@@ -755,7 +755,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             logModel.setCreateManName(userName);
             logModel.setCreateTime(new Date());
             logModel.setOperationPage("web端-汽车衡一次数据维护");
-            logModel.setOperationFunction("汽车衡匹配委托");
+            logModel.setOperationFunction("匹配委托");
             logModel.setOperationId(model.getActualFirstNo());
             logModel.setOperationPredictionNo(model.getPredictionNo());
             logModel.setOperationCarnNo(model.getCarNo());
@@ -4015,6 +4015,18 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setMeasureStation(actualRow2.getNetSpot3No());
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-汽车衡一次数据维护");
+            logModel.setOperationFunction("混装委托结净");
+            logModel.setOperationId(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
+            logModel.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel.setOperationCarnNo(actualRow1.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
         }
         catch (Exception e){
             e.printStackTrace();
@@ -4257,6 +4269,18 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setMeasureStation(actualRow2.getNetSpot3No());
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-汽车衡一次数据维护");
+            logModel.setOperationFunction("混卸委托结净");
+            logModel.setOperationId(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
+            logModel.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel.setOperationCarnNo(actualRow1.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
         }
         catch (Exception e){
             e.printStackTrace();
@@ -4352,9 +4376,14 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 //                }
 //            }
 
-            if(!(pts01.getMatterNo().equals(pts02.getMatterNo()) &&
-                    (pts01.getReceivingUintNo().equals(pts02.getForwardingUnitNo()) ||
-                            pts01.getForwardingUnitNo().equals(pts02.getReceivingUintNo())))) {
+//            if(!(pts01.getMatterNo().equals(pts02.getMatterNo()) &&
+//                    (pts01.getReceivingUintNo().equals(pts02.getForwardingUnitNo()) ||
+//                            pts01.getForwardingUnitNo().equals(pts02.getReceivingUintNo())))) {
+//                rm.setMessage("委托信息不符合双委托规则，请确认!!");
+//                return rm;
+//            }
+            if(!(pts01.getReceivingUintNo().equals(pts02.getForwardingUnitNo()) ||
+                            pts01.getForwardingUnitNo().equals(pts02.getReceivingUintNo()))) {
                 rm.setMessage("委托信息不符合双委托规则，请确认!!");
                 return rm;
             }
@@ -4362,11 +4391,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 rm.setMessage("两条一次计量数据车号不一致,请确认！！");
                 return rm;
             }
-            //结净数据不能小于400
-            if(num01.compareTo(BigDecimal.valueOf(400)) == -1){
-                rm.setMessage("选择的两条一次计量数据不能小于400，请确认！！");
-                return rm;
-            }
             //委托信息是否为有效数据
             if(pts01.getValueFlag().equals("2") || pts02.getValueFlag().equals("2")){
                 rm.setMessage("委托信息已使用，请确认！！");
@@ -4570,6 +4594,18 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preTrackScaleMapper.updateByPrimaryKeySelective(scale1);
 
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-汽车衡一次数据维护");
+            logModel.setOperationFunction("双委托结净");
+            logModel.setOperationId(actualNo1 + "+" + actualNo2);
+            logModel.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel.setOperationCarnNo(actualRow1.getCarNo());
+            meterBaseOperationLogMapper.insertSelective(logModel);
+
             rm.setSucceed();
             rm.setMessage("操作成功!!");
             rm.setCode("200");
@@ -5688,7 +5724,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     logModel.setCreateManNo(userId);
                     logModel.setCreateManName(userName);
                     logModel.setCreateTime(new Date());
-                    logModel.setOperationPage("web端-一次数据维护");
+                    logModel.setOperationPage("web端-汽车衡一次数据维护");
                     logModel.setOperationFunction("期限皮洁净");
                     logModel.setOperationId(grossModel.getActualFirstNo());
                     logModel.setOperationPredictionNo(grossModel.getPredictionNo());
@@ -5766,7 +5802,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     logModel.setCreateManNo(userId);
                     logModel.setCreateManName(userName);
                     logModel.setCreateTime(new Date());
-                    logModel.setOperationPage("web端-一次数据维护");
+                    logModel.setOperationPage("web端-汽车衡一次数据维护");
                     logModel.setOperationFunction("期限皮洁净");
                     logModel.setOperationId(grossModel.getActualFirstNo());
                     logModel.setOperationPredictionNo(grossModel.getPredictionNo());

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

@@ -2407,19 +2407,19 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 return "请根据一次数据从大到小的规则，依次选择两条一次数据！！";
             }
             //判断双委托 物料相同、A委托的收货单位是B委托的发货单位 或者 B委托的收货单位是A委托的发货单位
-            if (!(pts01.getMatterNo().equals(pts02.getMatterNo()) &&
-                    (pts01.getReceivingUintNo().equals(pts02.getForwardingUnitNo()) ||
-                            pts01.getForwardingUnitNo().equals(pts02.getReceivingUintNo())))) {
+//            if (!(pts01.getMatterNo().equals(pts02.getMatterNo()) &&
+//                    (pts01.getReceivingUintNo().equals(pts02.getForwardingUnitNo()) ||
+//                            pts01.getForwardingUnitNo().equals(pts02.getReceivingUintNo())))) {
+//                return "委托信息不符合双委托规则，请确认!!";
+//            }
+            if (!(pts01.getReceivingUintNo().equals(pts02.getForwardingUnitNo()) ||
+                            pts01.getForwardingUnitNo().equals(pts02.getReceivingUintNo()))) {
                 return "委托信息不符合双委托规则，请确认!!";
             }
 
             if (!mwcaf01.getRailwayNo().equals(mwcaf03.getRailwayNo())) {
                 return "两条一次计量数据车号不一致,请确认！！";
             }
-            //结净数据不能小于400
-            /*if(num01.compareTo(BigDecimal.valueOf(400)) == -1){
-                return "选择的两条一次计量数据不能小于400kg，请确认！！";
-            }*/
             //委托信息是否为有效数据
             if (pts01.getValueFlag().equals("2") || pts02.getValueFlag().equals("2")) {
                 return "委托信息已使用！！";