后端修改

src/main/java/com/steerinfo/baseinfo/meterbaserfidinfo/controller/MeterBaseRfidInfoController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.baseinfo.meterbaserfidinfo.controller;
 
+import com.steerinfo.baseinfo.meterbaserfidinfo.mapper.MeterBaseRfidInfoMapper;
 import com.steerinfo.baseinfo.meterbaserfidinfo.model.MeterBaseRfidInfo;
 import com.steerinfo.baseinfo.meterbaserfidinfo.service.IMeterBaseRfidInfoService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -12,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -36,6 +38,9 @@ public class MeterBaseRfidInfoController extends BaseRESTfulController {
     @Autowired
     IMeterBaseRfidInfoService meterBaseRfidInfoService;
 
+    @Resource
+    MeterBaseRfidInfoMapper meterBaseRfidInfoMapper;
+
     @ApiOperation(value="获取列表", notes="分页查询")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -83,6 +88,11 @@ public class MeterBaseRfidInfoController extends BaseRESTfulController {
             rm.setMessage("车号不能为空，请确认！！");
             return rm;
         }
+        List<MeterBaseRfidInfo> models = meterBaseRfidInfoMapper.selectByMap(model);
+        if(models.size() >= 1) {
+            rm.setMessage("rfid和车号已重复，不允许再次新增，请确认！！");
+            return rm;
+        }
         MeterBaseRfidInfo meterBaseRfidInfo = meterBaseRfidInfoService.checkAndAdd(model);
         return success(meterBaseRfidInfo);
     }

src/main/java/com/steerinfo/baseinfo/meterbaserfidinfo/mapper/MeterBaseRfidInfoMapper.java

@@ -5,7 +5,13 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+import java.util.List;
+
 @Mapper
 public interface MeterBaseRfidInfoMapper extends IBaseMapper<MeterBaseRfidInfo, String> {
     String getNewID(@Param(value="afl")String afl);
+
+    //查询RFID或者车号重复的数据
+    List<MeterBaseRfidInfo> selectByMap(HashMap<String, Object> map);
 }

src/main/java/com/steerinfo/baseinfo/meterbaserfidinfo/mapper/MeterBaseRfidInfoMapper.xml

