危险品订单

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -17,6 +17,8 @@ import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysMenuService;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * 登录验证
  *
@@ -53,6 +55,22 @@ public class SysLoginController {
     }
 
     /**
+     * 登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @RequestMapping("/wx/login")
+    public AjaxResult wxLogin(@RequestBody LoginBody loginBody) {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                null);
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+    /**
      * 获取用户信息
      *
      * @return 用户信息

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

@@ -1,11 +1,16 @@
 package com.ruoyi.web.controller.wx;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.Items;
+import com.ruoyi.system.domain.OrderBillsPlans;
+import com.ruoyi.system.domain.vo.LoadFeeItemsVo;
 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.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/order-bills-plans")
 public class OrderBillsPlansController {
@@ -26,37 +31,65 @@ public class OrderBillsPlansController {
 
         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";
+        List<String> range = orderBillsPlansVo.getRange();
+        if (range != null && range.size() > 2) {
+            dataStart = range.get(0);
+            dataEnd = range.get(1);
         }
 
-
         String orderNo = orderBillsPlansVo.getOrderNo();
 
         return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansList(dataStart, dataEnd, orderNo));
     }
 
     /**
-     * 根据id查询
-     * @param entityId 主键
+     * 根据orderNo查询
+     * @param orderNo orderNo
      * @return 详情
      */
-    @GetMapping("/{id}")
-    public AjaxResult getOrderBillsPlansByid(@PathVariable(value = "entityId") Long entityId) {
-        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansByid(entityId));
+    @GetMapping("/{orderNo}")
+    public AjaxResult getOrderBillsPlansByid(@PathVariable(value = "orderNo") Long orderNo) {
+        return AjaxResult.success(orderBillsPlansService.getOrderBillsPlansByid(orderNo));
+    }
+
+    /**
+     * 保存保单信息
+     * @param orderBillsPlans
+     * @return
+     */
+    @PostMapping("/put")
+    public AjaxResult putOrderBillsPlansByid(@RequestBody OrderBillsPlans orderBillsPlans) {
+        return orderBillsPlansService.putOrderBillsPlansByid(orderBillsPlans);
+    }
+
+    /**
+     * 获取报销费用list
+     *
+     * @return
+     */
+    @GetMapping("/items/list/{entityId}")
+    private AjaxResult getItemsList(@PathVariable(value = "entityId") Long entityId) {
+        return AjaxResult.success(orderBillsPlansService.getItemsList(entityId));
     }
 
     /**
      * 报销
-     * @param entityid entityid
+     * @param loadFeeItemsVo
      * @return 操作结果
      */
-    @GetMapping("/load-fee-items/{entityid}")
-    public AjaxResult updateLoadFeeItems(@PathVariable(value = "entityid") Long entityid) {
-        return orderBillsPlansService.updateLoadFeeItems(entityid);
+    @PostMapping("/load-fee-items")
+    public AjaxResult insertLoadFeeItems(LoadFeeItemsVo loadFeeItemsVo) {
+        return orderBillsPlansService.insertLoadFeeItems(loadFeeItemsVo);
     }
+
+    /**
+     * 查询报销费用报销金额下拉选
+     * @return
+     */
+    @GetMapping("/gas-stations")
+    public AjaxResult getGasStations() {
+        return orderBillsPlansService.getGasStations();
+    }
+
+
 }

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/Users/longyufei/dev/WarehouseManagement" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-common/src/main/java/com/ruoyi/common/utils/SnowFlakeUtil.java

