提交修改

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -383,7 +383,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     if(car != null){
                         // SSO重置密码
                         SSOUtil ssoUtil = new SSOUtil();
-                        msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("password").toString(),"");
+                        msg = ssoUtil.ssoResetPwd(car.getSsoId(), params.get("newpassword").toString(),"");
                     }
                 }
                 else {

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

@@ -3110,7 +3110,7 @@
        t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
        t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
        t1.actual_first_no ACTUAL_FIRST1_NO, t1.meter_weight GROSS_WEIGHT, t1.create_man_no GROSS_MAN_NO, t1.create_man_name GROSS_MAN_NAME, t1.create_time GROSS_TIME,
-       t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,
+       t1.base_spot_no BASE_SPOT1_NO, t1.base_spot_name BASE_SPOT1_NAME,t1.meter_class GROSS_CLASS, t1.meter_group GROSS_GROUP, t1.meter_mode GROSS_MODE,t2.data_source,
        t2.actual_first_no ACTUAL_FIRST2_NO, t2.meter_weight TARE_WEIGHT, t2.create_man_no TARE_MAN_NO, t2.create_man_name TARE_MAN_NAME, t2.create_time TARE_TIME,
        t2.base_spot_no BASE_SPOT2_NO, t2.base_spot_name BASE_SPOT2_NAME, t2.meter_class TARE_CLASS, t2.meter_group TARE_GROUP,t2.meter_mode TARE_MODE,t1.METER_NUM METER_NUM
     from METER_WORK_CAR_ACTUAL_FIRST t1,METER_WORK_CAR_ACTUAL_FIRST t2
@@ -3122,7 +3122,7 @@
                T3.voucher_identity, T3.voucher_item, T3.business_group, T3.temp_conveyance, T3.conveyance_type,
                T3.resource_system, T3.group_package_amount, T3.group_package_unit, T3.package_amount,
                T3.package_unit, T3.theory_amount, T3.measure_batch,T3.measure_batch_count,T3.sender_type,
-               T3.sender_remark,T3.receiver_type, T3.receiver_remark,T3.amount_unit,
+               T3.sender_remark,T3.receiver_type, T3.receiver_remark,T3.amount_unit,t1.data_source,
                T3.matter_name MATTER_NAME, T3.contract_no CONTRACT_NO, T3.batch_no BATCH_NO, T3.customer_supplier_no CUSTOMER_SUPPLIER_NO,
                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,
@@ -3153,7 +3153,7 @@
                t.actual_first1_no, t.gross_weight, t.gross_man_no, t.gross_man_name, t.gross_time,
                t.base_spot1_no, t.base_spot1_name, t.gross_class, t.gross_group, t.gross_mode,
                t.actual_first2_no,  t.tare_weight, t.tare_man_no, t.tare_man_name, t.tare_time,
-               t.base_spot2_no, t.base_spot2_name, t.tare_class, t.tare_group, t.tare_mode,
+               t.base_spot2_no, t.base_spot2_name, t.tare_class, t.tare_group, t.tare_mode,t.data_source,
                t.net_weight, t.meter_num, t.net_man_no, t.net_man_name, t.net_time, t.net_spot3_no,
                t.net_spot3_name, t.net_group, 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.add_weight,
@@ -3168,7 +3168,7 @@
         select t.actual_no, t.actual_first1_no,t.car_no, t.gross_weight, t.gross_man_no, t.gross_man_name, t.gross_time,
                t.base_spot1_no, t.base_spot1_name, t.gross_class, t.gross_group, t.gross_mode,
                t.actual_first2_no,  t.tare_weight, t.tare_man_no, t.tare_man_name, t.tare_time,
-               t.base_spot2_no, t.base_spot2_name, t.tare_class, t.tare_group, t.tare_mode,
+               t.base_spot2_no, t.base_spot2_name, t.tare_class, t.tare_group, t.tare_mode,t.data_source,
                t.net_weight, t.meter_num, t.net_man_no, t.net_man_name, t.net_time, t.net_spot3_no,
                t.net_spot3_name, t.net_group, 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.add_weight,
@@ -3190,7 +3190,7 @@
        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,
        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.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,t1.data_source,
        t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
        t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
        t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,

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

@@ -336,7 +336,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwcaf1.setUpdateManName("system");
             mwcaf1.setUpdateManName("二次计量洁净更新");
             mwcaf1.setUpdateTime(new Date());
-            mwcaf1.setDataSource("1");
+//            mwcaf1.setDataSource("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf1);
             // 皮重数据处理
             mwcaf2.setValueFlag(DbConstants.NET);
@@ -344,7 +344,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             mwcaf2.setUpdateManName("二次计量洁净更新");
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setValueFlag(DbConstants.NET);
-            mwcaf2.setDataSource("1");
+//            mwcaf2.setDataSource("1");
             meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaf2);
 
             if (actualRow.getGrossTime().compareTo(actualRow.getTareTime()) == 1) {
@@ -361,7 +361,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             String no = meterWorkCarActualMapper.getNewID(sdf.format(new Date()));
             actualRow.setActualNo(sdf.format(new Date()) + no);
             actualRow.setNote(note);
-            actualRow.setDataSource("1");
+//            actualRow.setDataSource("1");
             actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
             meterWorkCarActualMapper.insertSelective(actualRow);
             return actualRow;
@@ -397,7 +397,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 mwcafg.setUpdateManName("system");
                 mwcafg.setUpdateManName("二次计量解除更新");
                 mwcafg.setUpdateTime(new Date());
-                mwcafg.setDataSource("1");
+//                mwcafg.setDataSource("1");
                 meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcafg);
                 //皮重
                 MeterWorkCarActualFirst mwcaf2 = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
