后端修改

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

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.databind.node.BigIntegerNode;
 import com.google.inject.internal.cglib.proxy.$UndeclaredThrowableException;
 import com.steerinfo.baseinfo.combaseinfo.mapper.ComBaseInfoMapper;
 import com.steerinfo.baseinfo.meterbasematterinfo.mapper.MeterBaseMatterInfoMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
+import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.mapper.MeterBaseRailwayAiweightMapper;
 import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiweight;
 import com.steerinfo.baseinfo.meterbaserailwaycarriageweight.mapper.MeterBaseRailwayCarriageWeightMapper;
@@ -89,7 +91,6 @@ import java.util.stream.Collectors;
 @Service(value = "meterWorkRailwayActFirstService")
 public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWorkRailwayActFirst, String> implements IMeterWorkRailwayActFirstService {
 
-
     @Resource
     private MeterWorkRailwayActFirstMapper meterWorkRailwayActFirstMapper;
 
@@ -132,6 +133,9 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Resource
     private MeterWorkImageMapper meterWorkImageMapper;
 
+    @Resource
+    private MeterBaseOperationLogMapper meterBaseOperationLogMapper;
+
     @Resource
     private MeterBaseRailwayHisTareDetailMapper meterBaseRailwayHisTareDetailMapper;
 
@@ -2848,7 +2852,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 BeanUtils.copyProperties(first2, tareModel);
                 grossModel.setIsPreSacale("1");
                 tareModel.setIsPreSacale("1");
-
                 //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAddPre(grossModel.getActualFirstNo(), tareModel.getActualFirstNo(), predictionNo);
                 BeanUtils.copyProperties(mwca1, actualRow);
@@ -2864,7 +2867,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 scale.setMeasureStation(actualRow.getNetSpot3No());
                 scale.setMeasureStationName(actualRow.getNetSpot3Name());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
-
             } else {
                 //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
                 MeterWorkRailwayActual mwca1 = meterWorkRailwayActualMapper.manualAdd(grossModel.getActualFirstNo(), tareModel.getActualFirstNo());
@@ -2903,7 +2905,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getGrossTime());
                 actualRow.setCreateTime(actualRow.getGrossTime());
                 actualRow.setCreateManName(actualRow.getGrossManName());
-                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             }else {
                 actualRow.setNetSpot3No(actualRow.getBaseSpot2No());
                 actualRow.setNetSpot3Name(actualRow.getBaseSpot2Name());
@@ -2912,8 +2913,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 actualRow.setNetTime(actualRow.getTareTime());
                 actualRow.setCreateTime(actualRow.getTareTime());
                 actualRow.setCreateManName(actualRow.getTareManName());
-                actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst2No()));
             }
+            actualRow.setLcNo(meterWorkRailwayActFirstMapper.getFirstLcNo(actualRow.getActualFirst1No()));
             meterWorkRailwayActualMapper.insertSelective(actualRow);
             return "操作成功";
         }
