修改港存库

src/main/java/com/steerinfo/dil/controller/WmshGridMaterialController.java

@@ -59,11 +59,10 @@ public class WmshGridMaterialController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 Integer apiId){
-        List<Map<String,Object>> list = wmshGridMaterialService.getUnloadPortStockList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = wmshGridMaterialService.getUnloadPortStockList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 
@@ -86,11 +85,10 @@ public class WmshGridMaterialController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 Integer apiId){
-        List<Map<String,Object>> list = wmshGridMaterialService.getLoadPortStockList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = wmshGridMaterialService.getLoadPortStockList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
 

src/main/java/com/steerinfo/dil/controller/WmshInboundResultController.java

@@ -80,11 +80,10 @@ public class WmshInboundResultController extends BaseRESTfulController {
                                       Integer pageSize
     ){
         //不分页筛选数据
-        List<Map<String, Object>> allResult = wmshInboundResultService.getAllResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> result = wmshInboundResultService.getAllResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allResult,result);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,result);
         return success(pageList);
     }
 

src/main/java/com/steerinfo/dil/controller/WmshOutboundResultController.java

@@ -60,12 +60,10 @@ public class WmshOutboundResultController extends BaseRESTfulController {
                                       Integer pageNum,
                                       Integer pageSize
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allResult = wmshOutboundResultService.getAllResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> result = wmshOutboundResultService.getAllResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allResult,result);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,result);
         return success(pageList);
     }
 