@@ -411,14 +411,14 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         mwcaft.setValueFlag(DbConstants.INVALID); //期限皮重置为作废
                         mwcaft.setUpdateManName("system");
                         mwcaft.setUpdateManName("二次计量解除作废");
-                        mwcaft.setDataSource("1");
+//                        mwcaft.setDataSource("1");
                         mwcaft.setUpdateTime(new Date());
                     } else {
                         mwcaft.setValueFlag(DbConstants.VALID);
                         mwcaft.setUpdateManName("system");
                         mwcaft.setUpdateManName("二次计量解除更新");
                         mwcaft.setNote(model.getNote());
-                        mwcaft.setDataSource("1");
+//                        mwcaft.setDataSource("1");
                         mwcaft.setUpdateTime(new Date());
                     }
                     meterWorkCarActualFirstMapper.updateByPrimaryKey(mwcaft);

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2462,7 +2462,7 @@
         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,
         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.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,t.data_source,
         t1.MATTER_NAME, t1.CONTRACT_NO, t1.BATCH_NO, t1.CUSTOMER_SUPPLIER_NO, t1.CUSTOMER_SUPPLIER_NAME,
         t1.FORWARDING_UNIT_NO, t1.FORWARDING_UNIT_NAME, t1.RECEIVING_UINT_NO, t1.RECEIVING_UINT_NAME,
         t1.MATERIAL_NO, t1.MATERIAL_NAME, t1.SPEC_NO, t1.SPEC_NAME, t1.SHIPMENT_GROSS_WEIGHT,
@@ -2478,12 +2478,12 @@
   </select>
     <select id="selectAndRemove" parameterType="java.lang.String" resultMap="BaseResultMap">
     select TRAILER_NO,CAR_NO,ACTUAL_FIRST_NO, METER_WEIGHT, ADD_WEIGHT, METER_NUM, WEIGHT_TYPE,
-    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME,
+    CREATE_MAN_NO, CREATE_MAN_NAME, CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, data_source,
     METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG, UPDATE_MAN_NO, UPDATE_MAN_NAME,
     UPDATE_TIME, CHECK_FLAG, CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, METER_MODE
     from METER_WORK_CAR_ACTUAL_FIRST
     where ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR}
-  </select>
+    </select>
     <select id="selectTa" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         SELECT
         <include refid="columns"/>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -2517,7 +2517,7 @@
     t1.SAMPLE_VOUCHER, t1.CARRIER_UNIT_NO, t1.CARRIER_UNIT_NAME, t1.PREDICTION_TYPE, t1.PREDICTION_COMBINATION,
     t1.METER_TYPE_NO, t1.METER_TYPE_NAME, t.METER_PROCESS_NO, t.METER_PROCESS_EDITION_NO,
     t.METER_WEIGHT, t.WEIGHT_TYPE, t.METER_SORT_WEIGHT, t.METER_BALANCE_WEIGHT, t.CREATE_MAN_NO,
