后端修改

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

@@ -3158,7 +3158,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow.setNetMode(DbConstants.TYPE);
             actualRow.setNote("标识皮重结净");
             actualRow.setUploadFlag("1");
-            actualRow.setValueFlag("2");
+            actualRow.setValueFlag("1");
             actualRow.setCreateManName("结净");
             actualRow.setCreateTime(new Date());
             actualRow.setNetWeight(grossModel.getMeterWeight().subtract(tareModel.getMeterWeight()));

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

@@ -112,7 +112,7 @@
     <result column="CONTRACT_ID" jdbcType="VARCHAR" property="contractId" />
     <result column="IS_BOUND_LIST_DOWNLOADED" jdbcType="VARCHAR" property="isBoundListDownloaded" />
     <result column="DOCUMENT_ID" jdbcType="VARCHAR" property="documentId" />
-    <result column="is_auto_publish" jdbcType="VARCHAR" property="isAutoPublish" />
+    <result column="IS_AUTO_PUBLISH" jdbcType="VARCHAR" property="isAutoPublish" />
   </resultMap>
   <sql id="columns">
     ACTUAL_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, MATTER_NO, 
@@ -134,7 +134,7 @@
     AMOUNT_UNIT, MEASURE_OBJECT_TYPE, MEASURE_TASK_NUM, BILL_TYPE, CREATE_MAN_NAME, CREATE_TIME, 
     DATA_SOURCE, NOTE, IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, PREDICTION_COMBINATION, 
     BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, 
-    is_auto_publish
+    IS_AUTO_PUBLISH
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, t.MATTER_NO, 
@@ -157,7 +157,7 @@
     t.SENDER_REMARK, t.RECEIVER_TYPE, t.RECEIVER_REMARK, t.AMOUNT_UNIT, t.MEASURE_OBJECT_TYPE, 
     t.MEASURE_TASK_NUM, t.BILL_TYPE, t.CREATE_MAN_NAME, t.CREATE_TIME, t.DATA_SOURCE, 
     t.NOTE, t.IS_PRE_SACALE, t.LC_NO, t.PREDICTION_TYPE, t.PREDICTION_COMBINATION, t.BOUND_LIST_URL, 
-    t.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.is_auto_publish
+    t.IS_BOUND_LIST, t.CONTRACT_ID, t.IS_BOUND_LIST_DOWNLOADED, t.DOCUMENT_ID, t.IS_AUTO_PUBLISH
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_RAILWAY_ACTUAL
@@ -498,7 +498,7 @@
         and DOCUMENT_ID = #{documentId}
       </if>
       <if test="isAutoPublish != null and isAutoPublish != ''">
-        and is_auto_publish = #{isAutoPublish}
+        and IS_AUTO_PUBLISH = #{isAutoPublish}
       </if>
     </where>
   </sql>
@@ -835,7 +835,7 @@
         and DOCUMENT_ID LIKE '%${documentId}%'
       </if>
       <if test="isAutoPublish != null and isAutoPublish != ''">
-        and is_auto_publish LIKE '%${isAutoPublish}%'
+        and IS_AUTO_PUBLISH LIKE '%${isAutoPublish}%'
       </if>
     </where>
   </sql>
@@ -1174,7 +1174,7 @@
         or DOCUMENT_ID = #{documentId}
       </if>
       <if test="isAutoPublish != null and isAutoPublish != ''">
-        or is_auto_publish = #{isAutoPublish}
+        or IS_AUTO_PUBLISH = #{isAutoPublish}
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -1215,7 +1215,7 @@
       NOTE, IS_PRE_SACALE, LC_NO, 
       PREDICTION_TYPE, PREDICTION_COMBINATION, 
       BOUND_LIST_URL, IS_BOUND_LIST, CONTRACT_ID, 
-      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, is_auto_publish
+      IS_BOUND_LIST_DOWNLOADED, DOCUMENT_ID, IS_AUTO_PUBLISH
       )
     values (#{actualNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
@@ -1591,7 +1591,7 @@
         DOCUMENT_ID,
       </if>
       <if test="isAutoPublish != null">
-        is_auto_publish,
+        IS_AUTO_PUBLISH,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -2041,7 +2041,7 @@
       CONTRACT_ID = #{contractId,jdbcType=VARCHAR},
       IS_BOUND_LIST_DOWNLOADED = #{isBoundListDownloaded,jdbcType=VARCHAR},
       DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
-      is_auto_publish = #{isAutoPublish,jdbcType=VARCHAR}
+      IS_AUTO_PUBLISH = #{isAutoPublish,jdbcType=VARCHAR}
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual">
@@ -2375,7 +2375,7 @@
         DOCUMENT_ID = #{documentId,jdbcType=VARCHAR},
       </if>
       <if test="isAutoPublish != null">
-        is_auto_publish = #{isAutoPublish,jdbcType=VARCHAR},
+        IS_AUTO_PUBLISH = #{isAutoPublish,jdbcType=VARCHAR},
       </if>
     </set>
     where ACTUAL_NO = #{actualNo,jdbcType=VARCHAR}
@@ -2435,7 +2435,7 @@
       IS_PRE_SACALE, LC_NO, PREDICTION_TYPE, 
       PREDICTION_COMBINATION, BOUND_LIST_URL, 
       IS_BOUND_LIST, CONTRACT_ID, IS_BOUND_LIST_DOWNLOADED, 
-      DOCUMENT_ID, is_auto_publish)
+      DOCUMENT_ID, IS_AUTO_PUBLISH)
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.actualNo,jdbcType=VARCHAR}, 
@@ -2925,7 +2925,7 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.documentId,jdbcType=VARCHAR}
        </foreach>
