后端修改

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/controller/DynamicWorkUpdataController.java

@@ -1,6 +1,7 @@
 package com.jisco.dynamicweight.dynamicworkupdata.controller;
 
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.lang.Snowflake;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.CokeComputeDto;
 import com.jisco.dynamicweight.dynamicworkupdata.dto.InbatchDto;
@@ -98,6 +99,7 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         Assert.isTrue(Objects.nonNull(model.getStartTime()), "开始时间不能为空!");
         Assert.isTrue(Objects.nonNull(model.getEndTime()), "结束时间不能为空!");
         Assert.isTrue(Objects.nonNull(model.getWeight()), "重量不能为空!");
+        model.setUpdataNo(null);
         model.setValidFlag("1");
         model.setUploaded("0");
         model.setAuditingFlag("0");
@@ -162,7 +164,7 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
 
     @ApiOperation(value = "导出Excel", notes = "导出Excel")
     @PostMapping(value = "/exportExcel")//String
-    public void exportExcel(HttpServletResponse response, @RequestBody HashMap parmas) throws IOException {
+    public void exportExcel(@RequestBody HashMap parmas, HttpServletResponse response) throws IOException {
         List<DynamicWorkUpdata> list = dynamicWorkUpdataService.query(parmas);
         ExcelUtil.exportExcel(response, list, DynamicWorkUpdata.class, "动态秤称重数据");
     }

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/mapper/DynamicWorkUpdataMapper.xml

@@ -857,6 +857,7 @@
         <result column="B8" jdbcType="NUMERIC" property="bl8"/>
         <result column="B16" jdbcType="NUMERIC" property="bl16"/>
         <result column="B24" jdbcType="NUMERIC" property="bl24"/>
+        <result column="VALID_FLAG" jdbcType="VARCHAR" property="validFlag"/>
     </resultMap>
     <!--    查询待审核数据-->
     <select id="getAuditData" resultMap="getAuditDataMap">
@@ -872,7 +873,8 @@
                a.SENDER_TYPE,
                b.B8,
                c.B16,
-               d.B24
+               d.B24,
+               a.VALID_FLAG
         from (
                  SELECT STATION_CODE,
                         STATION_NAME,
@@ -883,11 +885,12 @@
                         RECIEVER_TYPE,
                         SENDER_CODE,
                         SENDER_NAME,
-                        SENDER_TYPE
+                        SENDER_TYPE,
+                        VALID_FLAG
                  FROM DYNAMIC_WORK_UPDATA
                  WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}
                    AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}
-                   AND VALID_FLAG = '1'
+--                    AND VALID_FLAG = '1'
                    AND AUDITING_FLAG = '0'
                    AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                    AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
@@ -900,18 +903,20 @@
                           RECIEVER_TYPE,
                           SENDER_CODE,
                           SENDER_NAME,
-                          SENDER_TYPE
+                          SENDER_TYPE,
+                          VALID_FLAG
              ) a
                  LEFT JOIN
              (SELECT STATION_NAME,
                      MATERIAL_NAME,
                      RECIEVER_NAME,
                      SENDER_NAME,
-                     sum(WEIGHT) B8
+                     sum(WEIGHT) B8,
+                     VALID_FLAG
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl8start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl8end}
-                AND VALID_FLAG = '1'
+--                 AND VALID_FLAG = '1'
                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
@@ -924,22 +929,25 @@
                        RECIEVER_TYPE,
                        SENDER_CODE,
                        SENDER_NAME,
-                       SENDER_TYPE
+                       SENDER_TYPE,
+                       VALID_FLAG
              ) b
              on a.STATION_NAME = b.STATION_NAME
                  and a.MATERIAL_NAME = b.MATERIAL_NAME
                  and a.RECIEVER_NAME = b.RECIEVER_NAME
                  and a.SENDER_NAME = b.SENDER_NAME
+                 and a.VALID_FLAG = b.VALID_FLAG
                  LEFT JOIN
              (SELECT STATION_NAME,
                      MATERIAL_NAME,
                      RECIEVER_NAME,
                      SENDER_NAME,
-                     sum(WEIGHT) B16
+                     sum(WEIGHT) B16,
+                     VALID_FLAG
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl16start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl16end}
-                AND VALID_FLAG = '1'
+--                 AND VALID_FLAG = '1'
                 AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
@@ -952,22 +960,26 @@
                        RECIEVER_TYPE,
                        SENDER_CODE,
                        SENDER_NAME,
-                       SENDER_TYPE
+                       SENDER_TYPE,
+                       VALID_FLAG
              ) c
              on a.STATION_NAME = c.STATION_NAME
                  and a.MATERIAL_NAME = c.MATERIAL_NAME
                  and a.RECIEVER_NAME = c.RECIEVER_NAME
                  and a.SENDER_NAME = c.SENDER_NAME
