修改

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -1083,4 +1083,11 @@ throw new MarkerMetException(500, "操作异常！！");
         }
         return rm;
     }
+
+    @ApiOperation(value = "修改报表操作原因", notes = "将净重数据进行操作员修改,参数：List<MeterWorkCarActual>")
+    @PostMapping(value = "/updateNote")
+    public RESTfulResult updateNote(@RequestBody List<MeterWorkCarActual> models) {
+        return meterWorkCarActualService.updateNote(models);
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -4684,7 +4684,8 @@
   </select>
 
   <select id="smallAndNegativeNetWeightRatio" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    select A.car_no,
+    select A.actual_no,
+    A.car_no,
     A.prediction_no,
     A.matter_name,
     A.gross_weight,

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -114,4 +114,5 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
     List<MeterWorkCarActualTHJCompare> findCommonAndInnerDouble(HashMap params);
     PageList<MeterWorkCarActual> smallAndNegativeNetWeightRatio(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 
+    RESTfulResult updateNote(List<MeterWorkCarActual> models);
 }

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

@@ -46,6 +46,7 @@ import com.steerinfo.util.CommonPage;
 import com.steerinfo.util.FieldsCollector;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
+import org.apache.catalina.User;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -3238,31 +3239,31 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         && model.get("BASE_SPOT_NAME") != null
                         && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
                         && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
-                        && model.get("OPERATION_FUNCTION").equals("匹配委托")).count();
+                        && model.get("OPERATION_FUNCTION").toString().contains("匹配委托")).count();
                 countLogFirstIsNotPreScale = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
                         && model.get("BASE_SPOT_NO") != null
                         && model.get("BASE_SPOT_NAME") != null
                         && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
                         && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
-                        && model.get("OPERATION_FUNCTION").equals("撤销委托")).count();
+                        && model.get("OPERATION_FUNCTION").toString().contains("撤销委托")).count();
                 countLogFirstUpdateCar = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
                         && model.get("BASE_SPOT_NO") != null
                         && model.get("BASE_SPOT_NAME") != null
                         && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
                         && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
-                        && model.get("OPERATION_FUNCTION").equals("车号修改")).count();
+                        && model.get("OPERATION_FUNCTION").toString().contains("车号修改")).count();
                 countLogFirstValid = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
                         && model.get("BASE_SPOT_NO") != null
                         && model.get("BASE_SPOT_NAME") != null
                         && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
                         && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
-                        && model.get("OPERATION_FUNCTION").equals("作废")).count();
+                        && model.get("OPERATION_FUNCTION").toString().contains("作废")).count();
                 countLogFirstRecover = carFirstLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
                         && model.get("BASE_SPOT_NO") != null
                         && model.get("BASE_SPOT_NAME") != null
                         && model.get("BASE_SPOT_NO").equals(spot.getBaseSpotNo())
                         && model.get("BASE_SPOT_NAME").equals(spot.getBaseSpotName())
-                        && model.get("OPERATION_FUNCTION").equals("启用")).count();
+                        && model.get("OPERATION_FUNCTION").toString().contains("启用")).count();
             }
 
             long countLogActualIsPreScale = 0L;
@@ -3332,14 +3333,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
                         && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
                         && model.get("OPERATION_PAGE").equals("web端-汽车衡净重数据维护")
-                        && model.get("OPERATION_FUNCTION").equals("匹配委托")).count();
+                        && model.get("OPERATION_FUNCTION").toString().contains("匹配委托")).count();
                 countLogActualIsNotPreScale = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
                         && model.get("NET_SPOT3_NO") != null
                         && model.get("NET_SPOT3_NAME") != null
                         && model.get("NET_SPOT3_NO").equals(spot.getBaseSpotNo())
                         && model.get("NET_SPOT3_NAME").equals(spot.getBaseSpotName())
                         && model.get("OPERATION_PAGE").equals("web端-汽车衡净重数据维护")
-                        && model.get("OPERATION_FUNCTION").equals("撤销委托")).count();
+                        && model.get("OPERATION_FUNCTION").toString().contains("撤销委托")).count();
                 countLogActualDecompose = carActualLog.stream().filter(model -> model.get("OPERATION_FUNCTION") != null
                         && model.get("NET_SPOT3_NO") != null
                         && model.get("NET_SPOT3_NAME") != null
@@ -3524,4 +3525,35 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return pageInfo;
     }
 