-       ,is_auto_publish=
+       ,IS_AUTO_PUBLISH=
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_NO" separator=" ">
           when #{item.actualNo,jdbcType=VARCHAR} then #{item.isAutoPublish,jdbcType=VARCHAR}
        </foreach>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/MeterWorkRailwayActual.java

@@ -670,7 +670,7 @@ public class MeterWorkRailwayActual implements IBasePO<String> {
     private String documentId;
 
     /**
-     * 取消发布，控制不自动发布（0：自动发布，1：不自动发布）(is_auto_publish,VARCHAR,1)
+     * 取消发布，控制不自动发布（0：自动发布，1：不自动发布）(IS_AUTO_PUBLISH,VARCHAR,1)
      */
     @ApiModelProperty(value="取消发布，控制不自动发布（0：自动发布，1：不自动发布）",required=false)
     private String isAutoPublish;

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

@@ -375,6 +375,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 MeterWorkRailwayActual modelTemp = meterWorkRailwayActualMapper.selectByPrimaryKey(model.getActualNo());
                 modelTemp.setValueFlag("2");
                 modelTemp.setUploadFlag("1");
+                modelTemp.setIsAutoPublish("1");
                 modelTemp.setUpdateTime(new Date());
                 modelTemp.setUpdateManName(userName);
                 modelTemp.setUpdateManNo(userId);

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -67,7 +67,7 @@
     <result column="LIMIT_WEIGHT" jdbcType="DECIMAL" property="limitWeight" />
     <result column="RAILWAY_MODEL_NO" jdbcType="VARCHAR" property="railwayModelNo" />
     <result column="RAILWAY_MODEL_NAME" jdbcType="VARCHAR" property="railwayModelName" />
-    <result column="is_auto_operation" jdbcType="VARCHAR" property="isAutoOperation" />
+    <result column="IS_AUTO_OPERATION" jdbcType="VARCHAR" property="isAutoOperation" />
   </resultMap>
   <sql id="columns">
     ACTUAL_FIRST_NO, PREDICTION_NO, NOTICE_NO, RAILWAY_NO, RAILWAY_CARRIAGE_NO, RAILWAY_WORK_NO, 
@@ -81,7 +81,7 @@
     CREATE_TIME, BASE_SPOT_NO, BASE_SPOT_NAME, 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, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, IS_CHEMICAL, LIMIT_WEIGHT, 
-    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, is_auto_operation
+    RAILWAY_MODEL_NO, RAILWAY_MODEL_NAME, IS_AUTO_OPERATION
   </sql>
   <sql id="columns_alias">
     t.ACTUAL_FIRST_NO, t.PREDICTION_NO, t.NOTICE_NO, t.RAILWAY_NO, t.RAILWAY_CARRIAGE_NO, 
@@ -97,7 +97,7 @@
     t.METER_GROUP, t.MEMO, 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, t.IS_CHEMICAL, t.LIMIT_WEIGHT, t.RAILWAY_MODEL_NO, t.RAILWAY_MODEL_NAME, 
-    t.is_auto_operation
+    t.IS_AUTO_OPERATION
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM METER_WORK_RAILWAY_RECEIVED
@@ -303,7 +303,7 @@
         and RAILWAY_MODEL_NAME = #{railwayModelName}
       </if>
       <if test="isAutoOperation != null and isAutoOperation != ''">
-        and is_auto_operation = #{isAutoOperation}
+        and IS_AUTO_OPERATION = #{isAutoOperation}
       </if>
     </where>
   </sql>
@@ -505,7 +505,7 @@
         and RAILWAY_MODEL_NAME LIKE '%${railwayModelName}%'
       </if>
       <if test="isAutoOperation != null and isAutoOperation != ''">
-        and is_auto_operation LIKE '%${isAutoOperation}%'
+        and IS_AUTO_OPERATION LIKE '%${isAutoOperation}%'
       </if>
     </where>
   </sql>
@@ -709,7 +709,7 @@
         or RAILWAY_MODEL_NAME = #{railwayModelName}
       </if>
       <if test="isAutoOperation != null and isAutoOperation != ''">
-        or is_auto_operation = #{isAutoOperation}
+        or IS_AUTO_OPERATION = #{isAutoOperation}
       </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
@@ -735,7 +735,7 @@
       CHECK_MAN_NO, CHECK_MAN_NAME, CHECK_TIME, 
       METER_MODE, RAILWAY_TYPE_NO, RAILWAY_TYPE_NAME, 
       IS_CHEMICAL, LIMIT_WEIGHT, RAILWAY_MODEL_NO, 
-      RAILWAY_MODEL_NAME, is_auto_operation)
+      RAILWAY_MODEL_NAME, IS_AUTO_OPERATION)
     values (#{actualFirstNo,jdbcType=VARCHAR}, #{predictionNo,jdbcType=VARCHAR}, #{noticeNo,jdbcType=VARCHAR}, 
       #{railwayNo,jdbcType=VARCHAR}, #{railwayCarriageNo,jdbcType=VARCHAR}, #{railwayWorkNo,jdbcType=VARCHAR}, 
       #{railwaySpeed,jdbcType=DECIMAL}, #{railwayModel,jdbcType=VARCHAR}, #{matterNo,jdbcType=VARCHAR}, 
@@ -959,7 +959,7 @@
         RAILWAY_MODEL_NAME,
       </if>
       <if test="isAutoOperation != null">
-        is_auto_operation,
+        IS_AUTO_OPERATION,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -1229,7 +1229,7 @@
       LIMIT_WEIGHT = #{limitWeight,jdbcType=DECIMAL},
       RAILWAY_MODEL_NO = #{railwayModelNo,jdbcType=VARCHAR},
       RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR},
