后端修改

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

@@ -5354,6 +5354,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                     tareModel.setValueFlag("2");
                     tareModel.setWeightType("2");
                     tareModel.setIsPreScale("1");
+                    tareModel.setDataSource("2");
                     tareModel.setPredictionType("1");
                     tareModel.setPredictionNo(scale.getPredictionNo());
                     tareModel.setNote("期限皮结净");

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

@@ -167,6 +167,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 BeanUtils.copyProperties(modelTemp, model);
                 model.setPredictionType("1");
                 model.setIsPreSacale("1");
+
+                PreRailwayScale scale = preRailwayScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                scale.setValueFlag("4");
+                scale.setMeasureStation(model.getBaseSpotNo());
+                scale.setMeasureStationName(model.getBaseSpotName());
+                scale.setPredictionType("1");
+                scale.setUpdateManNo(model.getCreateManNo());
+                scale.setUpdateManName(model.getCreateManName());
+                scale.setUpdateTime(new Date());
+                preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
             }
             int i = meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
             if (i >= 1) {
@@ -3479,6 +3489,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             model.setIsPreSacale("1");
 
             prs.setValueFlag(DbConstants.IN); //使用中
+//            prs.setValueFlag("2"); //已使用
             prs.setUploadFlag("1");
             prs.setUpdateManNo(userId);
             prs.setUpdateManName(userName);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -11,6 +11,7 @@ import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActu
 import com.steerinfo.meterwork.meterworkrailwayactual.service.IMeterWorkRailwayActualService;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.util.CommonPage;
+import com.steerinfo.util.StringUtils;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;

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

@@ -4180,7 +4180,7 @@
           and PREDICTION_TYPE LIKE '%${predictionType}%'
         </if>
         <if test="flag != null and flag !=''">
-          and lc_no is null
+          and ( lc_no is null or lc_no = '无列次' )
         </if>
       </where>
       and value_flag != '0'
@@ -4329,6 +4329,33 @@
         <foreach collection="list" item="id" separator="," open="(" close=")">
           #{id}
         </foreach>
+        <if test="matterNo != null and matterNo != ''">
+          and MATTER_NO LIKE '%${matterNo}%'
+        </if>
+        <if test="matterName != null and matterName != ''">
+          and MATTER_NAME LIKE '%${matterName}%'
+        </if>
+        <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+          and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+        </if>
+        <if test="forwardingUnitName != null and forwardingUnitName != ''">
+          and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+        </if>
+        <if test="receivingUintNo != null and receivingUintNo != ''">
+          and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+        </if>
+        <if test="receivingUintName != null and receivingUintName != ''">
+          and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+          and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+        </if>
+        <if test="netSpot3No != null and netSpot3No != ''">
+          and NET_SPOT3_NO LIKE '%${netSpot3No}%'
+        </if>
+        <if test="netSpot3Name != null and netSpot3Name != ''">
+          and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
+        </if>
         and value_flag != '0'
     order by net_time desc
   </select>

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

@@ -452,6 +452,13 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             MeterWorkRailwayActFirst actFirst01 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actFirstNo01);
             MeterWorkRailwayActFirst actFirst02 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actFirstNo02);
             String scaleNo = null;
+            //列次号不能为空
+            if( (actFirst01.getLcNo() == null || actFirst02.getLcNo() == null)
+                    || (StringUtils.isEmpty(actFirst01.getLcNo()) || actFirst01.getLcNo().equals("无列次"))
+                    || (StringUtils.isEmpty(actFirst02.getLcNo()) || actFirst02.getLcNo().equals("无列次"))) {
+                rm.setMessage("一次数据列次号不允许为空");
+                return rm;
+            }
             //从勾选的委托、两个一次数据中赋值委托号
             if(predictionNo != null && StringUtils.isNotEmpty(predictionNo)){
                 if((actFirst01.getPredictionNo() != null && StringUtils.isNotEmpty(actFirst01.getPredictionNo())
@@ -530,6 +537,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 actualRow.setNote(Notes);
                 actualRow.setLcNo(actFirst01.getLcNo());
                 actualRow.setNetMode(DbConstants.TYPE);
+                actualRow.setPredictionType("1");
                 actualRow.setNetWeight(actFirst01.getMeterWeight().subtract(actFirst02.getMeterWeight()));
                 if(actualRow.getGrossTime().compareTo(actualRow.getTareTime()) >= 0) {
                     actualRow.setNetSpot3No(actualRow.getBaseSpot1No());

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

@@ -2910,7 +2910,7 @@
     <select id="doQueryByCar" parameterType="java.util.HashMap" resultMap="BaseResultMap">
         <include refid="select"/>
         <where>
-            VALUE_FLAG in ('1','4')
+            (( VALUE_FLAG == and TRUST_AVAILABILITY_TIME >= sysDate ) or value_flag = '4')
             <if test="railwayNo != null">
                 and RAILWAY_NO = #{railwayNo}
             </if>
@@ -2926,7 +2926,6 @@
             <if test="startTime != null and startTime!='' and endTime != null and endTime!=''">
                 and create_time between to_date(#{startTime},'yyyy-MM-dd HH24:mi:ss') and to_date(#{endTime},'yyyy-MM-dd HH24:mi:ss')
             </if>
-            and TRUST_AVAILABILITY_TIME >= sysDate
         </where>
         order by CREATE_TIME desc
     </select>