+                 and a.VALID_FLAG = c.VALID_FLAG
                  LEFT JOIN
              (SELECT STATION_NAME,
                      MATERIAL_NAME,
                      RECIEVER_NAME,
                      SENDER_NAME,
-                     sum(WEIGHT) B24
+                     sum(WEIGHT) B24,
+                     VALID_FLAG
               FROM DYNAMIC_WORK_UPDATA
               WHERE to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &gt;= #{bl24start}
                 AND to_char(END_TIME, 'yyyy-MM-dd HH24:mi:ss') &lt;= #{bl24end}
-                AND VALID_FLAG = '1'
+--                 AND VALID_FLAG = '1'
+                AND AUDITING_FLAG = '0'
                 AND STATION_NAME &lt;&gt; 'M1#皮带秤'
                 AND STATION_NAME &lt;&gt; 'M1B#皮带秤'
               GROUP BY STATION_CODE,
@@ -979,12 +991,14 @@
                        RECIEVER_TYPE,
                        SENDER_CODE,
                        SENDER_NAME,
-                       SENDER_TYPE
+                       SENDER_TYPE,
+                       VALID_FLAG
              ) d
              on a.STATION_NAME = d.STATION_NAME
                  and a.MATERIAL_NAME = d.MATERIAL_NAME
                  and a.RECIEVER_NAME = d.RECIEVER_NAME
                  and a.SENDER_NAME = d.SENDER_NAME
+                 and a.VALID_FLAG = d.VALID_FLAG
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into DYNAMIC_WORK_UPDATA

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/vo/AuditDataVO.java

@@ -33,6 +33,8 @@ public class AuditDataVO {
     private BigDecimal bl24;
     @ApiModelProperty(value="日累计量",required=false)
     private BigDecimal rzl;
+    @ApiModelProperty(value="状态",required=false)
+    private String validFlag;
 
     public String getMaterialCode() {
         return materialCode;
@@ -146,6 +148,14 @@ public class AuditDataVO {
         this.rzl = rzl;
     }
 
+    public String getValidFlag() {
+        return validFlag;
+    }
+
+    public void setValidFlag(String validFlag) {
+        this.validFlag = validFlag;
+    }
+
     @Override
     public String toString() {
         return "AuditDataVO{" +
@@ -163,6 +173,7 @@ public class AuditDataVO {
                 ", bl16=" + bl16 +
                 ", bl24=" + bl24 +
                 ", rzl=" + rzl +
+                ", validFlag='" + validFlag + '\'' +
                 '}';
     }
 }

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -123,13 +123,13 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("1")
                             && StringUtils.isNotEmpty(model.getVideoCarNo2())
-                            && model.getCarNo() != model.getFirstCarNo()).count();
+                            && !model.getVideoCarNo2().equals(model.getFirstCarNo()) ).count();
                     //球机修改车号数
                     countBallResetCar = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("1")
                             && StringUtils.isNotEmpty(model.getVideoCarNo1())