-    t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS,
+    t.CREATE_MAN_NAME, t.CREATE_TIME, t.BASE_SPOT_NO, t.BASE_SPOT_NAME, t.METER_CLASS,t.data_source,
     t.METER_GROUP, t.VALUE_FLAG, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME, t.UPDATE_TIME,
     t.CHECK_FLAG, t.CHECK_MAN_NO, t.CHECK_MAN_NAME, t.CHECK_TIME, t.METER_MODE, t.RAILWAY_TYPE_NO,
     t.RAILWAY_TYPE_NAME, T1.ARRIVAL, T1.STATION, T1.MEMO,T1.SOURCE_AREA
@@ -2525,7 +2525,7 @@
     where t.ACTUAL_FIRST_NO= #{actualFirstNo,jdbcType=VARCHAR} and t1.PREDICTION_NO= #{predictionNo,jdbcType=VARCHAR}
   </select>
   <select id="selectAndRemove" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select  ACTUAL_FIRST_NO,  RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO,
+    select  ACTUAL_FIRST_NO,  RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, data_source,
     RAILWAY_SPEED, RAILWAY_MODEL_NO,RAILWAY_MODEL_NAME, BIND_CARD_NO,  METER_PROCESS_NO, METER_PROCESS_EDITION_NO, METER_WEIGHT,
     WEIGHT_TYPE, METER_SORT_WEIGHT, METER_BALANCE_WEIGHT, CREATE_MAN_NO, CREATE_MAN_NAME,
     CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, METER_CLASS, METER_GROUP, MEMO, VALUE_FLAG,

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

@@ -520,6 +520,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
             PreRailwayScale pls = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
             pls.setPredictionNo(model.getPredictionNo());
+            pls.setUpdateManName("轨道衡一次计量解除委托操作");
+            pls.setUpdateTime(new Date());
             pls.setValueFlag("1");
 
             preRailwayScaleMapper.updateByPrimaryKeySelective(pls);
@@ -563,7 +565,6 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             }
             MeterWorkRailwayActFirst model = meterWorkRailwayActFirstMapper.selectAndMatch(actualFirstNo, predictionNo);
             model.setValueFlag("1");
-            model.setDataSource("1");
             model.setUpdateTime(new Date());
             model.setUpdateManNo("system");
             model.setUpdateManName("火车一次计量匹配操作");

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

@@ -2761,7 +2761,7 @@
        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,
        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.sender_remark,t1.receiver_type, t1.receiver_remark,t1.amount_unit,t1.data_source,
        t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
        t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
        t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,
@@ -2782,7 +2782,7 @@
            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,
            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.sender_remark,t1.receiver_type, t1.receiver_remark,t1.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,
@@ -2811,7 +2811,7 @@
            t.base_spot2_name,t.tare_class,t.tare_group,t.tare_mode, t.net_weight,t.net_man_no,
            t.net_man_name,t.net_time,t.net_spot3_no,t.net_spot3_name,t.net_class,t.net_group,
            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.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.update_man_name, t.update_time,t.source_area
       from meter_work_railway_actual t, pre_railway_scale t1 where t.actual_no = #{actualNo,jdbcType=VARCHAR} and t1.prediction_no = #{predictionNo,jdbcType=VARCHAR}
@@ -2825,7 +2825,7 @@
            t.net_man_name,t.net_time,t.net_spot3_no,t.net_spot3_name,t.net_class,t.net_group,
            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.railway_type_name, t.memo,t.water_num,t.update_man_no,
+           t.railway_type_name, t.memo,t.water_num,t.update_man_no,t.data_source,
            t.update_man_name, t.update_time,t.source_area
     from meter_work_railway_actual t where t.actual_no = #{actualNo,jdbcType=VARCHAR}
   </select>
