Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/pom.xml

@@ -85,6 +85,13 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!-- 火烈鸟驱动包 -->
+        <dependency>
+            <groupId>org.firebirdsql.jdbc</groupId>
+            <artifactId>jaybird</artifactId>
+            <version>4.0.0.java8</version>
+        </dependency>
+
         <!-- 核心模块-->
         <dependency>
             <groupId>com.ruoyi</groupId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/wx/OrderBillsPlansController.java

@@ -0,0 +1,62 @@
+package com.ruoyi.web.controller.wx;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
+import com.ruoyi.system.service.IOrderBillsPlansService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/order-bills-plans")
+public class OrderBillsPlansController {
+
+    @Autowired
+    private IOrderBillsPlansService orderBillsPlansService;
+
+    /**
+     * 查询业务表数据List
+     *
+     * @param orderNo 单号
+     * @param dataStart 日期起
+     * @param dataEnd   日期止
+     * @return 数据list
+     */
+    @PostMapping("/list")
+    public AjaxResult getOrderBillsPlansList(@RequestBody OrderBillsPlansVo orderBillsPlansVo) {
+
+        String dataStart = null;
+        String dataEnd = null;
+
+        if (orderBillsPlansVo.getRange() != null) {
+            dataStart = orderBillsPlansVo.getRange().get(0);
+            dataStart += " 00:00:00";
+            dataEnd = orderBillsPlansVo.getRange().get(1);
+            dataEnd += " 23:59:59";
+        }
+
+
+        String orderNo = orderBillsPlansVo.getOrderNo();
+
+        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansList(dataStart, dataEnd, orderNo));
+    }
+
+    /**
+     * 根据id查询
+     * @param entityId 主键
+     * @return 详情
+     */
+    @GetMapping("/{id}")
+    public AjaxResult getOrderBillsPlansByid(@PathVariable(value = "entityId") Long entityId) {
+        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansByid(entityId));
+    }
+
+    /**
+     * 报销
+     * @param entityid entityid
+     * @return 操作结果
+     */
+    @GetMapping("/load-fee-items/{entityid}")
+    public AjaxResult updateLoadFeeItems(@PathVariable(value = "entityid") Long entityid) {
+        return orderBillsPlansService.updateLoadFeeItems(entityid);
+    }
+}

ruoyi-admin/src/main/resources/application-druid.yml

@@ -2,27 +2,27 @@
 spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
+#    driverClassName: com.mysql.cj.jdbc.Driver
     druid:
       # 主库数据源
       master:
         #url: jdbc:mysql://124.70.179.5:3306/LinuxServer?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://124.70.179.5:3306/linshi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        url: jdbc:mysql://124.70.179.5:3306/JinGang?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://124.70.179.5:3306/JinGang?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://119.3.74.195:3306/LianHuaShengYun?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         #url: jdbc:mysql://119.3.74.195:3306/jhy?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        #url: jdbc:mysql://119.3.74.195:3306/had?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-        #url: jdbc:mysql://124.70.179.5:3306/sengneng?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://119.3.74.195:3306/had?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+#        url: jdbc:mysql://123.60.138.20:3306/sengneng?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
         username: root
         password: daasan7ujm^YHN
 
-      # 从库数据源
+      # 从库数据源 loadmile
       slave:
         # 从数据源开关/默认关闭
-        enabled: false
-        url:
-        username:
-        password:
+        enabled: true
+        url: jdbc:firebirdsql://49.4.78.17:3050/C:\sealong\TMS\DataDemo\SLEMP-TMS.FB25?encoding=GB_2312
+        username: SYSDBA
+        password: masterkey
       # 初始连接数
       initialSize: 5
       # 最小连接池数量

ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java

@@ -65,7 +65,7 @@ public class DruidProperties
         /**
          * 用来检测连接是否有效的sql，要求是一个查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。
          */
-        datasource.setValidationQuery(validationQuery);
+        // datasource.setValidationQuery(validationQuery);
         /** 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 */
         datasource.setTestWhileIdle(testWhileIdle);
         /** 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */

ruoyi-system/src/main/java/com/ruoyi/system/domain/Empls.java