+    @Override
+    public RESTfulResult updateNote(List<MeterWorkCarActual> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try{
+            UserPayload userPayload = UserPayload.getCurrUser();
+            String userId = userPayload.getUserCode();
+            String userName = userPayload.getUserName();
+            int count = 0;
+            if(models.size() >= 1) {
+                for(MeterWorkCarActual model: models) {
+                    model.setUpdateManNo(userId);
+                    model.setUpdateManName(userName);
+                    model.setUpdateTime(new Date());
+                    meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
+                    count ++;
+                }
+            }else {
+                rm.setMessage("未选择一次数据，请重新选择");
+            }
+            rm.setSucceed(true);
+            rm.setData(models);
+            rm.setMessage("操作成功，总共" + count + "条数据修改成功!!");
+        }catch(Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setMessage("操作异常" + e.getMessage());
+        }
+        return rm;
+    }
+
 }

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

@@ -9663,7 +9663,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
                             actualModel.setNetManNo(userId);
                             actualModel.setNetManName(userName);
-                            actualModel.setNetTime(new Date());
+                            actualModel.setNetTime(actualModel.getGrossTime());
                             actualModel.setCreateTime(actualModel.getNetTime());
                             actualModel.setCreateManName(userName);
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
@@ -9672,7 +9672,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                             actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
                             actualModel.setNetManNo(userId);
                             actualModel.setNetManName(userName);
-                            actualModel.setNetTime(new Date());
+                            actualModel.setNetTime(actualModel.getTareTime());
                             actualModel.setCreateTime(actualModel.getNetTime());
                             actualModel.setCreateManName(userName);
                             actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));
@@ -9851,7 +9851,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                                 actualModel.setNetSpot3Name(actualModel.getBaseSpot1Name());
                                 actualModel.setNetManNo(userId);
                                 actualModel.setNetManName(userName);
-                                actualModel.setNetTime(actualModel.getGrossTime());
+                                actualModel.setNetTime(new Date());
                                 actualModel.setCreateTime(actualModel.getGrossTime());
                                 actualModel.setCreateManName(userName);
                                 actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst1No()));
@@ -9860,7 +9860,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                                 actualModel.setNetSpot3Name(actualModel.getBaseSpot2Name());
                                 actualModel.setNetManNo(userId);
                                 actualModel.setNetManName(userName);
-                                actualModel.setNetTime(actualModel.getTareTime());
+                                actualModel.setNetTime(new Date());
                                 actualModel.setCreateTime(actualModel.getTareTime());
                                 actualModel.setCreateManName(userName);
                                 actualModel.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualModel.getActualFirst2No()));

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4277,7 +4277,9 @@
          matter_no,
          matter_name,
          sender_remark,
+         forwarding_unit_no,
          forwarding_unit_name,
+         receiving_uint_no,
          receiving_uint_name,
          meter_type_name,
          gross_weight,
@@ -4298,7 +4300,9 @@
                   A.matter_no,
                   A.matter_name,
                   A.sender_remark,
+                  A.forwarding_unit_no,
                   A.forwarding_unit_name,
+                  A.receiving_uint_no,
                   A.receiving_uint_name,
                   A.meter_type_name,
                   A.gross_weight,
@@ -4327,7 +4331,9 @@
                   A.matter_no,
                   A.matter_name,
                   A.sender_remark,
+                  A.forwarding_unit_no,
                   A.forwarding_unit_name,
+                  A.receiving_uint_no,
                   A.receiving_uint_name,
                   A.meter_type_name,
                   A.gross_weight,

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