@@ -265,4 +265,26 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(rfid_Id, LENGTH(rfid_Id) - 3))),0) + 1,4,'0') rfid_Id
     FROM meter_base_rfid_info where instr(rfid_Id,#{afl,jdbcType=VARCHAR})>0
   </select>
+  <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1!=1
+    <if test="rfidCode != null and rfidCode != ''">
+      or RFID_CODE = #{rfidCode}
+    </if>
+    <if test="carNo != null and carNo != ''">
+      or CAR_NO = #{carNo}
+    </if>
+    <if test="createManNo != null and createManNo != ''">
+      or CREATE_MAN_NO = #{createManNo}
+    </if>
+    <if test="createManName != null and createManName != ''">
+      or CREATE_MAN_NAME = #{createManName}
+    </if>
+    <if test="createTime != null">
+      or TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = '#{createTime}'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      or VALUE_FLAG = #{valueFlag}
+    </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaserfidinfo/service/impl/MeterBaseRfidInfoServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterBaseRfidInfo服务实现：

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

@@ -1066,14 +1066,40 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 //委托不能为空
                 if(StringUtils.isNotEmpty(model.getPredictionNo())){
                     // 改委托
+                    PreTrackScale scale = new PreTrackScale();
                     if (StringUtils.isNotEmpty(model.getPredictionNo())) {
-                        PreTrackScale scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
+                        scale = preTrackScaleMapper.selectByPrimaryKey(model.getPredictionNo());
                         scale.setValueFlag("1");
                         scale.setUploadFlag("1");
                         scale.setUpdateTime(new Date());
                         scale.setUpdateManNo(userId);
                         scale.setUpdateManName(userName);
                         preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+                    }else {
+                        if(StringUtils.isNotEmpty(model.getActualFirst1No())) {
+                            MeterWorkCarActualFirst gross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
+                            if(StringUtils.isNotEmpty(gross.getPredictionNo())) {
+                                scale = preTrackScaleMapper.selectByPrimaryKey(gross.getPredictionNo());
+                                scale.setValueFlag("1");
+                                scale.setUploadFlag("1");
+                                scale.setUpdateTime(new Date());
+                                scale.setUpdateManNo(userId);
+                                scale.setUpdateManName(userName);
+                                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+                            }
+                        }
+                        if(StringUtils.isNotEmpty(model.getActualFirst2No())) {
+                            MeterWorkCarActualFirst tare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                            if(StringUtils.isNotEmpty(tare.getPredictionNo())) {
+                                scale = preTrackScaleMapper.selectByPrimaryKey(tare.getPredictionNo());
+                                scale.setValueFlag("1");
+                                scale.setUploadFlag("1");
+                                scale.setUpdateTime(new Date());
+                                scale.setUpdateManNo(userId);
+                                scale.setUpdateManName(userName);
+                                preTrackScaleMapper.updateByPrimaryKeySelective(scale);
+                            }
+                        }
                     }
                 }
                 // 清空一次毛重、皮重委托信息

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

@@ -2875,6 +2875,13 @@
     <if test="groupId != null and groupId != ''">
       and BASE_SPOT_NO in (SELECT METER_BASE_GROUP_SPOT.SPOT_ID FROM METER_BASE_GROUP_SPOT WHERE METER_BASE_GROUP_SPOT.GROUP_ID = #{groupId})
     </if>
+    <!-- 计量点复选功能 -->
+    <if test="baseSpotNoStr != null and baseSpotNoStr != ''">
+      and base_spot_no in
+      <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     order by create_time desc
   </select>
 

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

@@ -5013,6 +5013,11 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
     @Override
     public PageList<MeterWorkCarActualFirst> likeByDesc(Map<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+
+        if(params.get("baseSpotNoStr") != null) {
+            String[] spotNoStr = params.get("baseSpotNoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
         List<MeterWorkCarActualFirst> rows = meterWorkCarActualFirstMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;

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

@@ -8319,7 +8319,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                 String userName = receivedModel.getUpdateManName();
                 HashMap obj = new HashMap();
                 obj.put("railwayNo", receivedModel.getRailwayNo());
-                obj.put("valueFlag", "1");
+                obj.put("valueFlag", "0");
                 List<MeterBaseRailwayHisTareData> hisTareWeightList = meterBaseRailwayHisTareDataMapper.selectByParameters(obj);
                 if(hisTareWeightList.size() >= 1) {
                     MeterBaseRailwayHisTareData hisTareWeightModel = hisTareWeightList.get(0);

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

@@ -3048,7 +3048,7 @@
   </select>
 
   <select id="mathPredcition" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select t.actual_no, t1.prediction_no, t1.notice_no,t1.railway_no,t1.railway_carriage_no,
+    select t.actual_no, t1.prediction_no, t1.notice_no,t1.railway_no,t.railway_carriage_no,
            t1.matter_no,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.load_point_no,
@@ -3070,7 +3070,7 @@
   </select>
 
   <select id="cleanPredcition" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select t.actual_no,t.actual_first1_no, t.railway_no, t.gross_weight,t.gross_man_no,t.gross_man_name,
+    select t.actual_no,t.actual_first1_no, t.railway_carriage_no, t.railway_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.net_weight,t.net_man_no,
@@ -4347,15 +4347,108 @@
     actual_first2_no = #{actualFirstNo}
   </select>
   <select id="autoPrintRailway" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select" />
+    select actual_no,
+    railway_no,
+    matter_no,
+    matter_name,
+    meter_type_name,
+    forwarding_unit_name,
+    receiving_uint_name,
+    gross_weight,
+    tare_weight,
+    net_weight,
+    gross_time,
+    tare_time,
+    net_time,
+    net_spot3_name,
+    sender_remark,
+    create_man_name,
+    create_time
+    from (
+    (
+    select actual_no,
+            railway_no,
+            matter_no,
+            matter_name,
+            meter_type_name,
+            forwarding_unit_name,
+            receiving_uint_name,
+            gross_weight,
+            tare_weight,
+            net_weight,
+            gross_time,
+            tare_time,
+            net_time,
+            net_spot3_name,
+            sender_remark,
+            create_man_name,
+            create_time
+    from meter_work_railway_actual
+      where 1 = 1
+      <if test="railwayNo != null and railwayNo != ''">
+        and railway_no like '%railwayNo%'
+      </if>
+      and forwarding_unit_no in
+      <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>
+    <if test="flag != null and flag != ''">
+      and NET_SPOT3_NAME is null
+    </if>
+      and value_flag != '0'
+    )
+    union
+    (
+    select actual_no,
+    railway_no,
+    matter_no,
+    matter_name,
+    meter_type_name,
+    forwarding_unit_name,
+    receiving_uint_name,
+    gross_weight,
+    tare_weight,
+    net_weight,
+    gross_time,
+    tare_time,
+    net_time,
+    net_spot3_name,
+    sender_remark,
+    create_man_name,
+    create_time
+    from meter_work_measuring_instrument
     where 1 = 1
     <if test="railwayNo != null and railwayNo != ''">
       and railway_no like '%railwayNo%'
     </if>
-    and forwarding_unit_no in
-    <foreach collection="list" item="id" separator="," open="(" close=")">
-      #{id}
-    </foreach>
     <if test="matterNo != null and matterNo != ''">
       and MATTER_NO LIKE '%${matterNo}%'
     </if>
@@ -4375,7 +4468,8 @@
       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')
+      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}%'
@@ -4383,7 +4477,11 @@
     <if test="netSpot3Name != null and netSpot3Name != ''">
       and NET_SPOT3_NAME LIKE '%${netSpot3Name}%'
     </if>
-    and value_flag != '0'
+    <if test="flag != null and flag != ''">
+      and NET_SPOT3_NAME is null
+    </if>
+    )
+    )
     order by net_time desc
   </select>