src/main/java/com/steerinfo/dil/service/impl/WmshInboundResultServiceImpl.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.WmshInboundResultMapper;
 import com.steerinfo.dil.model.WmshInboundResult;
 import com.steerinfo.dil.service.IWmshInboundResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,16 +43,13 @@ public class WmshInboundResultServiceImpl implements IWmshInboundResultService {
         Integer id = wmshInboundResultMapper.getResultId();
         wmshInboundResult.setResultId(new BigDecimal(id));
         //生成入库编号
-        StringBuilder sb = new StringBuilder("GRKD");
-        sb.append(id < 10 ? "0000000" + id : id < 100 ? "000000" + id : id < 1000 ? "00000" + id : id < 10000 ?
-                "0000" + id : id < 100000 ? "000" + id : id < 1000000 ? "00" + id : id < 10000000 ? "0" + id : id.toString());
-        wmshInboundResult.setResultNumber(sb.toString());
+        String rkNum = DataChange.generateEightDigitsNumber("GRKD", id);
+        wmshInboundResult.setResultNumber(rkNum);
         //生成入库日期 与 操作人员
         wmshInboundResult.setInsertTime(new Date());
         wmshInboundResult.setInsertUsername("admin");
         wmshInboundResult.setDeleted(new BigDecimal(0)); //状态 0 正常
-        int i = wmshInboundResultMapper.insertSelective(wmshInboundResult);
-        return i;
+        return wmshInboundResultMapper.insertSelective(wmshInboundResult);
     }
 
     /**

src/main/java/com/steerinfo/dil/service/impl/WmshOutboundResultServiceImpl.java

@@ -57,10 +57,8 @@ public class WmshOutboundResultServiceImpl implements IWmshOutboundResultService
         Integer id = wmshOutboundResultMapper.getResultId();
         wmshOutboundResult.setResultId(new BigDecimal(id));
         //生成出库编号
-        StringBuilder sb = new StringBuilder("GCKD");
-        sb.append(id < 10 ? "0000000" + id : id < 100 ? "000000" + id : id < 1000 ? "00000" + id : id < 10000 ?
-                "0000" + id : id < 100000 ? "000" + id : id < 1000000 ? "00" + id : id < 10000000 ? "0" + id : id.toString());
-        wmshOutboundResult.setResultNumber(sb.toString());
+        String ckNum = DataChange.generateEightDigitsNumber("GCKD", id);
+        wmshOutboundResult.setResultNumber(ckNum);
         //添加出库物资吨位、批次ID
         wmshOutboundResult.setResultTonnage(DataChange.dataToBigDecimal(map.get("resultTonnage")));
         wmshOutboundResult.setBatchId(DataChange.dataToBigDecimal(map.get("batchId")));
@@ -68,7 +66,6 @@ public class WmshOutboundResultServiceImpl implements IWmshOutboundResultService
         wmshOutboundResult.setHarborId(DataChange.dataToBigDecimal(map.get("portId")));
         wmshOutboundResult.setResultClearing((String)(map.get("isClean")));
         wmshOutboundResult.setInsertTime(new Date());
-        int i = wmshOutboundResultMapper.insertSelective(wmshOutboundResult);
-        return i;
+        return wmshOutboundResultMapper.insertSelective(wmshOutboundResult);
     }
 }

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -29,7 +29,7 @@ public class ColumnDataUtil {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         for (Map<String, Object> columnData : columnDataList) {
             //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
         }
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -42,20 +42,20 @@ public class DataChange {
      */
     public static BigDecimal dataToBigDecimal(Object data){
         if (data != null){
-            if(data instanceof String){
-                String data1 = (String) data;
-                return new BigDecimal(data1);
-            }
-            if(data instanceof Double){
-                String data3 = data.toString();
-                return new BigDecimal(data3);
-            }
-            if(data instanceof Integer){
-                Integer data2 = (Integer) data;
-                return new BigDecimal(data2);
-            }
             if(data instanceof BigDecimal){
                 return (BigDecimal) data;
+            }else{
+                String str = String.valueOf(data);
+                BigDecimal decimal = null;
+                if(!"".equals(str)){
+                    try {
+                        decimal = new BigDecimal(str);
+                    } catch (Exception e) {
+                        System.out.println(data + "：数据解析失败！返回0");
+                        return new BigDecimal(0);
+                    }
+                }
+                return decimal;
             }
         }
         return new BigDecimal(0);
@@ -69,6 +69,8 @@ public class DataChange {
     public static String dateToDayDate(Object date){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date changeDate = null;
+        if(date == null)
+            return null;
         try{
              changeDate = (Date) date;
         }catch (Exception e){
@@ -108,10 +110,15 @@ public class DataChange {
         for (Map<String, Object> map : list) {
             for (String s : key) {
                 //修改数据为带两位小数
-                BigDecimal oldDate = (BigDecimal) map.get(s);
-                DecimalFormat df =  new DecimalFormat("0.00");
-                String resultDeduction = df.format(oldDate.doubleValue());
-                map.put(s, resultDeduction);
+                try {
+                    BigDecimal oldDate = (BigDecimal) map.get(s);
+                    DecimalFormat df =  new DecimalFormat("0.00");
+                    String resultDeduction = df.format(oldDate.doubleValue());
+                    map.put(s, resultDeduction);
+                } catch (Exception e) {
+                    System.out.println("原料扣减量数据有误");
+                }
+
             }
         }
     }
@@ -136,4 +143,49 @@ public class DataChange {
         long s = (between / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
         return day + "天"+  + hour+ "时" + min + "分"  + s + "秒";
     }
+
+    /**
+     * 生成带时间的八位数顺序号
+     * @param start 前缀
+     * @param id 顺序号  主键Id
+     * @return
+     */
+    public static String generateEightDigitsNumber(String start, Integer id){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        StringBuilder sb = new StringBuilder(start + sdf.format(new Date()));
+        sb.append(
+                id < 10
+                        ? "0000000" + id : id < 100
+                        ? "000000" + id : id < 1000
+                        ? "00000" + id : id < 10000
+                        ? "0000" + id : id < 100000
+                        ? "000" + id : id < 1000000
+                        ? "00" + id : id < 10000000
+                        ? "0" + id : id.toString()
+        );
+        return sb.toString();
+    }
+
+    /**
+     * 根据时间段查询数据
+     * @Author TXF
+     * @Date 2022/1/10 23:21
+     * @param startTime
+     * @param endTime
+     * @param map
+     * @param sdf
+     * @return
+     **/
+    public static void queryDataByDate(String startTime, String endTime, Map<String, Object> map, SimpleDateFormat sdf){
+        if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
+            map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
+            map.put("endDate", sdf.format(new Date(Long.parseLong(endTime) + 86400000)));
+        } else if (startTime != null && !"null".equals(startTime)) {
+            map.put("oneDate", sdf.format(new Date(Long.parseLong(startTime))));
+        } else if (endTime != null && !"null".equals(endTime)) {
+            map.put("oneDate", sdf.format(new Date(Long.parseLong(endTime))));
+        } else {
+            map.put("oneDate", sdf.format(new Date()));
+        }
+    }
 }

src/main/resources/application-dev.yml

@@ -1,9 +1,17 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: Dil123789
-    username: dil
+    password: root123
+    username: dagang
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-wmsh-api
 
+openfeign:
+  ESFeign:
+    url: ${ESFEIGN_URL:172.16.33.162:8011}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
+server:
+#测试环境
+  port: 8013

src/main/resources/application-prod.yml

@@ -5,4 +5,14 @@ spring:
     username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-wmsh-api
+    name: dil-wmsh-api
+
+openfeign:
+  ESFeign:
+    url: ${ESFEIGN_URL:172.16.33.166:8089}
+  ColumnDataFeign:
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+
+server:
+  #正式环境
+  port: 8070

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/wmsh
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
       date-format: yyyy-MM-dd HH:mm:ss
       time-zone: GMT+8
@@ -12,19 +12,6 @@ spring:
   mvc:
     static-path-pattern:
 
-openfeign:
-  ESFeign:
-    url: ${ESFEIGN_URL:172.16.33.166:8089}
-  ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
-  #测试环境
-#  ESFeign:
-#    url: ${ESFEIGN_URL:172.16.33.162:8011}
-#  ColumnDataFeign:
-#    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
-
-
-
 
 #eureka设置
 eureka:
@@ -63,9 +50,3 @@ mybatis:
     #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
-
-server:
-  #测试环境
-  #port: 8013
-  #正式环境
-  port: 8070

src/main/resources/com/steerinfo/dil/mapper/WmshInboundResultMapper.xml

@@ -451,9 +451,12 @@
   <select id="getResultById" parameterType="int" resultType="java.util.Map">
         select
                WIR.BATCH_ID "batchId",
+               DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
                WIR.PORT_ID "portId",
                WIR.RESULT_MATERIAL_NUMBER "resultMaterialNumber"
         from WMSH_INBOUND_RESULT WIR
+        left join DIL_BATCH DB
+            on DB.BATCH_ID = WIR.BATCH_ID
         where WIR.RESULT_ID = #{resultId}
   </select>
 </mapper>