@@ -3231,18 +3232,26 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActFirst match(String actualFirstNo, String predictionNo) {
         try {
+            UserPayload userPayload = UserPayload.getCurrUser();
+            String userId = userPayload.getUserCode();
+            String userName = userPayload.getUserName();
+
             if (actualFirstNo == null || "".equals(actualFirstNo)) {
                 throw new MarkerMetException(500, "计量作业编号为空!!");
             }
             if (predictionNo == null || "".equals(predictionNo)) {
                 throw new MarkerMetException(500, "预报编号为空!!");
             }
+
             PreRailwayScale prs = preRailwayScaleMapper.selectByPrimaryKey(predictionNo);
             if (prs == null) {
                 throw new MarkerMetException(500, "该预报信息不存在");
             }
-            prs.setValueFlag(DbConstants.IN); //使用中
-            prs.setUploadFlag("1");
+            if (prs.getValueFlag().equals("2")) {
+                throw new MarkerMetException(500, "该预报信息已匹配");
+            }
+
+
             MeterWorkRailwayActFirst meterWorkRailwayActFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualFirstNo);
             if (meterWorkRailwayActFirst == null) {
                 throw new MarkerMetException(500, "该计量作业信息不存在");
@@ -3252,13 +3261,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             MeterWorkRailwayActFirst model = meterWorkRailwayActFirstMapper.selectAndMatch(actualFirstNo, predictionNo);
             model.setValueFlag("1");
+            model.setUpdateManNo(userId);
+            model.setUpdateManName(userName);
             model.setUpdateTime(new Date());
-            model.setUpdateManNo("system");
+            model.setNote("一次计量匹配委托操作");
             model.setIsPreSacale("1");
-            model.setUpdateManName("火车一次计量匹配操作");
+
+            prs.setValueFlag(DbConstants.IN); //使用中
+            prs.setUploadFlag("1");
+            prs.setUpdateManNo(userId);
+            prs.setUpdateManName(userName);
             prs.setUpdateTime(new Date());
-            prs.setUpdateManNo("system");
-            prs.setUpdateManName("火车一次计量匹配操作");
             prs.setMeasureStation(model.getBaseSpotNo());
             prs.setMeasureStationName(model.getBaseSpotName());
 
@@ -3288,6 +3301,20 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 //            prs.setNote(); 需要添加修改原因写入
             preRailwayScaleMapper.updateByPrimaryKeySelective(prs);
             meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("一次数据维护");
+            logModel.setOperationFunction("匹配委托");
+            logModel.setOperationId(model.getActualFirstNo());
+            logModel.setOperationPredictionNo(predictionNo);
+            logModel.setOperationCarnNo(model.getRailwayNo());
+            logModel.setOperationBeforeFix(meterWorkRailwayActFirst.toString());
+            logModel.setOperationAfterFix(model.toString());
+            meterBaseOperationLogMapper.insertSelective(logModel);
             return model;
         } catch (MarkerMetException e) {
             throw e;

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

@@ -3005,9 +3005,9 @@
            T3.customer_supplier_name CUSTOMER_SUPPLIER_NAME, T3.forwarding_unit_no FORWARDING_UNIT_NO, T3.forwarding_unit_name FORWARDING_UNIT_NAME,
            T3.receiving_uint_no RECEIVING_UINT_NO, T3.receiving_uint_name RECEIVING_UINT_NAME, T3.material_no MATERIAL_NO,
            t1.voucher_identity, t1.voucher_item, t1.business_group, t1.temp_conveyance, t1.conveyance_type,
-           t1.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
+           T3.resource_system, t1.group_package_amount, t1.group_package_unit, t1.package_amount,
            t1.package_unit, t1.theory_amount, t1.measure_batch,t1.measure_batch_count,t1.sender_type,
-           t1.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,t1.data_source,
+           t1.sender_remark,t1.receiver_type, t1.receiver_remark,T3.amount_unit,t1.data_source,
            T3.material_name MATERIAL_NAME, T3.spec_no SPEC_NO, T3.spec_name SPEC_NAME, T3.load_point_no LOAD_POINT_NO, T3.load_point_name LOAD_POINT_NAME,
            T3.sample_no SAMPLE_NO,T3.sample_voucher SAMPLE_VOUCHER,T3.carrier_unit_no CARRIER_UNIT_NO,T3.carrier_unit_name CARRIER_UNIT_NAME,
            T3.meter_type_no METER_TYPE_NO, T3.meter_type_name METER_TYPE_NAME,T1.meter_process_no METER_PROCESS_NO, T1.meter_process_edition_no METER_PROCESS_EDITION_NO,
@@ -3038,7 +3038,7 @@
            t.net_mode,t.value_flag,t.upload_flag,t.check_man_no,t.check_man_name,t.check_time,
            t.upload_man_no,t.upload_man_name,t.upload_time,t.sample_no,t.railway_type_no,t.data_source,
            t.railway_type_name, t.memo,t.water_num,t1.arrival,t1.station,t.update_man_no, t.create_time, t.create_man_name,
-           t.update_man_name, t.update_time,t.source_area
+           t.update_man_name, t.update_time,t.source_area, t.lc_no
     from meter_work_railway_actual t, pre_railway_scale t1 where t.actual_no = #{actualNo,jdbcType=VARCHAR} and t1.prediction_no = #{predictionNo,jdbcType=VARCHAR}
   </select>