-                            && model.getCarNo() != model.getFirstCarNo()).count();
+                            && !model.getVideoCarNo1().equals(model.getFirstCarNo()) ).count();
                     //枪机车号识别率------枪机车号识别数/一次计量车数
                     if(countCarFirst != 0) {
                         countGunIndentifyRate = Math.round(countGunIdentify/(countCarFirst*1.0)*100*100)/100.0; //(Math.round(*100))/100.0;

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

@@ -3908,6 +3908,12 @@
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and RAILWAY_TYPE_NO in (#{railwayTypeNo})
     </if>
+    <if test="railwayTypeNoStr != null and railwayTypeNoStr != ''">
+      and RAILWAY_TYPE_NO in
+      <foreach collection="typeNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
       and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>

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

@@ -613,6 +613,10 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
 
     @Override
     public List<MeterWorkRailwayActFirst> carFirstDataDetail(Map<String, Object> params) {
+        if(params.get("railwayTypeNoStr") != null) {
+            String[] typeNoStr = params.get("railwayTypeNoStr").toString().split(",");
+            params.put("typeNoStr", typeNoStr);
+        }
         List<MeterWorkRailwayActFirst> models = meterWorkRailwayActFirstMapper.carFirstDataDetail(params);
         return models;
     }

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

@@ -4656,6 +4656,12 @@
     <if test="railwayTypeNo != null and railwayTypeNo != ''">
       and RAILWAY_TYPE_NO in (#{railwayTypeNo})
     </if>
+    <if test="railwayTypeNoStr != null and railwayTypeNoStr != ''">
+      and RAILWAY_TYPE_NO in
+      <foreach collection="typeNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     <if test="startTime != null and endTime != null and startTime != '' 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>

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

@@ -2976,6 +2976,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
     @Override
     public List<MeterWorkRailwayActual> carActualDataDetail(HashMap<String, Object> params) {
+        if(params.get("railwayTypeNoStr") != null) {
+            String[] typeNoStr = params.get("railwayTypeNoStr").toString().split(",");
+            params.put("typeNoStr", typeNoStr);
+        }
         List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.carActualDataDetail(params);
         return rows;
     }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/controller/MeterWorkRailwayActualBakController.java

@@ -929,6 +929,24 @@ public class MeterWorkRailwayActualBakController extends BaseRESTfulController {
         return rm;
     }
 
+    @ApiOperation(value = "批量修改静态衡列次编号", notes = "净重、毛重、皮重都不能包含一次信息才能进行生成")
+    @PostMapping(value = "/batchActualUpdateLcNo")
+    public RESTfulResult batchActualUpdateLcNo(@RequestBody List<MeterWorkRailwayActualBak> models) {
+        RESTfulResult rm = failed();
+        try {
+            rm = meterWorkRailwayActualBakService.batchActualUpdateLcNo(models);
+        } catch (MarkerMetException e) {
+            e.printStackTrace();
+            rm.setMessage(e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常，请确认！");
+        } finally {
+
+        }
+        return rm;
+    }
+
     @ApiOperation(value = "将数据从MeterWorkCarActualBak复制到MeterWorkCarActual")
     @PostMapping(value = "/copyToActual")
     public RESTfulResult copyToActual(@RequestBody HashMap params){

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/IMeterWorkRailwayActualBakService.java

@@ -95,6 +95,7 @@ public interface IMeterWorkRailwayActualBakService extends IBaseService<MeterWor
     List<MeterWorkRailwayActualBak> noPage(Map<String, Object> params);
 
     RESTfulResult batchUpdateLcNo(List<MeterWorkRailwayActualBak> models);
+    RESTfulResult batchActualUpdateLcNo(List<MeterWorkRailwayActualBak> models);
     RESTfulResult autoPrintRailway(HashMap<String, Object> map);
 
     String subStr(String str, String flag);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/impl/MeterWorkRailwayActualBakServiceImpl.java

@@ -2613,6 +2613,83 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
         return rm;
     }
 
+    @Override
+    public RESTfulResult batchActualUpdateLcNo(List<MeterWorkRailwayActualBak> models) {
+        RESTfulResult rm = new RESTfulResult();
+        rm.setFailed();
+        try {
+            int count = 0;
+            if(models.size() >= 1) {
+                List<MeterWorkRailwayActFirstBak> grossList = new ArrayList<>();
+                List<MeterWorkRailwayActFirstBak> tareList = new ArrayList<>();
+                for(MeterWorkRailwayActualBak model: models) {
+                    if(StringUtils.isNotEmpty(model.getLcNo())) {
+                        rm.setMessage("净重数据已经含有列次号，不允许生成列次号！");
+                        return rm;
+                    }
+                    MeterWorkRailwayActFirstBak grossModel = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(model.getActualFirst1No());
+                    MeterWorkRailwayActFirstBak tareModel = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(model.getActualFirst2No());
+                    if(grossModel != null && tareModel != null) {
+                        if(StringUtils.isNotEmpty(grossModel.getLcNo()) && StringUtils.isNotEmpty(tareModel.getLcNo())) {
+                            rm.setMessage("净重数据所的一次数据已经含有列次号，不允许生成列次号！");
+                            return rm;
+                        }
+                        grossList.add(grossModel);
+                        tareList.add(tareModel);
+                    }
+                }
+
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+                if(grossList.size() >= 1) {
+                    String afl = sdf.format(new Date());
+                    String lcNo = meterWorkRailwayActFirstBakMapper.getLcNo(afl, grossList.get(0).getBaseSpotNo());
+                    for (MeterWorkRailwayActFirstBak model : grossList) {
+                        model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
+                                .replaceAll("轨道衡", "")
+                                .replaceAll("静轨", "")
+                                .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
+                        model.setLcNo(model.getLcNo());
+                        meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
+                    }
+                }
+
+                if(tareList.size() >= 1) {
+                    String afl = sdf.format(new Date());
+                    String lcNo = meterWorkRailwayActFirstBakMapper.getLcNo(afl, tareList.get(0).getBaseSpotNo());
+                    for (MeterWorkRailwayActFirstBak model : tareList) {
+                        model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
+                                .replaceAll("轨道衡", "")
+                                .replaceAll("静轨", "")
+                                .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
+                        model.setLcNo(model.getLcNo());
+                        meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
+                    }
+                }
+                for(MeterWorkRailwayActualBak model: models) {
+                    MeterWorkRailwayActFirstBak grossModel = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(model.getActualFirst1No());
+                    MeterWorkRailwayActFirstBak tareModel = meterWorkRailwayActFirstBakMapper.selectByPrimaryKey(model.getActualFirst2No());
+                    if(model.getGrossTime().compareTo(model.getTareTime()) >= 0) {
+                        model.setLcNo(grossModel.getLcNo());
+                    }else {
+                        model.setLcNo(tareModel.getLcNo());
+                    }
+                    meterWorkRailwayActualBakMapper.updateByPrimaryKeySelective(model);
+                    count++;
+                }
+            }else {
+                rm.setMessage("未勾选净重数据，请重新勾选！");
+            }
+            rm.setSucceed();
+            rm.setCode("200");
+            rm.setData(count);
+            rm.setMessage("操作成功,总共"+ count +"条数据修改列次编号成功!!");
+        }catch(Exception e) {
+            e.printStackTrace();
+            rm.setMessage("操作异常！！>>>" + e.getMessage());
+        }
+            return rm;
+    }
+
     @Override
     public RESTfulResult autoPrintRailway(HashMap<String, Object> params) {
         RESTfulResult rm = new RESTfulResult();