@@ -0,0 +1,86 @@
+package com.ruoyi.common.utils;
+
+/**
+ * 雪花id工具类
+ */
+public class SnowFlakeUtil {
+
+    // 起始时间戳
+    private final static long START_STMP = 1480166465631L;
+
+    // 每部分的位数
+    private final static long SEQUENCE_BIT = 12; // 序列号占用位数
+    private final static long MACHINE_BIT = 5; // 机器id占用位数
+    private final static long DATACENTER_BIT = 5; // 机房id占用位数
+
+    // 每部分最大值
+    private final static long MAX_DATACENTER_NUM = -1L ^ (-1L << DATACENTER_BIT);
+    private final static long MAX_MACHINE_NUM = -1L ^ (-1L << MACHINE_BIT);
+    private final static long MAX_SEQUENCE = -1L ^ (-1L << SEQUENCE_BIT);
+
+    // 每部分向左的位移
+    private final static long MACHINE_LEFT = SEQUENCE_BIT;
+    private final static long DATACENTER_LEFT = SEQUENCE_BIT + MACHINE_BIT;
+    private final static long TIMESTMP_LEFT = DATACENTER_LEFT + DATACENTER_BIT;
+
+    private long datacenterId; // 机房id
+    private long machineId; // 机器id
+    private long sequence = 0L; // 序列号
+    private long lastStmp = -1L; // 上次的时间戳
+
+    public SnowFlakeUtil(long datacenterId, long machineId) {
+        if (datacenterId > MAX_DATACENTER_NUM || datacenterId < 0)
+        {
+            throw new IllegalArgumentException("datacenterId can't be greater than MAX_DATACENTER_NUM or less than 0");
+        }
+        if (machineId > MAX_MACHINE_NUM || machineId < 0)
+        {
+            throw new IllegalArgumentException("machineId can't be greater than MAX_MACHINE_NUM or less than 0");
+        }
+        this.datacenterId = datacenterId;
+        this.machineId = machineId;
+    }
+
+    // 产生下一个ID
+    public synchronized long getNextId() {
+        long currStmp = getNewstmp();
+        if (currStmp < lastStmp) {
+            throw new RuntimeException("Clock moved backwards.Refusing to generate id");
+        }
+        if (currStmp == lastStmp) {
+            // 若在相同毫秒内 序列号自增
+            sequence = (sequence + 1) & MAX_SEQUENCE;
+            // 同一毫秒的序列数已达到最大
+            if (sequence == 0L)
+            {
+                currStmp = getNextMill();
+            }
+        } else {
+            // 若在不同毫秒内 则序列号置为0
+            sequence = 0L;
+        }
+        lastStmp = currStmp;
+
+        return (currStmp - START_STMP) << TIMESTMP_LEFT // 时间戳部分
+                | datacenterId << DATACENTER_LEFT // 机房id部分
+                | machineId << MACHINE_LEFT // 机器id部分
+                | sequence; // 序列号部分
+    }
+
+    // 获取新的毫秒数
+    private long getNextMill()
+    {
+        long mill = getNewstmp();
+        while (mill <= lastStmp)
+        {
+            mill = getNewstmp();
+        }
+        return mill;
+    }
+
+    // 获取当前的毫秒数
+    private long getNewstmp()
+    {
+        return System.currentTimeMillis();
+    }
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/captchaImage").anonymous()
+                .antMatchers("/login", "/wx/login", "/captchaImage").anonymous()
                 .antMatchers("/wechat/programLogin", "/wechat/wechat").anonymous()
                 .antMatchers(
                         HttpMethod.GET,

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -50,9 +50,11 @@ public class SysLoginService {
      * @return 结果
      */
     public String login(String username, String password, String code, String uuid) {
-        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
-        redisCache.deleteObject(verifyKey);
+        if (uuid != null) {
+            String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+            String captcha = redisCache.getCacheObject(verifyKey);
+            redisCache.deleteObject(verifyKey);
+        }
         /*if (captcha == null) {
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
             throw new CaptchaExpireException();

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

@@ -12,4 +12,6 @@ public class Empls {
     private String Empl;
 
     private Long EmplId;
+
+    private Long entityId;
 }

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

@@ -0,0 +1,10 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+@Data
+public class GasStations {
+
+    private Long gasStationId;
+    private String cName;
+}

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

@@ -0,0 +1,10 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+@Data
+public class Items {
+
+    private Long itemId;
+    private String cName;
+}

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

@@ -0,0 +1,26 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class LoadFeeItems {
+
+    private Long itemId;
+    private String itemProp;
+    private Long itemTypeId;
+
+    private String itemDesc;
+    private String itemAddr;
+    private Date itemDate;
+    private String itemAuditType;
+
+    private BigDecimal atm1;
+
+    private Long entityId;
+
+    private Long lineNo;
+
+}

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

@@ -2,33 +2,61 @@ package com.ruoyi.system.domain;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
 public class OrderBillsPlans {
+
+    private String OrderNo;
     /**
-     * 主键
+     * id
      */
     private Long entityId;
-    /**
-     * 订单号
-     */
-    private String orderNo;
 
     /**
-     * 客户
-     */
-    private String a;
-    /**
-     * 日期
-     */
-    private Date date;
-    /**
-     * 装车点
-     */
-    private String b;
-    /**
-     * 卸车点
+     * 保存订单
      */
-    private String c;
+    private BigDecimal LoadQty;
+    private Date LoadDate;
+    private BigDecimal UnLoadQty;
+    private Date UnLoadDate;
+    private String EMPTYADDR1;
+    private Integer ODOMETERSTART;
+    private String EMPTYADDR2;
+    private BigDecimal ODOMETEREND;
+    private BigDecimal LOADMILE;
+    private String Remarks;
+
+
+    private BigDecimal LOADETC;
+    private BigDecimal LOADTOLL;
+    private BigDecimal OILHOMEQTY;
+    private BigDecimal OILHOMEAmt;
+
+    private BigDecimal OILAPPOINT1QTY;
+
+    private BigDecimal OILAPPOINT1Amt;
+
+    private BigDecimal OILAPPOINT2QTY;
+
+    private BigDecimal OILAPPOINT2Amt;
+    private BigDecimal OILCASH1QTY;
+    private BigDecimal OILCASH1AMT;
+
+    private String goodsCName;
+    private String loadAddr;
+    private String loadFactory;
+    private String loadAttn;
+    private String loadAttnTel;
+    private String unLoadAddr;
+    private String unLoadFactory;
+    private String unLoadAttn;
+    private String unLoadAttnTel;
+    private String planRemarks;
+
+    private Long actId;
+    private Long lineNo;
+    private Long carId;
+
 }

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

@@ -0,0 +1,12 @@
+package com.ruoyi.system.domain.vo;
+
+import com.ruoyi.system.domain.Items;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ItemsVo extends Items {
+
+    private BigDecimal atm1;
+}

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

@@ -0,0 +1,13 @@
+package com.ruoyi.system.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LoadFeeItemsVo {
+
+    private List<ItemsVo> itemsVoList;
+
+    private Long entityid;
+}

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

@@ -1,6 +1,8 @@
 package com.ruoyi.system.domain.vo;
 
+import com.ruoyi.system.domain.OrderBillsPlans;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 

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

@@ -11,4 +11,11 @@ public interface EmplsMapper {
      * @return EMPLID
      */
     Long getByEmpl(String userName);
+
+    /**
+     * 根据empl查询
+     * @param userName
+     * @return
+     */
+    Empls getEmplsByEmpl(String userName);
 }

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

@@ -1,7 +1,8 @@
 package com.ruoyi.system.mapper;
 
-import com.ruoyi.system.domain.OrderBillsPlans;
-import com.ruoyi.system.domain.WfTaskList;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.domain.vo.ItemsVo;
+import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,6 +13,7 @@ import java.util.Map;
 public interface OrderBillsPlansMapper {
     /**
      * 获取业务表数据
+     *
      * @param emplId
      * @param dataStart
      * @param dataEnd
@@ -20,10 +22,44 @@ public interface OrderBillsPlansMapper {
     List<WfTaskList> getOrderBillsPlansLsit(Map map);
 
     /**
-     * 根据id查询
+     * 根据orderNo查询
      *
-     * @param entityId 主键
+     * @param orderNo 订单号
      * @return 详情
      */
-    OrderBillsPlans getOrderBillsPlansByid(Long entityId);
+    OrderBillsPlans getOrderBillsPlansByid(Long orderNo);
+
+    /**
+     * 保存保单信息
+     *
+     * @param orderBillsPlans
+     * @return
+     */
+    Integer updateOrderBillsPlansByid(OrderBillsPlans orderBillsPlans);
+
+    /**
+     * 获取报销费用list
+     *
+     * @return
+     */
+    List<ItemsVo> getItemsList();
+
+    Integer insertLoadFeeItems(@Param("l") LoadFeeItems loadFeeItems, @Param("o") OrderBillsPlans orderBillsPlans, @Param("e") Empls empls);
+
+    @MapKey("itemId")
+    Map<String, LoadFeeItems> getLoadFeeitemsMapByentityIdKeyItemId(Long entityId);
+
+    /**
+     * 更新金额
+     *
+     * @param loadFeeItems
+     * @return
+     */
+    Integer updateLoadFeeItems(LoadFeeItems loadFeeItems);
+
+    /**
+     * 查询报销费用报销金额下拉选
+     * @return
+     */
+    List<GasStations> getGasStations();
 }

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

@@ -1,8 +1,12 @@
 package com.ruoyi.system.service;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.Items;
 import com.ruoyi.system.domain.OrderBillsPlans;
 import com.ruoyi.system.domain.WfTaskList;
+import com.ruoyi.system.domain.vo.ItemsVo;
+import com.ruoyi.system.domain.vo.LoadFeeItemsVo;
+import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
 
 import java.util.List;
 
@@ -18,17 +22,37 @@ public interface IOrderBillsPlansService {
     List<WfTaskList> getOrderBillsPlansList(String dataStart, String dataEnd, String orderNo);
 
     /**
-     * 根据id查询
+     * 根据orderNo查询
      *
-     * @param entityId 主键
+     * @param orderNo orderNo
      * @return 详情
      */
-    OrderBillsPlans getOrderBillsPlansByid(Long entityId);
+    OrderBillsPlans getOrderBillsPlansByid(Long orderNo);
+
+
+    /**
+     * 保存保单信息
+     * @param orderBillsPlans
+     * @return
+     */
+    AjaxResult putOrderBillsPlansByid(OrderBillsPlans orderBillsPlans);
+
+    /**
+     *  获取报销费用list
+     * @return
+     */
+    List<ItemsVo> getItemsList(Long entityId);
 
     /**
      * 报销
-     * @param entityid entityid
+     * @param loadFeeItemsVo
      * @return 操作结果
      */
-    AjaxResult updateLoadFeeItems(Long entityid);
+    AjaxResult insertLoadFeeItems(LoadFeeItemsVo loadFeeItemsVo);
+
+    /**
+     * 查询报销费用报销金额下拉选
+     * @return
+     */
+    AjaxResult getGasStations();
 }

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

@@ -4,14 +4,19 @@ 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.common.utils.SnowFlakeUtil;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.domain.vo.ItemsVo;
+import com.ruoyi.system.domain.vo.LoadFeeItemsVo;
+import com.ruoyi.system.domain.vo.OrderBillsPlansVo;
 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.beans.Transient;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -52,6 +57,10 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
         Long emplId = 0L;
 
         Map<String, Object> map = new HashMap<>();
+        if (dataEnd != null && !"".equals(dataEnd)) {
+            dataStart += " 00:00:00";
+            dataEnd += " 23:59:59";
+        }
         map.put("emplId", emplId);
         map.put("dataStart", dataStart);
         map.put("dataEnd", dataEnd);
@@ -62,24 +71,96 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
     }
 
     /**
-     * 根据id查询
+     * 根据orderNo查询
      *
-     * @param entityId 主键
+     * @param orderNo orderNo
      * @return 详情
      */
     @Override
-    public OrderBillsPlans getOrderBillsPlansByid(Long entityId) {
-        return orderBillsPlansMapper.getOrderBillsPlansByid(entityId);
+    public OrderBillsPlans getOrderBillsPlansByid(Long orderNo) {
+        return orderBillsPlansMapper.getOrderBillsPlansByid(orderNo);
+    }
+
+
+    /**
+     * 保存保单信息
+     *
+     * @param orderBillsPlans
+     * @return
+     */
+    @Override
+    public AjaxResult putOrderBillsPlansByid(OrderBillsPlans orderBillsPlans) {
+        Integer i = orderBillsPlansMapper.updateOrderBillsPlansByid(orderBillsPlans);
+        return null;
+    }
+
+    /**
+     * 获取报销费用list
+     *
+     * @return
+     */
+    @Override
+    public List<ItemsVo> getItemsList(Long entityId) {
+
+        List<ItemsVo> itemsList = orderBillsPlansMapper.getItemsList();
+
+        Map<String, LoadFeeItems> loadFeeItemsMap = orderBillsPlansMapper.getLoadFeeitemsMapByentityIdKeyItemId(entityId);
+
+        for (ItemsVo itemsVo : itemsList) {
+            itemsVo.setAtm1(loadFeeItemsMap.get(itemsVo.getItemId()).getAtm1());
+        }
+
+        return itemsList;
     }
 
     /**
      * 报销
-     * @param entityid entityid
+     *
+     * @param loadFeeItemsVo
      * @return 操作结果
      */
+    @Transient
     @Override
-    public AjaxResult updateLoadFeeItems(Long entityid) {
-        // orderBillsPlansMapper
-        return null;
+    public AjaxResult insertLoadFeeItems(LoadFeeItemsVo loadFeeItemsVo) {
+        Long entityid = loadFeeItemsVo.getEntityid();
+
+        Map<String, LoadFeeItems> map = new HashMap<>();
+
+        // 查询数据
+        map = orderBillsPlansMapper.getLoadFeeitemsMapByentityIdKeyItemId(entityid);
+        // 修改为订单号
+        OrderBillsPlans orderBillsPlans = orderBillsPlansMapper.getOrderBillsPlansByid(entityid);
+        // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
+        String userName = SecurityUtils.getLoginUser().getUsername();
+        Empls empls = emplsMapper.getEmplsByEmpl(userName);
+
+
+        // 更新数据
+        for (ItemsVo itemsVo : loadFeeItemsVo.getItemsVoList()) {
+            //  获取当前类型
+            LoadFeeItems loadFeeItems = map.get(itemsVo.getItemId());
+
+            if (loadFeeItems != null) {
+                // 修改值
+                loadFeeItems.setAtm1(itemsVo.getAtm1());
+                Integer y = orderBillsPlansMapper.updateLoadFeeItems(loadFeeItems);
+            } else {
+                // 雪花id
+                SnowFlakeUtil snowFlakeUtil = new SnowFlakeUtil(12, 13);
+                long nextId = snowFlakeUtil.getNextId();
+                loadFeeItems.setLineNo(nextId);
+                Integer i = orderBillsPlansMapper.insertLoadFeeItems(loadFeeItems, orderBillsPlans, empls);
+            }
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 查询报销费用报销金额下拉选
+     * @return
+     */
+    @Override
+    public AjaxResult getGasStations() {
+        return AjaxResult.success(orderBillsPlansMapper.getGasStations());
     }
 }

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

@@ -5,6 +5,9 @@
 <mapper namespace="com.ruoyi.system.mapper.EmplsMapper">
 
     <select id="getByEmpl" resultType="java.lang.Long">
-        select emtlId from EMPLS where emplId = #{userName}
+        select emplId from EMPLS where EMPL = #{userName}
+    </select>
+    <select id="getEmplsByEmpl" resultType="com.ruoyi.system.domain.Empls">
+        select empl from empls where EMPL = #{userName}
     </select>
 </mapper>

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

@@ -3,6 +3,35 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.OrderBillsPlansMapper">
+    <insert id="insertLoadFeeItems">
+        Insert Into LoadFeeItems (SysID, EntityID, LineNo, CarID, ItemID, ItemProp, ItemAuditType, Dc, Qty, Price, Amt,
+                                  OpUserID, OpUserName, SrcActID, SrcEntityID, SrcLineNo)
+        values (1, #{o.entityId}, #{l.lineNo}, #{o.carId}, #{l.itemId}, #{l.itemProp}, #{l.itemAuditType}, 'C', 1,
+                '录入', '录入',
+                #{e.}, #{e.empl}, #{o.actId}, #{o.entityId}, #{o.lineNo})
+    </insert>
+
+    <update id="updateOrderBillsPlansByid">
+        update OrderBillsPlans
+        set LoadQty       = #{LoadQty},
+            LoadDate      = #{LoadDate},
+            UnLoadQty     = #{UnLoadQty},
+            UnLoadDate    = #{UnLoadDate},
+            EMPTYADDR1    = #{EMPTYADDR1},
+            ODOMETERSTART = #{ODOMETERSTART},
+            EMPTYADDR2    = #{EMPTYADDR2},
+            ODOMETEREND   = #{ODOMETEREND},
+            LOADMILE      = #{LOADMILE},
+            Remarks       = #{Remarks}
+        where sysId = '1'
+          and OrderNo = #{OrderNo}
+    </update>
+    <update id="updateLoadFeeItems">
+        update LoadFeeItems
+        set atm1 = #{atm1}
+        where itemId = #{itemId}
+          and entityId = #{entityId}
+    </update>
 
 
     <select id="getOrderBillsPlansLsit" parameterType="Map" resultType="com.ruoyi.system.domain.WfTaskList">
@@ -51,10 +80,10 @@
             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}
+                and b.BillDate >= #{dataStart, jdbcType=VARCHAR} and b.BillDate &lt;= #{dataEnd, jdbcType=VARCHAR}
             </if>
             and p.IFORDER1ED='T'
-            and ((p.DRIVER1ID=#{emplId}) or (p.SUPERCARGOID=#{emplId}))
+            and ((p.DRIVER1ID=#{emplId, jdbcType=VARCHAR}) or (p.SUPERCARGOID=#{emplId, jdbcType=VARCHAR}))
 
             <if test="orderNo != null and orderNo != ''">
 --                 and p.orderNo like concat('%', #{orderNo}, '%')
@@ -65,6 +94,36 @@
     </select>
 
     <select id="getOrderBillsPlansByid" resultType="com.ruoyi.system.domain.OrderBillsPlans">
-        select * from OrderBillsPlans where entityId = #{entityId}
+        Select g.CName  goodsCName
+             , p.LoadAddr loadAddr
+             , l.SName  loadFactory
+             , p.LoadAttn loadAttn
+             , p.LoadAttnTel loadAttnTel
+             , p.UnLoadAddr unLoadAddr
+             , ul.SName unLoadFactory
+             , p.UnLoadAttn unLoadAttn
+             , p.UNLoadAttnTel unLoadAttnTel
+             , p.planRemarks
+        from OrderBillsPlans p
+                 Left join Empls e on (e.SysID = p.SysID and e.EmplID = p.TransactID)
+                 Left join Empls dr1 on (dr1.SysID = p.SysID and dr1.EmplID = p.DRIVER1ID)
+                 Left join Empls sp on (sp.SysID = p.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 = p.SysID and ul.CorpID = p.UnLoadFactoryID)
+                 Left join Goods g on (g.SysID = p.SysID and g.GoodsID = p.GoodsID)
+        where p.SysID = 1
+          and p.OrderNo = #{orderNo}
+    </select>
+
+
+    <select id="getItemsList" resultType="com.ruoyi.system.domain.vo.ItemsVo">
+        select itemId, cName from  Items where SysID=1 and  itemProp='F'
+    </select>
+    <select id="getLoadFeeitemsMapByentityIdKeyItemId" resultType="java.util.Map">
+        select itemId, atm1, entityId from LoadFeeItems where entityId = #{entityId}
+    </select>
+    <select id="getGasStations" resultType="com.ruoyi.system.domain.GasStations">
+        select gasStationId, cName from GasStations
     </select>
 </mapper>