危险品订单修改需求

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

@@ -43,6 +43,9 @@ public class OrderBillsPlans {
     private Double loadmile;
     @TableField(jdbcType = JdbcType.VARCHAR)
     private String remarks;
+    @TableField(jdbcType = JdbcType.VARCHAR)
+    private String driverassdesc;
+
 
     private String goodsCName;
     private String loadAddr;
@@ -100,5 +103,8 @@ public class OrderBillsPlans {
     private String gasstation2;
 
 
+    private String driver1Name;
+    private String driver1mobile;
+
 
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.util.Date;
@@ -34,5 +35,8 @@ public class WfTaskList {
     private String driver1mobile;
     private String sUPERCARGOName;
     private String transact;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date billDate;
+    private Double rightqty;
 
 }

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

@@ -15,6 +15,4 @@ public class ItemsVo extends Items {
 
     @TableField(jdbcType = JdbcType.INTEGER)
     private Long lineNo;
-
-    private Integer[] choice = new Integer[0];
 }

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

@@ -1,8 +1,10 @@
 package com.ruoyi.system.domain.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.system.domain.LoadFeeItems;
 import com.ruoyi.system.domain.OrderBillsPlans;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
 import java.util.List;
 
@@ -16,4 +18,13 @@ public class OrderBillsPlansVo extends OrderBillsPlans {
 
     private List<ItemsVo> itemsVoList;
     private List<LoadFeeItems> loadFeeItemsList;
+
+    private String driver1Name;
+    private String driver1mobile;
+
+    /**
+     * LoadBills表的EntityId，报销插入和删除用
+     */
+    @TableField(jdbcType = JdbcType.INTEGER)
+    private Long loadBillsEntityId;
 }

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

@@ -104,14 +104,14 @@ public interface OrderBillsPlansMapper {
      * @param orderBillsPlansVo
      * @return
      */
-    Integer reimbursement(OrderBillsPlansVo orderBillsPlansVo);
+    Integer updateOrderBillsPlansByOrderNo(OrderBillsPlansVo orderBillsPlansVo);
 
     /**
      * 删除
-     * @param carId
+     * @param loadBillsEntityId
      * @return
      */
-    Integer deleteLoadFeeItemsByCarId(Long carId);
+    Integer deleteLoadFeeItemsByEntityId(Long loadBillsEntityId);
 
     /**
      * 查询报销信息
@@ -120,5 +120,5 @@ public interface OrderBillsPlansMapper {
      */
     OrderBillsPlansVo getOrderBillsPlansByOrder(Long orderNo);
 
-    List<LoadFeeItems> getLoadFeeItemsByOrder(Long entityid);
+    List<LoadFeeItems> getLoadFeeItemsByEntityId(@Param("entityId") Long entityId);
 }

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

@@ -157,7 +157,7 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
     public AjaxResult insertLoadFeeItems(OrderBillsPlansVo orderBillsPlansVo) {
 
         // 更新业务表
-        Integer i = orderBillsPlansMapper.reimbursement(orderBillsPlansVo);
+        Integer i = orderBillsPlansMapper.updateOrderBillsPlansByOrderNo(orderBillsPlansVo);
 
         // 根据登录名去匹配EMPLS 里面的EMPL  找到 EMPLID
         String userName = SecurityUtils.getLoginUser().getUsername();
@@ -172,13 +172,13 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
         // }
 
         // 删除所有明细
-        Integer t = orderBillsPlansMapper.deleteLoadFeeItemsByCarId(orderBillsPlansVo.getCarId());
+        Integer t = orderBillsPlansMapper.deleteLoadFeeItemsByEntityId(orderBillsPlansVo.getLoadBillsEntityId());
 
         Long lineNo = 1L;
         for (ItemsVo itemsVo : itemsVoList) {
             itemsVo.setLineNo(lineNo);
             Integer x = orderBillsPlansMapper.insertLoadFeeItems(orderBillsPlansVo, itemsVo, empls);
-            lineNo ++;
+            lineNo++;
         }
 
 
@@ -197,13 +197,14 @@ public class OrderBillsPlansServiceImpl implements IOrderBillsPlansService {
 
     /**
      * 查询报销信息
+     *
      * @param
      * @return 数据
      */
     @Override
     public OrderBillsPlansVo getLoadFeeItems(Long orderNo) {
         OrderBillsPlansVo data = orderBillsPlansMapper.getOrderBillsPlansByOrder(orderNo);
-        List<LoadFeeItems> loadFeeItemsList = orderBillsPlansMapper.getLoadFeeItemsByOrder(data.getEntityId());
+        List<LoadFeeItems> loadFeeItemsList = orderBillsPlansMapper.getLoadFeeItemsByEntityId(data.getLoadBillsEntityId());
         data.setLoadFeeItemsList(loadFeeItemsList);
         return data;
     }

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

@@ -4,10 +4,10 @@
         "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,
+        Insert Into LoadFeeItems (SysID, EntityID, LineNo, CarID, ItemID, ItemProp, ItemAuditType, Dc, Qty, Price, Amt, AMT1, AMT2, AMTORG,
                                   OpUserID, OpUserName, SrcActID, SrcEntityID, SrcLineNo)
-        values (1, #{o.entityId}, #{i.lineNo}, #{o.carId}, #{i.itemId}, #{i.itemProp}, #{i.auditType}, 'C', 1,
-                #{i.amt}, #{i.amt},
+        values (1, #{o.loadBillsEntityId}, #{i.lineNo}, #{o.carId}, #{i.itemId}, #{i.itemProp}, #{i.auditType}, 'C', 1,
+                #{i.amt}, #{i.amt}, #{i.amt}, #{i.amt}, #{i.amt},
                 #{e.EmplId}, #{e.empl}, #{o.actId}, #{o.entityId}, #{o.lineNo})
     </insert>
 
@@ -22,11 +22,11 @@
             EMPTYADDR2    = #{emptyaddr2},
             ODOMETEREND   = #{odometerend},
             LOADMILE      = #{loadmile},
-            Remarks       = #{remarks}
+            driverassdesc = #{driverassdesc}
         where sysId = '1'
           and OrderNo = #{orderNo}
     </update>
-    <update id="reimbursement">
+    <update id="updateOrderBillsPlansByOrderNo">
         update OrderBillsPlans
         set loadetc        = #{loadetc},
             loadtoll       = #{loadtoll},
@@ -44,8 +44,8 @@
             gasstation2    = #{gasstation2}
         where orderNo = #{orderNo}
     </update>
-    <delete id="deleteLoadFeeItemsByCarId">
-        delete from LoadFeeItems where CarId = #{carId}
+    <delete id="deleteLoadFeeItemsByEntityId">
+        delete from LoadFeeItems where sysid = 1 and entityid = #{entityId}
     </delete>
 
 
@@ -79,6 +79,8 @@
         ,dr1.mobile driver1mobile
         , sp.Empl sUPERCARGOName
         ,e.Empl transact
+        , b.BillDate billDate
+        , p.rightqty
         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)
@@ -130,6 +132,12 @@
              , p.odometerend
              , p.loadmile
              , p.remarks
+             , p.driverassdesc
+
+             , dr1.Empl        driver1Name
+             , dr1.mobile      driver1mobile
+
+
         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)
@@ -153,29 +161,39 @@
         select gasStationId, cName from GasStations
     </select>
     <select id="getOrderBillsPlansByOrder" resultType="com.ruoyi.system.domain.vo.OrderBillsPlansVo">
-        select loadetc
-             , loadtoll
-             , oilhomeQty
-             , oilhomeAmt
-             , oilappoint1Qty
-             , oilappoint1Amt
-             , oilappoint2Qty
-             , oilappoint2Amt
-             , oilcash1Qty
-             , oilcash1Amt
-             , oilcardQty
-             , oilcardAmt
-             , gasstation1
-             , gasstation2
-             , entityid
-             , orderNo
-             , carId
-             , lineNo
-             , actId
-        from OrderBillsPlans
-        where orderNo = #{orderNo}
+        select o.loadetc
+             , o.loadtoll
+             , o.oilhomeQty
+             , o.oilhomeAmt
+             , o.oilappoint1Qty
+             , o.oilappoint1Amt
+             , o.oilappoint2Qty
+             , o.oilappoint2Amt
+             , o.oilcash1Qty
+             , o.oilcash1Amt
+             , o.oilcardQty
+             , o.oilcardAmt
+             , o.gasstation1
+             , o.gasstation2
+             , o.entityId
+             , o.orderNo
+             , o.carId
+             , o.lineNo
+             , o.actId
+             , b.entityID loadBillsEntityId
+             , dr1.Empl   driver1Name
+             ,dr1.mobile driver1mobile
+        FROM OrderBillsPlans o
+                 INNER JOIN LoadBills b
+                            ON
+                                        o.SysID = b.SysID
+                                    AND o.EntityID = b.SrcEntityID
+                                    AND o.LineNo = b.SrcLineNo
+
+                 Left join Empls dr1 on dr1.EmplID = o.DRIVER1ID
+        where o.orderNo = #{orderNo} and dr1.SysID = 1
     </select>
-    <select id="getLoadFeeItemsByOrder" resultType="com.ruoyi.system.domain.LoadFeeItems">
-        select itemid, amt from LoadFeeItems where sysid = 1 and entityid = #{entityid}
+    <select id="getLoadFeeItemsByEntityId" resultType="com.ruoyi.system.domain.LoadFeeItems">
+        select itemid, amt from LoadFeeItems where sysid = 1 and entityId = #{entityId}
     </select>
 </mapper>