@@ -2834,7 +2834,7 @@
    select t1.prediction_no PREDICTION_NO, t1.notice_no NOTICE_NO, t1.railway_no RAILWAY_NO, t1.railway_carriage_no RAILWAY_CARRIAGE_NO, t1.matter_no MATTER_NO,
        t1.matter_name MATTER_NAME, t1.contract_no CONTRACT_NO, t1.batch_no BATCH_NO, t1.customer_supplier_no CUSTOMER_SUPPLIER_NO,
        t1.customer_supplier_name CUSTOMER_SUPPLIER_NAME, t1.forwarding_unit_no FORWARDING_UNIT_NO, t1.forwarding_unit_name FORWARDING_UNIT_NAME,
-       t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,
+       t1.receiving_uint_no RECEIVING_UINT_NO, t1.receiving_uint_name RECEIVING_UINT_NAME, t1.material_no MATERIAL_NO,t1.data_source,
        t1.material_name MATERIAL_NAME, t1.spec_no SPEC_NO, t1.spec_name SPEC_NAME, t1.load_point_no LOAD_POINT_NO, t1.load_point_name LOAD_POINT_NAME,
        t1.sample_no SAMPLE_NO,t1.sample_voucher SAMPLE_VOUCHER,t1.carrier_unit_no CARRIER_UNIT_NO,t1.carrier_unit_name CARRIER_UNIT_NAME,
        t1.meter_type_no METER_TYPE_NO, t1.meter_type_name METER_TYPE_NAME,t1.meter_process_no METER_PROCESS_NO, t1.meter_process_edition_no METER_PROCESS_EDITION_NO,

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

@@ -199,6 +199,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             if (!mwcaf1.getRailwayNo().equals(mwcaf2.getRailwayNo())) {
                 throw new MarkerMetException(500, "请选择同一车号的一次计量数据进行结净");
             }
+
             // 一次计量数据是否已经完成委托匹配
             if ((mwcaf1.getPredictionNo() != null && "".equals(mwcaf1.getPredictionNo())) || (mwcaf2.getPredictionNo() != null && "".equals(mwcaf2.getPredictionNo()))) {
                 if (!mwcaf1.getPredictionNo().equals(mwcaf2.getPredictionNo())) {
@@ -261,7 +262,6 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             String no = meterWorkRailwayActualMapper.getNewID(sdf.format(new Date()));
             actualRow.setActualNo(sdf.format(new Date()) + no);
             actualRow.setNetWeight(mwcaf1.getMeterWeight().subtract(mwcaf2.getMeterWeight()));
-            actualRow.setDataSource("1");
             meterWorkRailwayActualMapper.insertSelective(actualRow);
 
             //预报的处理
@@ -379,7 +379,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         tarerow.setCreateManNo(userId);
         tarerow.setCreateTime(new Date());
         tarerow.setMeterMode("3");
-        tarerow.setDataSource("1");
+        tarerow.setDataSource(queryrow.getDataSource());
         tarerow.setMemo("静轨一次计量数据输入历史皮重洁净操作新增皮重数据");
         tarerow.setValueFlag("2");
         meterWorkRailwayActFirstMapper.insertSelective(tarerow);
@@ -394,9 +394,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         model.setNetTime(time);
         model.setNetManName(userName);
         model.setNetManNo(userId);
-        model.setDataSource("1");
+        model.setDataSource(queryrow.getDataSource());
         model.setValueFlag("1");
-//        mwca.setNote(note); 添加修改原因记录
+//        model.setNote(); // 添加修改原因记录
         int num = meterWorkRailwayActualMapper.insertSelective(model);
         return num;
     }
@@ -474,7 +474,6 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 grossrow.setValueFlag("3");
                 grossrow.setUpdateManNo("system");
                 grossrow.setUpdateManName("静态衡解除操作");
-                grossrow.setDataSource("1");
                 grossrow.setUpdateTime(new Date());
                 meterWorkRailwayActFirstMapper.updateByPrimaryKey(grossrow);
                 //皮重
@@ -490,7 +489,6 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     tarerow.setUpdateManNo("system");
                     tarerow.setUpdateManName("静态衡解除操作");
                     tarerow.setUpdateTime(new Date());
-                    tarerow.setDataSource("1");
                     meterWorkRailwayActFirstMapper.updateByPrimaryKey(tarerow);
                 }
                 if (StringUtils.isNotEmpty(model.getPredictionNo())) {