-      is_auto_operation = #{isAutoOperation,jdbcType=VARCHAR}
+      IS_AUTO_OPERATION = #{isAutoOperation,jdbcType=VARCHAR}
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived">
@@ -1428,7 +1428,7 @@
         RAILWAY_MODEL_NAME = #{railwayModelName,jdbcType=VARCHAR},
       </if>
       <if test="isAutoOperation != null">
-        is_auto_operation = #{isAutoOperation,jdbcType=VARCHAR},
+        IS_AUTO_OPERATION = #{isAutoOperation,jdbcType=VARCHAR},
       </if>
     </set>
     where ACTUAL_FIRST_NO = #{actualFirstNo,jdbcType=VARCHAR}
@@ -1474,7 +1474,7 @@
       CHECK_TIME, METER_MODE, RAILWAY_TYPE_NO, 
       RAILWAY_TYPE_NAME, IS_CHEMICAL, 
       LIMIT_WEIGHT, RAILWAY_MODEL_NO, 
-      RAILWAY_MODEL_NAME, is_auto_operation
+      RAILWAY_MODEL_NAME, IS_AUTO_OPERATION
       )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
@@ -1772,7 +1772,7 @@
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.railwayModelName,jdbcType=VARCHAR}
        </foreach>
-       ,is_auto_operation=
+       ,IS_AUTO_OPERATION=
        <foreach close="end" collection="list" index="index" item="item" open="case ACTUAL_FIRST_NO" separator=" ">
           when #{item.actualFirstNo,jdbcType=VARCHAR} then #{item.isAutoOperation,jdbcType=VARCHAR}
        </foreach>

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/model/MeterWorkRailwayReceived.java

@@ -405,7 +405,7 @@ public class MeterWorkRailwayReceived implements IBasePO<String> {
     private String AiWeight;
 
     /**
-     * 是否自动执行匹配委托、洁净(0:自动执行、1：不自动执行)(is_auto_operation,VARCHAR,1)
+     * 是否自动执行匹配委托、洁净(0:自动执行、1：不自动执行)(IS_AUTO_OPERATION,VARCHAR,1)
      */
     @ApiModelProperty(value="是否自动执行匹配委托、洁净(0:自动执行、1：不自动执行)",required=false)
     private String isAutoOperation;

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

@@ -414,6 +414,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
                     preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                 }
                 modelTemp = meterWorkRailwayReceivedMapper.selectAndRemove(modelTemp.getActualFirstNo());
+                modelTemp.setIsAutoOperation("1");
                 meterWorkRailwayReceivedMapper.updateByPrimaryKey(modelTemp);
                 count++;
             }
@@ -437,6 +438,7 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
             int count = 0;
             for(MeterWorkRailwayReceived model: models){
                 model.setValueFlag("0");
+                model.setIsAutoOperation("1");
                 meterWorkRailwayReceivedMapper.updateByPrimaryKeySelective(model);
                 if(model.getPredictionNo() != null &&  StringUtils.isNotEmpty(model.getPredictionNo())){
                     PreRailwayScale preRailwayScale = new PreRailwayScale();

src/main/java/com/steerinfo/pretrack/prerailwayscale/mapper/PreRailwayScaleMapper.xml

@@ -3084,7 +3084,7 @@
         update METER_WORK_RAILWAY_RECEIVED set value_flag='2' where ACTUAL_FIRST_NO=#{actualFirstNo}
     </update>
     <update id="updateMeterWorkRailwayReceiveds">
-        update METER_WORK_RAILWAY_RECEIVED set value_flag='0' where ACTUAL_FIRST_NO=#{actualFirstNo}
+        update METER_WORK_RAILWAY_RECEIVED set value_flag='0', IS_AUTO_OPERATION = '1' where ACTUAL_FIRST_NO=#{actualFirstNo}
     </update>
     <update id="updateUnUseData"></update>