@@ -0,0 +1,15 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+@Data
+public class Empls {
+    /**
+     * id
+     */
+    private Long SysId;
+
+    private String Empl;
+
+    private Long EmplId;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/OrderBillsPlans.java

@@ -0,0 +1,34 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class OrderBillsPlans {
+    /**
+     * 主键
+     */
+    private Long entityId;
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 客户
+     */
+    private String a;
+    /**
+     * 日期
+     */
+    private Date date;
+    /**
+     * 装车点
+     */
+    private String b;
+    /**
+     * 卸车点
+     */
+    private String c;
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/WfTaskList.java

@@ -0,0 +1,38 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class WfTaskList {
+    private Long sysId;
+    private Long entityId;
+    private Long lineNo;
+    private String orderNo;
+    private Long carID;
+    private String carRegNo;
+    private Date planLoadDate;
+    private Date loadDate;
+    private String loadAddr;
+    private String emptyAddr1;
+    private String emptyAddr2;
+    private Date planUnLoadDate;
+    private Date unLoadDate;
+    private String unLoadAddr;
+    private String remarks;
+    private Long taskId;
+    private Long status;
+    private String auditStatus;
+    private Long wfActId;
+    private String corpSName;
+    private String corpCName;
+    private String goodsCName;
+    private String loadFactory;
+    private String unLoadFactory;
+    private String driver1Name;
+    private String driver1mobile;
+    private String sUPERCARGOName;
+    private String transact;
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/OrderBillsPlansVo.java

@@ -0,0 +1,12 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderBillsPlansVo {
+
+    private List<String> range;
+    private String orderNo;
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/EmplsMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.Empls;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface EmplsMapper {
+    /**
+     * 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
+     * @param userName 登录名
+     * @return EMPLID
+     */
+    Long getByEmpl(String userName);
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/OrderBillsPlansMapper.java

@@ -0,0 +1,29 @@
+package com.ruoyi.system.mapper;
+
+import com.ruoyi.system.domain.OrderBillsPlans;
+import com.ruoyi.system.domain.WfTaskList;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface OrderBillsPlansMapper {
+    /**
+     * 获取业务表数据
+     * @param emplId
+     * @param dataStart
+     * @param dataEnd
+     * @return
+     */
+    List<WfTaskList> getOrderBillsPlansLsit(Map map);
+
+    /**
+     * 根据id查询
+     *
+     * @param entityId 主键
+     * @return 详情
+     */
+    OrderBillsPlans getOrderBillsPlansByid(Long entityId);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IOrderBillsPlansService.java

@@ -0,0 +1,34 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.OrderBillsPlans;
+import com.ruoyi.system.domain.WfTaskList;
+
+import java.util.List;
+
+public interface IOrderBillsPlansService {
+
+    /**
+     * 查询业务表数据List
+     *
+     * @param dataStart 日期起
+     * @param dataEnd   日期止
+     * @return
+     */
+    List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo);
+
+    /**
+     * 根据id查询
+     *
+     * @param entityId 主键
+     * @return 详情
+     */
+    OrderBillsPlans getOrderBillsPlansByid(Long entityId);
+
+    /**
+     * 报销
+     * @param entityid entityid
+     * @return 操作结果
+     */
+    AjaxResult updateLoadFeeItems(Long entityid);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/OrderBillsPlansServiceImpl.java

@@ -0,0 +1,85 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.OrderBillsPlans;
+import com.ruoyi.system.domain.WfTaskList;
+import com.ruoyi.system.mapper.EmplsMapper;
+import com.ruoyi.system.mapper.OrderBillsPlansMapper;
+import com.ruoyi.system.service.IOrderBillsPlansService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 火烈鸟数据库
+ */
+@Service
+@DataSource(value = DataSourceType.SLAVE)
+public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
+
+    /**
+     * 业务表
+     */
+    @Autowired
+    private OrderBillsPlansMapper orderBillsPlansMapper;
+
+    /**
+     * Empls表
+     */
+    @Autowired
+    private EmplsMapper emplsMapper;
+
+    /**
+     * 查询业务表数据List
+     *
+     * @param dataStart 日期起
+     * @param dataEnd   日期止
+     * @return
+     */
+    @Override
+    public List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo) {
+
+        // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
+        String userName = SecurityUtils.getLoginUser().getUsername();
+        // Long emplId = emplsMapper.getByEmpl(userName);
+
+        Long emplId = 0L;
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("emplId", emplId);
+        map.put("dataStart", dataStart);
+        map.put("dataEnd", dataEnd);
+        map.put("orderNo", orderNo);
+
+        List<WfTaskList> orderBillsPlansList = orderBillsPlansMapper.getOrderBillsPlansLsit(map);
+        return orderBillsPlansList;
+    }
+
+    /**
+     * 根据id查询
+     *
+     * @param entityId 主键
+     * @return 详情
+     */
+    @Override
+    public OrderBillsPlans getOrderBillsPlansByid(Long entityId) {
+        return orderBillsPlansMapper.getOrderBillsPlansByid(entityId);
+    }
+
+    /**
+     * 报销
+     * @param entityid entityid
+     * @return 操作结果
+     */
+    @Override
+    public AjaxResult updateLoadFeeItems(Long entityid) {
+        // orderBillsPlansMapper
+        return null;
+    }
+}

ruoyi-system/src/main/resources/mapper/system/EmplsMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.EmplsMapper">
+
+    <select id="getByEmpl" resultType="java.lang.Long">
+        select emtlId from EMPLS where emplId = #{userName}
+    </select>
+</mapper>

ruoyi-system/src/main/resources/mapper/system/OrderBillsPlansMapper.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.OrderBillsPlansMapper">
+
+
+    <select id="getOrderBillsPlansLsit" parameterType="Map" resultType="com.ruoyi.system.domain.WfTaskList">
+        Select
+        Distinct p.SysID sysId
+        , p.EntityID entityId
+        , p.LineNo lineNo
+        , p.OrderNo orderNo
+        ,p.CarID carID
+        , p.CarRegNo carRegNo
+        ,p.PlanLoadDate planLoadDate
+        , p.LoadDate loadDate
+        , p.LoadAddr loadAddr
+        , p.EMPTYADDR1 emptyAddr1
+        , p.EMPTYADDR2 emptyAddr2
+        ,p.PlanUnLoadDate planUnLoadDate
+        , p.UnLoadDate unLoadDate
+        , p.UnLoadAddr unLoadAddr
+        , p.Remarks remarks
+        ,t.TaskID taskId
+        , t.Status status
+        ,t.AuditStatus auditStatus
+        , t.ActID wfActId
+        ,c.SName corpSName
+        , c.CName corpCName
+        , g.CName goodsCName
+        ,l.SName loadFactory
+        , ul.SName unLoadFactory
+        ,dr1.Empl driver1Name
+        ,dr1.mobile driver1mobile
+        , sp.Empl sUPERCARGOName
+        ,e.Empl transact
+        from wf_TaskList t
+        Left join LoadBills b on (b.SysID=t.SysID and b.EntityID=t.EntityID)
+        Left join OrderBillsPlans p on (p.SysID=b.SysID and p.EntityID=b.SrcEntityID and p.LineNo=b.SrcLineNo)
+        Left join Empls e on (e.SysID=b.SysID and e.EmplID=b.TransactID)
+        Left join Empls dr1 on (dr1.SysID=b.SysID and dr1.EmplID=p.DRIVER1ID)
+        Left join Empls sp on (sp.SysID=b.SysID and sp.EmplID=p.SUPERCARGOID)
+        Left join Corps c on (c.SysID=p.SysID and c.CorpID=p.CorpID)
+        Left join Corps l on (l.SysID=p.SysID and l.CorpID=p.LoadFactoryID)
+        Left join Corps ul on (ul.SysID=b.SysID and ul.CorpID=p.UnLoadFactoryID)
+        Left join Goods g on (g.SysID=b.SysID and g.GoodsID=b.GoodsID)
+
+
+        <where>
+            t.SysID=1 and t.ActID=317 and (t.Status = 2 or t.Status = 6)
+            and ((b.CarID=-1) or ((b.CarID &lt;&gt; -1)))
+            <if test="dataStart != null and dataStart != '' and dataEnd != null and dataEnd != ''">
+                and b.BillDate >= #{dataStart} and b.BillDate &lt;= #{dataEnd}
+            </if>
+            and p.IFORDER1ED='T'
+            and ((p.DRIVER1ID=#{emplId}) or (p.SUPERCARGOID=#{emplId}))
+
+            <if test="orderNo != null and orderNo != ''">
+--                 and p.orderNo like concat('%', #{orderNo}, '%')
+            </if>
+        </where>
+
+        ORDER BY b.BillDate desc
+    </select>
+
+    <select id="getOrderBillsPlansByid" resultType="com.ruoyi.system.domain.OrderBillsPlans">
+        select * from OrderBillsPlans where entityId = #{entityId}
+    </select>
+</mapper>