@@ -3138,55 +3138,65 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     if(configs.size() >= 1) {
                         for(MeterBaseUserPrintConfig config: configs) {
                             //物料、发货、收货都不为空，物料、发货、收货都判断
-                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                            if(StringUtils.isNotEmpty(config.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
                                     && StringUtils.isNotEmpty(config.getReceivingUintNo())){
-                                if(model.getMatterNo().equals(config.getMatterNo()) && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
+                                if(StringUtils.isNotEmpty(model.getMatterNo())
+                                        && StringUtils.isNotEmpty(model.getForwardingUnitNo())
+                                        && StringUtils.isNotEmpty(model.getReceivingUintNo())
+                                        && model.getMatterNo().equals(config.getMatterNo())
+                                        && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
                                         && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
                                     rows.add(model);
                                 }
                             }
                             //物料为空、发货、收货判断
-                            if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                            if(StringUtils.isEmpty(config.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
                                     && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
-                                if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
+                                if(StringUtils.isNotEmpty(model.getForwardingUnitNo())
+                                        && StringUtils.isNotEmpty(model.getReceivingUintNo())
+                                        && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())
                                         && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
                                     rows.add(model);
                                 }
                             }
                             //发货为空、物料、收货判断
-                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                            if(StringUtils.isNotEmpty(config.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
                                     && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
-                                if(model.getMatterNo().equals(config.getMatterNo())
+                                if(StringUtils.isNotEmpty(model.getMatterNo())
+                                        && StringUtils.isNotEmpty(model.getReceivingUintNo())
+                                        && model.getMatterNo().equals(config.getMatterNo())
                                         && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
                                     rows.add(model);
                                 }
                             }
                             //收货为空、物料、发货判断
-                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                            if(StringUtils.isNotEmpty(config.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
                                     && StringUtils.isEmpty(config.getReceivingUintNo())) {
-                                if(model.getMatterNo().equals(config.getMatterNo())
+                                if(StringUtils.isNotEmpty(model.getMatterNo())
+                                        && StringUtils.isNotEmpty(model.getForwardingUnitNo())
+                                        && model.getMatterNo().equals(config.getMatterNo())
                                         && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
                                     rows.add(model);
                                 }
                             }
                             //物料、发货都为空， 收货判断
-                            if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                            if(StringUtils.isEmpty(config.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
                                     && StringUtils.isNotEmpty(config.getReceivingUintNo())) {
-                                if(model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
+                                if(StringUtils.isNotEmpty(model.getReceivingUintNo()) && model.getReceivingUintNo().equals(config.getReceivingUintNo())) {
                                     rows.add(model);
                                 }
                             }
                             //物料、收货都为空， 发货货判断
-                            if(StringUtils.isEmpty(model.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
+                            if(StringUtils.isEmpty(config.getMatterNo()) && StringUtils.isNotEmpty(config.getForwardingUnitNo())
                                     && StringUtils.isEmpty(config.getReceivingUintNo())) {
-                                if(model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
+                                if(StringUtils.isNotEmpty(model.getForwardingUnitNo()) && model.getForwardingUnitNo().equals(config.getForwardingUnitNo())) {
                                     rows.add(model);
                                 }
                             }
                             //发货、收货都为空， 物料判断
-                            if(StringUtils.isNotEmpty(model.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
+                            if(StringUtils.isNotEmpty(config.getMatterNo()) && StringUtils.isEmpty(config.getForwardingUnitNo())
                                     && StringUtils.isEmpty(config.getReceivingUintNo())) {
-                                if(model.getMatterNo().equals(config.getMatterNo())) {
+                                if(StringUtils.isNotEmpty(model.getMatterNo()) && model.getMatterNo().equals(config.getMatterNo())) {
                                     rows.add(model);
                                 }
                             }

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

@@ -27,6 +27,7 @@ import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.util.PublicMethod;
 import com.steerinfo.util.StringUtils;
 import org.apache.shiro.crypto.hash.Hash;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -576,6 +577,13 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
             preRailwayScale.setValueFlag("4");
             preRailwayScale.setUploadFlag("1");
             preRailwayScaleMapper.updateByPrimaryKeySelective(preRailwayScale);
+
+            if(StringUtils.isNotEmpty(model.getPredictionNo())) {
+                MeterWorkRailwayReceived firstRec1 = meterWorkRailwayReceivedMapper.selectAndMatch(model.getActualFirstNo(), preRailwayScale.getPredictionNo());
+                BeanUtils.copyProperties(firstRec1,model);
+                model.setPredictionType("1");
+                meterWorkRailwayReceivedMapper.updateByPrimaryKey(model);
+            }
             model.setRailwayNo(preRailwayScale.getRailwayNo());
             meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
             rm.setSucceed();
@@ -604,6 +612,13 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                     scale.setValueFlag("4");
                     scale.setUploadFlag("1");
                     preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
+
+                    if(StringUtils.isNotEmpty(model.getPredictionNo())) {
+                        MeterWorkRailwayReceived firstRec1 = meterWorkRailwayReceivedMapper.selectAndMatch(model.getActualFirstNo(), scale.getPredictionNo());
+                        BeanUtils.copyProperties(firstRec1,model);
+                        model.setPredictionType("1");
+                        meterWorkRailwayReceivedMapper.updateByPrimaryKey(model);
+                    }
                     model.setRailwayNo(scale.getRailwayNo());
                     model.setMatterNo(scale.getMatterNo());
                     model.setMatterName(scale.getMatterName());