运价修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillscarsController.java

@@ -203,6 +203,18 @@ public class ftmsorderbillscarsController extends BaseController {
     }
 
     /**
+     * 根据司机id查询详细信息(暂存)
+     */
+//    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:query')")
+    @PostMapping(value = "/selectDriverModify")
+    public AjaxResult selectDriverModify(@RequestBody Ftmsorderbillscars ftmsorderbillscars) {
+        if (StringUtils.isNull(ftmsorderbillscars) || StringUtils.isNull(ftmsorderbillscars.getId())) {
+            return AjaxResult.error("未找到运单数据，请确认");
+        }
+        return AjaxResult.success(ftmsorderbillscarsService.selectDriverModify(ftmsorderbillscars));
+    }
+
+    /**
      * 司机操作接单/提箱/装卸货/还卸柜/回单操作  保存
      */
     @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:edit')")
@@ -486,4 +498,6 @@ public class ftmsorderbillscarsController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(ftmsorderbillscarsService.deleteftmsorderbillscarsByIds(ids));
     }
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsfeesController.java

@@ -87,4 +87,45 @@ public class ftmsorderbillsfeesController extends BaseController {
         return iftmsorderbillsfeesService.insertFTmsorderbillsfeesAdd(cars, ftmsorderbillsfees);
     }
 
+    /**
+     * 单条费用提交(暂存)
+     */
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+    @Log(title = "费用补充", businessType = BusinessType.INSERT)
+    @PostMapping("/addModify")
+    @RepeatSubmit
+    public AjaxResult insertFTmsorderbillsfeesAddTemporaryStorage(@RequestParam("cars") String cars,
+                                                                  @RequestParam("ftmsorderbillsfees") String ftmsorderbillsfees) {
+        if (StringUtils.isEmpty(cars) || "{}".equals(cars)) {
+            return AjaxResult.error("未找到主表数据，请确认");
+        }
+        if (StringUtils.isEmpty(ftmsorderbillsfees) || "{}".equals(ftmsorderbillsfees)) {
+            return AjaxResult.error("未找到费用数据，请确认");
+        }
+        return iftmsorderbillsfeesService.insertFTmsorderbillsfeesAddTemporaryStorage(cars, ftmsorderbillsfees);
+    }
+
+    /**
+     * 单条费用提交(暂存)提交审批
+     * 2021-07-19 dongyongwei
+     */
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:add')")
+    @Log(title = "提交审批", businessType = BusinessType.INSERT)
+    @GetMapping("/submitOrderbillsfeesModifyApproval")
+    @RepeatSubmit
+    public AjaxResult submitOrderbillsfeesModifyApproval(@RequestParam("fId") Long fId) {
+
+        return iftmsorderbillsfeesService.submitOrderbillsfeesModifyApproval(fId);
+    }
+
+    /**
+     * 删除
+     */
+    @Log(title = "订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/modify/{fId}")
+    @RepeatSubmit
+    public AjaxResult remove(@PathVariable Long fId) {
+        iftmsorderbillsfeesService.deleteFTmsorderbillsfeesModifyById(fId);
+        return AjaxResult.success();
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/quotation/TSeapriceController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.quotation.domain.TSeaprice;
+import com.ruoyi.quotation.domain.TSeapriceitem;
 import com.ruoyi.quotation.service.ITSeapriceService;
 import com.ruoyi.system.domain.SysCheckCode;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
@@ -69,6 +70,19 @@ public class TSeapriceController extends BaseController
     }
 
     /**
+     * 手机端专用
+     * @param tSeaprice
+     * @return
+     */
+    @GetMapping("/queryApp")
+    public TableDataInfo queryApp(TSeaprice tSeaprice)
+    {
+        startPage();
+        List<Map<String, Object>> list = tSeapriceService.selectTSeapriceMapList(tSeaprice);
+        return getDataTable(list);
+    }
+
+    /**
      *  查询app 必要的基础资料
      * @return
      */

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillscars.java

@@ -25,6 +25,17 @@ public class Ftmsorderbillscars extends BaseEntity {
     @Excel(name = "主表id")
     private Long pId;
 
+    /** 来源ID */
+    private Long srcMId;
+
+    public Long getSrcMId() {
+        return srcMId;
+    }
+
+    public void setSrcMId(Long srcMId) {
+        this.srcMId = srcMId;
+    }
+
     /** 原始id */
     @Excel(name = "原始id")
     private Long orgId;

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillsfees.java

@@ -24,6 +24,17 @@ public class Ftmsorderbillsfees extends BaseEntity {
     @Excel(name = "对应主表id")
     private Long fPid;
 
+    /** 来源ID */
+    private Long srcMId;
+
+    public Long getSrcMId() {
+        return srcMId;
+    }
+
+    public void setSrcMId(Long srcMId) {
+        this.srcMId = srcMId;
+    }
+
     /** 活动号 */
     @Excel(name = "活动号")
     private Long actId;

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscarsMapper.java

@@ -37,6 +37,14 @@ public interface FtmsorderbillscarsMapper {
     public int insertftmsorderbillscars(Ftmsorderbillscars ftmsorderbillscars);
 
     /**
+     * 新增车队派车
+     *
+     * @param ftmsorderbillscars 车队派车(暂存)
+     * @return 结果
+     */
+    public int insertftmsorderbillscarsTemporaryStorage(Ftmsorderbillscars ftmsorderbillscars);
+
+    /**
      * 修改车队派车
      *
      * @param ftmsorderbillscars 车队派车
@@ -125,6 +133,15 @@ public interface FtmsorderbillscarsMapper {
     public List<Ftmsorderbillscars> selectftmsorderbillscarsByPid(long pId);
 
     /**
+     * 查询车队派车
+     *
+     * @param srcMId 车队派车ID(来源ID)
+     * @return 车队派车
+     */
+    public List<Ftmsorderbillscars> selectftmsorderbillscarsTemporaryStorageBySrcMId(Long srcMId);
+
+
+    /**
      * 根据carid查询主表数据
      *
      * @param id    主表id

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillsfeesMapper.java

@@ -21,6 +21,8 @@ public interface FtmsorderbillsfeesMapper {
      */
     public Ftmsorderbillsfees selectFTmsorderbillsfeesById(Long fId);
 
+    public Ftmsorderbillsfees selectFTmsorderbillsfeesModifyById(Long fId);
+
     /**
      * 查询车队费用列表
      *
@@ -38,6 +40,16 @@ public interface FtmsorderbillsfeesMapper {
     public int insertFTmsorderbillsfees(Ftmsorderbillsfees fTmsorderbillsfees);
 
     /**
+     * 新增车队费用
+     *
+     * @param fTmsorderbillsfees 车队费用
+     * @return 结果
+     */
+    public int insertFTmsorderbillsfeesTemporaryStorage(Ftmsorderbillsfees fTmsorderbillsfees);
+
+
+
+    /**
      * 修改车队费用
      *
      * @param fTmsorderbillsfees 车队费用
@@ -45,6 +57,10 @@ public interface FtmsorderbillsfeesMapper {
      */
     public int updateFTmsorderbillsfees(Ftmsorderbillsfees fTmsorderbillsfees);
 
+    public int updateFTmsorderbillsfeesModify(Ftmsorderbillsfees fTmsorderbillsfees);
+
+
+
     /**
      * 删除车队费用
      *
@@ -53,6 +69,8 @@ public interface FtmsorderbillsfeesMapper {
      */
     public int deleteFTmsorderbillsfeesById(Long fId);
 
+    public int deleteFTmsorderbillsfeesModifyById(Long fId);
+
     /**
      * 批量删除车队费用
      *
@@ -75,6 +93,8 @@ public interface FtmsorderbillsfeesMapper {
      */
     public List<Ftmsorderbillsfees> selectFTmsorderbillsfeesByPId(long pId);
 
+    public List<Ftmsorderbillsfees> selectFTmsorderbillsfeesBySrcMId(long srcMId);
+
     /**
      *  根据条件删除对应数据
      * @param ftmsorderbillsfees    参数

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillscarsService.java

@@ -135,6 +135,8 @@ public interface IftmsorderbillscarsService {
      */
     public Map<String, Object> selectDriver(Ftmsorderbillscars ftmsorderbillscars);
 
+    public Map<String, Object> selectDriverModify(Ftmsorderbillscars ftmsorderbillscars);
+
     /**
      * 根据手机号查询司机的
      * 新订单、本月订单、本月历程、本月运费

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillsfeesService.java

@@ -29,6 +29,14 @@ public interface IftmsorderbillsfeesService {
      */
     public AjaxResult insertFTmsorderbillsfeesAdd(String cars, String fees);
 
+    /**
+     *  单条费用暂存分表
+     * @param cars      主表信息
+     * @param fees      费用
+     * @return  结果
+     * dongyongwei 2021-07-19
+     */
+    public AjaxResult insertFTmsorderbillsfeesAddTemporaryStorage(String cars, String fees);
 
     /**
      * 查询车队费用列表
@@ -70,10 +78,15 @@ public interface IftmsorderbillsfeesService {
      */
     public int deleteFTmsorderbillsfeesById(Long fId);
 
+    public int deleteFTmsorderbillsfeesModifyById(Long fId);
+
     /**
      *  查询费用是否允许变更、删除
      * @param fId   费用信息id
      * @return  结果
      */
     public AjaxResult ftmsorderbillsChange(Long fId, String types);
+
+    /** 提交审批 暂存费用明细*/
+    public AjaxResult submitOrderbillsfeesModifyApproval(Long fId);
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -256,6 +256,30 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
     }
 
     /**
+     *
+     * 获取暂存表数据
+     * @param ftmsorderbillscars
+     * @return
+     */
+    @Override
+    public Map<String, Object> selectDriverModify(Ftmsorderbillscars ftmsorderbillscars) {
+        Map<String, Object> map = new HashMap<>();
+        Long id = ftmsorderbillscars.getId();
+        Map<String, Object> carsMap = ftmsorderbillscarsMapper.selectTmsorderbillsCarsByDriver(id);
+        if (StringUtils.isNotNull(carsMap)) {
+            String billKind = carsMap.get("billKind").toString();
+            if (StringUtils.isNotEmpty(billKind) && "MM".equalsIgnoreCase(billKind)) {
+                String mBillNo = carsMap.get("mBillNo").toString();
+                map.put("carsTable", ftmsorderbillscarsMapper.selectTmsorderbillsCarsByBillKind(mBillNo));
+            }
+        }
+        map.put("cars", carsMap);
+        map.put("feesListModify", ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesBySrcMId(id));
+        map.put("feesListAudited", ftmsorderbillsfeesMapper.selectFTmsorderbillsfeesByPId(id));
+        return map;
+    }
+
+    /**
      * 司机操作接单/提箱/装卸货/还卸柜/回单操作  变更
      *
      * @param cars          司机信息

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillsfeesServiceImpl.java

@@ -15,6 +15,8 @@ import com.ruoyi.orderPlan.mapper.FtmsorderbillscarsMapper;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillsfees;
 import com.ruoyi.orderPlan.mapper.FtmsorderbillsfeesMapper;
 import com.ruoyi.orderPlan.service.IftmsorderbillsfeesService;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.mapper.SysConfigMapper;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +58,9 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
     @Autowired
     private TCorpsMapper tCorpsMapper;
 
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+
 
     /**
      * 查询车队费用
@@ -100,6 +105,60 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
     }
 
     /**
+     * 单条费用暂存分表
+     *
+     * @param cars 主表信息
+     * @param fees 费用
+     * @return 结果
+     * dongyongwei 2021-07-19
+     */
+    @Override
+    public AjaxResult insertFTmsorderbillsfeesAddTemporaryStorage(String cars, String fees) {
+        //car 存储到 car_modify
+        Map<String, Object> map = new HashMap<>();
+        Ftmsorderbillscars tmsorderbillscars = JSONArray.parseObject(cars, Ftmsorderbillscars.class);
+        Long fId = tmsorderbillscars.getId();
+        //先判断是否已经暂存过car_modify
+        List<Ftmsorderbillscars> ftmsorderbillscarsList = ftmsorderbillscarsMapper.selectftmsorderbillscarsTemporaryStorageBySrcMId(fId);
+        //如果已经暂存过,直接处理fees_modify
+        Ftmsorderbillscars ftmsorderbillscarsTemporaryStorageAdded = new Ftmsorderbillscars();//暂存CAR
+        if(ftmsorderbillscarsList.size()>0){
+            ftmsorderbillscarsTemporaryStorageAdded = ftmsorderbillscarsList.get(0);
+        }else{
+            //如果没有暂存过,暂存并处理fees_modify
+            Ftmsorderbillscars ftmsorderbillscarsTemporaryStorage = ftmsorderbillscarsMapper.selectftmsorderbillscarsById(fId);
+            //处理car_modify规则数据
+            ftmsorderbillscarsTemporaryStorage.setSrcMId(fId);
+            int i=ftmsorderbillscarsMapper.insertftmsorderbillscarsTemporaryStorage(ftmsorderbillscarsTemporaryStorage);
+            if(i>0){
+                //先获取暂存car_modify数据出来
+                if(ftmsorderbillscarsList.size()>0){
+                    ftmsorderbillscarsTemporaryStorageAdded= ftmsorderbillscarsList.get(0);
+                }
+            }
+        }
+        //fees 存储到 fees_modify
+        //  费用添加
+        Ftmsorderbillsfees ftmsorderbillsfees = JSONArray.parseObject(fees, Ftmsorderbillsfees.class);
+        ftmsorderbillsfees.setfPid(ftmsorderbillscarsTemporaryStorageAdded.getId());
+        ftmsorderbillsfees.setOrgId(ftmsorderbillscarsTemporaryStorageAdded.getOrgId());
+        //存储来源CAR的ID,方便回写
+        ftmsorderbillsfees.setSrcMId(tmsorderbillscars.getId());
+        ftmsorderbillsfees.setfBillstatus(0L);
+        if (StringUtils.isNull(ftmsorderbillsfees.getfId())) {
+            ftmsorderbillsfees.setCreateTime(new Date());
+            ftmsorderbillsfees.setCreateBy(SecurityUtils.getUsername());
+            fTmsorderbillsfeesMapper.insertFTmsorderbillsfeesTemporaryStorage(ftmsorderbillsfees);
+        } else {
+            ftmsorderbillsfees.setUpdateTime(new Date());
+            ftmsorderbillsfees.setUpdateBy(SecurityUtils.getUsername());
+            fTmsorderbillsfeesMapper.updateFTmsorderbillsfeesModify(ftmsorderbillsfees);
+        }
+
+        return AjaxResult.success();
+    }
+
+    /**
      * 查询车队费用列表
      *
      * @param fTmsorderbillsfees 车队费用
@@ -156,6 +215,11 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
         return fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesById(fId);
     }
 
+    @Override
+    public int deleteFTmsorderbillsfeesModifyById(Long fId) {
+        return fTmsorderbillsfeesMapper.deleteFTmsorderbillsfeesModifyById(fId);
+    }
+
     /**
      * 查询费用是否允许变更、删除
      *
@@ -207,4 +271,37 @@ public class FtmsorderbillsfeesServiceImpl implements IftmsorderbillsfeesService
         }
         return AjaxResult.success();
     }
+
+    /**
+     * 提交审批 暂存费用明细
+     *
+     * @param fId
+     */
+    @Override
+    public AjaxResult submitOrderbillsfeesModifyApproval(Long fId) {
+        //暂时直接回写数据
+        //先获取审批数据行
+        Ftmsorderbillsfees ftmsorderbillsfees = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesModifyById(fId);
+        ftmsorderbillsfees.setfBillstatus(6L);
+        //回写逻辑,srcMId返回给pId,进行绑定
+        ftmsorderbillsfees.setfPid(ftmsorderbillsfees.getSrcId());
+        fTmsorderbillsfeesMapper.insertFTmsorderbillsfees(ftmsorderbillsfees);
+        return AjaxResult.success();
+        /*
+        //提交审批流
+        //先获取审批数据行
+        Ftmsorderbillsfees ftmsorderbillsfees = fTmsorderbillsfeesMapper.selectFTmsorderbillsfeesModifyById(fId);
+
+        //判断审批流启动与否
+        SysConfig sysConfig = sysConfigMapper.checkConfigKeyUnique("fleet.ftmsorderbillsfees.addModify");
+        if("0".equals(sysConfig.getConfigValue())){
+            //审批流已启动
+            //创建审批流
+
+            return AjaxResult.success();
+        }else{
+            return AjaxResult.error("审批流未启动或未创建");
+        }
+         */
+    }
 }

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="ftmsorderbillscars" id="ftmsorderbillscarsResult">
         <result property="id"    column="id"    />
         <result property="pId"    column="p_id"    />
+        <result property="srcMId"    column="src_m_id"    />
         <result property="orgId"    column="org_id"    />
         <result property="orderNo"    column="order_no"    />
         <result property="cntrId"    column="cntr_id"    />
@@ -134,6 +135,22 @@
                    accchk_date_dr from F_TMSORDERBILLSCARS
     </sql>
 
+    <sql id="selectftmsorderbillscarsTemporaryStorageVo">
+        select id, p_id, org_id, order_no, cntr_id, corp_id, cntr_no, carcor_pid, mblno, carreg_no, driver_name, driver_user_id,
+               driver_tel, plan_date, plan_remarks, accept_date, accept_remarks, load_date, load_remarks, md_load_date, off_data,
+               off_remarks, md_load_remarks, un_load_date, un_load_remarks, waybill_date, qty_load, qty_un_load, cntr_qty,
+               gopods_loss_qty, cntr_weight, gopods_lossrate, waybill_remarks, gopods_lossamt_cr, qty_dr, gopods_lossamt_dr,
+               qty_cr, freight_price_dr, freight_price_cr, freight_amt_dr, freight_amt_cr, feeitem_dr, feeitem_dr_remarks,
+               feeitem_cr, feeitem_cr_remarks, amt_dr, amt_cr, due_date_dr, due_date_cr, odometer_from, odometer_end, miles_empty,
+               miles_load, miles, driverbonus, costtoll, costmaintain, cost_oth, cost_remarks, oil_qtyper, oil_qty1, oil_price1,
+               oil_amt1, oil_qty2, oil_price2, oil_amt2, oil_qty, oil_price, oil_amt, oil_qty_blc, oil_amt_blc, profit, inv_dr_need,
+               inv_dr_status, inv_dr_taxrate, inv_dr_taxamt, inv_dr_date, inv_dr_no, accchk_staus, bill_status, order_status, accchk_date_cr,
+               costom_amt_01, stl_amt_dr, costom_amt_02, stl_date_dr, costom_amt_03, stl_amt_cr, costom_amt_04, stl_date_cr,
+               costom_amt_05, costom_amt_06, del_flag, costom_str_01, create_by, create_time, costom_str_02, update_by, update_time,
+               m_bill_no, bill_kind, remarks, profit_bill, profit_car, inv_amt_cr, inv_amt_dr, inv_date_cr, inv_date_dr, accchk_amt_cr, accchk_amt_dr,
+               accchk_date_dr from F_TMSORDERBILLSCARS_MODIFY
+    </sql>
+
     <select id="selectftmsorderbillscarsList" parameterType="ftmsorderbillscars" resultMap="ftmsorderbillscarsResult">
         <include refid="selectftmsorderbillscarsVo"/>
         <where>
@@ -627,6 +644,11 @@
         where p_id = #{pId}
     </select>
 
+    <select id="selectftmsorderbillscarsTemporaryStorageBySrcMId" parameterType="Long" resultMap="ftmsorderbillscarsResult">
+        <include refid="selectftmsorderbillscarsTemporaryStorageVo"/>
+        where src_m_id = #{srcMId}
+    </select>
+
     <select id="selectStowageList" parameterType="ftmsorderbills" resultType="Map">
         SELECT
             #{id} id,
@@ -1159,6 +1181,236 @@
         </trim>
     </insert>
 
+    <insert id="insertftmsorderbillscarsTemporaryStorage" parameterType="ftmsorderbillscars" useGeneratedKeys="true" keyProperty="id">
+        insert into F_TMSORDERBILLSCARS_MODIFY
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="pId != null">p_id,</if>
+            <if test="orgId != null">org_id,</if>
+            <if test="srcMId!= null">src_m_id,</if>
+            <if test="orderNo != null">order_no,</if>
+            <if test="cntrId != null">cntr_id,</if>
+            <if test="cntrNo != null">cntr_no,</if>
+            <if test="carcorPid != null">carcor_pid,</if>
+            <if test="carregNo != null">carreg_no,</if>
+            <if test="mblno != null">mblno,</if>
+            <if test="driverName != null">driver_name,</if>
+            <if test="driverTel != null">driver_tel,</if>
+            <if test="driverUserId != null">driver_user_id,</if>
+            <if test="planDate != null">plan_date,</if>
+            <if test="planRemarks != null">plan_remarks,</if>
+            <if test="acceptDate != null">accept_date,</if>
+            <if test="acceptRemarks != null">accept_remarks,</if>
+            <if test="loadDate != null">load_date,</if>
+            <if test="loadRemarks != null">load_remarks,</if>
+            <if test="mdLoadDate != null">md_load_date,</if>
+            <if test="offData != null">off_data,</if>
+            <if test="offRemarks != null">off_remarks,</if>
+            <if test="mdLoadRemarks != null">md_load_remarks,</if>
+            <if test="unLoadDate != null">un_load_date,</if>
+            <if test="unLoadRemarks != null">un_load_remarks,</if>
+            <if test="waybillDate != null">waybill_date,</if>
+            <if test="qtyLoad != null">qty_load,</if>
+            <if test="cntrQty != null">cntr_qty,</if>
+            <if test="qtyUnLoad != null">qty_un_load,</if>
+            <if test="cntrWeight != null">cntr_weight,</if>
+            <if test="gopodsLossQty != null">gopods_loss_qty,</if>
+            <if test="gopodsLossrate != null">gopods_lossrate,</if>
+            <if test="gopodsLossamtCr != null">gopods_lossamt_cr,</if>
+            <if test="qtyDr != null">qty_dr,</if>
+            <if test="waybillRemarks != null">waybill_remarks,</if>
+            <if test="gopodsLossamtDr != null">gopods_lossamt_dr,</if>
+            <if test="qtyCr != null">qty_cr,</if>
+            <if test="freightPriceDr != null">freight_price_dr,</if>
+            <if test="freightPriceCr != null">freight_price_cr,</if>
+            <if test="freightAmtDr != null">freight_amt_dr,</if>
+            <if test="freightAmtCr != null">freight_amt_cr,</if>
+            <if test="feeitemDr != null">feeitem_dr,</if>
+            <if test="feeitemDrRemarks != null">feeitem_dr_remarks,</if>
+            <if test="feeitemCr != null">feeitem_cr,</if>
+            <if test="feeitemCrRemarks != null">feeitem_cr_remarks,</if>
+            <if test="amtDr != null">amt_dr,</if>
+            <if test="amtCr != null">amt_cr,</if>
+            <if test="dueDateDr != null">due_date_dr,</if>
+            <if test="dueDateCr != null">due_date_cr,</if>
+            <if test="odometerFrom != null">odometer_from,</if>
+            <if test="odometerEnd != null">odometer_end,</if>
+            <if test="milesEmpty != null">miles_empty,</if>
+            <if test="milesLoad != null">miles_load,</if>
+            <if test="miles != null">miles,</if>
+            <if test="driverbonus != null">driverbonus,</if>
+            <if test="costtoll != null">costtoll,</if>
+            <if test="costmaintain != null">costmaintain,</if>
+            <if test="costOth != null">cost_oth,</if>
+            <if test="costRemarks != null">cost_remarks,</if>
+            <if test="oilQtyper != null">oil_qtyper,</if>
+            <if test="oilQty1 != null">oil_qty1,</if>
+            <if test="oilPrice1 != null">oil_price1,</if>
+            <if test="oilAmt1 != null">oil_amt1,</if>
+            <if test="oilQty2 != null">oil_qty2,</if>
+            <if test="oilPrice2 != null">oil_price2,</if>
+            <if test="oilAmt2 != null">oil_amt2,</if>
+            <if test="oilQty != null">oil_qty,</if>
+            <if test="oilPrice != null">oil_price,</if>
+            <if test="oilAmt != null">oil_amt,</if>
+            <if test="oilQtyBlc != null">oil_qty_blc,</if>
+            <if test="oilAmtBlc != null">oil_amt_blc,</if>
+            <if test="profit != null">profit,</if>
+            <if test="invDrNeed != null">inv_dr_need,</if>
+            <if test="invDrStatus != null">inv_dr_status,</if>
+            <if test="invDrTaxrate != null">inv_dr_taxrate,</if>
+            <if test="invDrTaxamt != null">inv_dr_taxamt,</if>
+            <if test="invDrDate != null">inv_dr_date,</if>
+            <if test="invDrNo != null">inv_dr_no,</if>
+            <if test="accchkStaus != null">accchk_staus,</if>
+            <if test="billStatus != null">bill_status,</if>
+            <if test="orderStatus != null">order_status,</if>
+            <if test="costomAmt01 != null">costom_amt_01,</if>
+            <if test="costomAmt02 != null">costom_amt_02,</if>
+            <if test="stlAmtDr != null">stl_amt_dr,</if>
+            <if test="costomAmt03 != null">costom_amt_03,</if>
+            <if test="stlDateDr != null">stl_date_dr,</if>
+            <if test="costomAmt04 != null">costom_amt_04,</if>
+            <if test="stlAmtCr != null">stl_amt_cr,</if>
+            <if test="costomAmt05 != null">costom_amt_05,</if>
+            <if test="stlDateCr != null">stl_date_cr,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="costomAmt06 != null">costom_amt_06,</if>
+            <if test="costomStr01 != null">costom_str_01,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="costomStr02 != null">costom_str_02,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="accchkDateCr != null">accchk_date_cr,</if>
+            <if test="mBillNo != null">m_bill_no,</if>
+            <if test="billKind != null">bill_kind,</if>
+            <if test="profitBill != null">profit_bill,</if>
+            <if test="profitCar != null">profit_car,</if>
+            <if test="corpId != null">corp_id,</if>
+            <if test="invAmtCr != null">inv_amt_cr,</if>
+            <if test="invAmtDr != null">inv_amt_dr,</if>
+            <if test="invDateCr != null">inv_date_cr,</if>
+            <if test="invDateDr != null">inv_date_dr,</if>
+            <if test="accchkAmtCr != null">accchk_amt_cr,</if>
+            <if test="accchkAmtDr != null">accchk_amt_dr,</if>
+            <if test="accchkDateDr != null">accchk_date_dr,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="pId != null">#{pId},</if>
+            <if test="orgId != null">#{orgId},</if>
+            <if test="srcMId!= null">#{srcMId},</if>
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="cntrId != null">#{cntrId},</if>
+            <if test="cntrNo != null">#{cntrNo},</if>
+            <if test="carcorPid != null">#{carcorPid},</if>
+            <if test="carregNo != null">#{carregNo},</if>
+            <if test="mblno != null">#{mblno},</if>
+            <if test="driverName != null">#{driverName},</if>
+            <if test="driverTel != null">#{driverTel},</if>
+            <if test="driverUserId != null">#{driverUserId},</if>
+            <if test="planDate != null">#{planDate},</if>
+            <if test="planRemarks != null">#{planRemarks},</if>
+            <if test="acceptDate != null">#{acceptDate},</if>
+            <if test="acceptRemarks != null">#{acceptRemarks},</if>
+            <if test="loadDate != null">#{loadDate},</if>
+            <if test="loadRemarks != null">#{loadRemarks},</if>
+            <if test="mdLoadDate != null">#{mdLoadDate},</if>
+            <if test="offData != null">#{offData},</if>
+            <if test="offRemarks != null">#{offRemarks},</if>
+            <if test="mdLoadRemarks != null">#{mdLoadRemarks},</if>
+            <if test="unLoadDate != null">#{unLoadDate},</if>
+            <if test="unLoadRemarks != null">#{unLoadRemarks},</if>
+            <if test="waybillDate != null">#{waybillDate},</if>
+            <if test="qtyLoad != null">#{qtyLoad},</if>
+            <if test="cntrQty != null">#{cntrQty},</if>
+            <if test="qtyUnLoad != null">#{qtyUnLoad},</if>
+            <if test="cntrWeight != null">#{cntrWeight},</if>
+            <if test="gopodsLossQty != null">#{gopodsLossQty},</if>
+            <if test="gopodsLossrate != null">#{gopodsLossrate},</if>
+            <if test="gopodsLossamtCr != null">#{gopodsLossamtCr},</if>
+            <if test="qtyDr != null">#{qtyDr},</if>
+            <if test="waybillRemarks != null">#{waybillRemarks},</if>
+            <if test="gopodsLossamtDr != null">#{gopodsLossamtDr},</if>
+            <if test="qtyCr != null">#{qtyCr},</if>
+            <if test="freightPriceDr != null">#{freightPriceDr},</if>
+            <if test="freightPriceCr != null">#{freightPriceCr},</if>
+            <if test="freightAmtDr != null">#{freightAmtDr},</if>
+            <if test="freightAmtCr != null">#{freightAmtCr},</if>
+            <if test="feeitemDr != null">#{feeitemDr},</if>
+            <if test="feeitemDrRemarks != null">#{feeitemDrRemarks},</if>
+            <if test="feeitemCr != null">#{feeitemCr},</if>
+            <if test="feeitemCrRemarks != null">#{feeitemCrRemarks},</if>
+            <if test="amtDr != null">#{amtDr},</if>
+            <if test="amtCr != null">#{amtCr},</if>
+            <if test="dueDateDr != null">#{dueDateDr},</if>
+            <if test="dueDateCr != null">#{dueDateCr},</if>
+            <if test="odometerFrom != null">#{odometerFrom},</if>
+            <if test="odometerEnd != null">#{odometerEnd},</if>
+            <if test="milesEmpty != null">#{milesEmpty},</if>
+            <if test="milesLoad != null">#{milesLoad},</if>
+            <if test="miles != null">#{miles},</if>
+            <if test="driverbonus != null">#{driverbonus},</if>
+            <if test="costtoll != null">#{costtoll},</if>
+            <if test="costmaintain != null">#{costmaintain},</if>
+            <if test="costOth != null">#{costOth},</if>
+            <if test="costRemarks != null">#{costRemarks},</if>
+            <if test="oilQtyper != null">#{oilQtyper},</if>
+            <if test="oilQty1 != null">#{oilQty1},</if>
+            <if test="oilPrice1 != null">#{oilPrice1},</if>
+            <if test="oilAmt1 != null">#{oilAmt1},</if>
+            <if test="oilQty2 != null">#{oilQty2},</if>
+            <if test="oilPrice2 != null">#{oilPrice2},</if>
+            <if test="oilAmt2 != null">#{oilAmt2},</if>
+            <if test="oilQty != null">#{oilQty},</if>
+            <if test="oilPrice != null">#{oilPrice},</if>
+            <if test="oilAmt != null">#{oilAmt},</if>
+            <if test="oilQtyBlc != null">#{oilQtyBlc},</if>
+            <if test="oilAmtBlc != null">#{oilAmtBlc},</if>
+            <if test="profit != null">#{profit},</if>
+            <if test="invDrNeed != null">#{invDrNeed},</if>
+            <if test="invDrStatus != null">#{invDrStatus},</if>
+            <if test="invDrTaxrate != null">#{invDrTaxrate},</if>
+            <if test="invDrTaxamt != null">#{invDrTaxamt},</if>
+            <if test="invDrDate != null">#{invDrDate},</if>
+            <if test="invDrNo != null">#{invDrNo},</if>
+            <if test="accchkStaus != null">#{accchkStaus},</if>
+            <if test="billStatus != null">#{billStatus},</if>
+            <if test="orderStatus != null">#{orderStatus},</if>
+            <if test="costomAmt01 != null">#{costomAmt01},</if>
+            <if test="costomAmt02 != null">#{costomAmt02},</if>
+            <if test="stlAmtDr != null">#{stlAmtDr},</if>
+            <if test="costomAmt03 != null">#{costomAmt03},</if>
+            <if test="stlDateDr != null">#{stlDateDr},</if>
+            <if test="costomAmt04 != null">#{costomAmt04},</if>
+            <if test="stlAmtCr != null">#{stlAmtCr},</if>
+            <if test="costomAmt05 != null">#{costomAmt05},</if>
+            <if test="stlDateCr != null">#{stlDateCr},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="costomAmt06 != null">#{costomAmt06},</if>
+            <if test="costomStr01 != null">#{costomStr01},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="costomStr02 != null">#{costomStr02},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="accchkDateCr != null">#{accchkDateCr},</if>
+            <if test="mBillNo != null">#{mBillNo},</if>
+            <if test="billKind != null">#{billKind},</if>
+            <if test="profitBill != null">#{profitBill},</if>
+            <if test="profitCar != null">#{profitCar},</if>
+            <if test="corpId != null">#{corpId},</if>
+            <if test="invAmtCr != null">#{invAmtCr},</if>
+            <if test="invAmtDr != null">#{invAmtDr},</if>
+            <if test="invDateCr != null">#{invDateCr},</if>
+            <if test="invDateDr != null">#{invDateDr},</if>
+            <if test="accchkAmtCr != null">#{accchkAmtCr},</if>
+            <if test="accchkAmtDr != null">#{accchkAmtDr},</if>
+            <if test="accchkDateDr != null">#{accchkDateDr},</if>
+        </trim>
+    </insert>
+
     <update id="updateftmsorderbillscars" parameterType="ftmsorderbillscars">
         update F_TMSORDERBILLSCARS
         <trim prefix="SET" suffixOverrides=",">

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillsfeesMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="FTmsorderbillsfees" id="FTmsorderbillsfeesResult">
         <result property="fId" column="f_id"/>
         <result property="fPid" column="f_pid"/>
+        <result property="srcMId" column="src_m_id"/>
         <result property="actId" column="act_id"/>
         <result property="orgId" column="org_id"/>
         <result property="fLineno" column="f_lineno"/>
@@ -61,6 +62,10 @@
         select f_id, f_pid, act_id ,org_id, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_review_date, f_billstatus, f_statement_no, f_accamount, f_accamount_date, f_stlamount_no, f_stlamount, f_stlamount_date, f_invnos, f_invamount, f_askamount, f_status, del_flag, create_by, create_time, update_by, update_time, remark, src_id, src_bill_no, f_mblno, f_product_name, f_marks, f_chargedate, f_billing_deadline, f_inventory_days, f_amt, f_billing_days, f_billing_qty, f_billtype, f_billingway, f_bsdate, f_originalbilldate, f_stltypeid, remarks from F_TMSORDERBILLSFEES
     </sql>
 
+    <sql id="selectFTmsorderbillsfeesTemporaryStorageVo">
+        select f_id, f_pid,src_m_id, act_id ,org_id, f_lineno, f_corpid, f_feeid, f_feeUnitid, f_qty, f_unitprice, f_amount, f_currency, f_exrate, f_taxrate, f_dc, f_review_date, f_billstatus, f_statement_no, f_accamount, f_accamount_date, f_stlamount_no, f_stlamount, f_stlamount_date, f_invnos, f_invamount, f_askamount, f_status, del_flag, create_by, create_time, update_by, update_time, remark, src_id, src_bill_no, f_mblno, f_product_name, f_marks, f_chargedate, f_billing_deadline, f_inventory_days, f_amt, f_billing_days, f_billing_qty, f_billtype, f_billingway, f_bsdate, f_originalbilldate, f_stltypeid, remarks from F_TMSORDERBILLSFEES_MODIFY
+    </sql>
+
     <select id="selectFTmsorderbillsfeesList" parameterType="FTmsorderbillsfees" resultMap="FTmsorderbillsfeesResult">
         <include refid="selectFTmsorderbillsfeesVo"/>
         <where>
@@ -111,16 +116,77 @@
         ORDER BY f_dc DESC
     </select>
 
+    <select id="selectFTmsorderbillsfeesTemporaryStorageList" parameterType="FTmsorderbillsfees" resultMap="FTmsorderbillsfeesResult">
+        <include refid="selectFTmsorderbillsfeesTemporaryStorageVo"/>
+        <where>
+            <if test="fPid != null ">and f_pid = #{fPid}</if>
+            <if test="actId != null ">and act_id = #{actId}</if>
+            <if test="srcMId != null ">and src_m_id = #{srcMId}</if>
+            <if test="orgId != null ">and org_id = #{orgId}</if>
+            <if test="fLineno != null ">and f_lineno = #{fLineno}</if>
+            <if test="fCorpid != null ">and f_corpid = #{fCorpid}</if>
+            <if test="fFeeid != null ">and f_feeid = #{fFeeid}</if>
+            <if test="fFeeunitid != null ">and f_feeUnitid = #{fFeeunitid}</if>
+            <if test="fQty != null ">and f_qty = #{fQty}</if>
+            <if test="fUnitprice != null ">and f_unitprice = #{fUnitprice}</if>
+            <if test="fAmount != null ">and f_amount = #{fAmount}</if>
+            <if test="fCurrency != null  and fCurrency != ''">and f_currency = #{fCurrency}</if>
+            <if test="fExrate != null ">and f_exrate = #{fExrate}</if>
+            <if test="fTaxrate != null ">and f_taxrate = #{fTaxrate}</if>
+            <if test="fDc != null  and fDc != ''">and f_dc = #{fDc}</if>
+            <if test="fReviewDate != null ">and f_review_date = #{fReviewDate}</if>
+            <if test="fBillstatus != null ">and f_billstatus = #{fBillstatus}</if>
+            <if test="fStatementNo != null  and fStatementNo != ''">and f_statement_no = #{fStatementNo}</if>
+            <if test="fAccamount != null ">and f_accamount = #{fAccamount}</if>
+            <if test="fAccamountDate != null ">and f_accamount_date = #{fAccamountDate}</if>
+            <if test="fStlamountNo != null  and fStlamountNo != ''">and f_stlamount_no = #{fStlamountNo}</if>
+            <if test="fStlamount != null ">and f_stlamount = #{fStlamount}</if>
+            <if test="fStlamountDate != null ">and f_stlamount_date = #{fStlamountDate}</if>
+            <if test="fInvnos != null  and fInvnos != ''">and f_invnos = #{fInvnos}</if>
+            <if test="fInvamount != null ">and f_invamount = #{fInvamount}</if>
+            <if test="fAskamount != null ">and f_askamount = #{fAskamount}</if>
+            <if test="fStatus != null ">and f_status = #{fStatus}</if>
+            <if test="srcId != null ">and src_id = #{srcId}</if>
+            <if test="srcBillNo != null  and srcBillNo != ''">and src_bill_no = #{srcBillNo}</if>
+            <if test="fMblno != null  and fMblno != ''">and f_mblno = #{fMblno}</if>
+            <if test="fProductName != null  and fProductName != ''">and f_product_name like concat('%', #{fProductName},'%')</if>
+            <if test="fMarks != null  and fMarks != ''">and f_marks = #{fMarks}</if>
+            <if test="fChargedate != null ">and f_chargedate = #{fChargedate}</if>
+            <if test="fBillingDeadline != null ">and f_billing_deadline = #{fBillingDeadline}</if>
+            <if test="fInventoryDays != null ">and f_inventory_days = #{fInventoryDays}</if>
+            <if test="fAmt != null ">and f_amt = #{fAmt}</if>
+            <if test="fBillingDays != null ">and f_billing_days = #{fBillingDays}</if>
+            <if test="fBillingQty != null ">and f_billing_qty = #{fBillingQty}</if>
+            <if test="fBilltype != null  and fBilltype != ''">and f_billtype = #{fBilltype}</if>
+            <if test="fBillingway != null ">and f_billingway = #{fBillingway}</if>
+            <if test="fBsdate != null ">and f_bsdate = #{fBsdate}</if>
+            <if test="fOriginalbilldate != null ">and f_originalbilldate = #{fOriginalbilldate}</if>
+            <if test="fStltypeid != null ">and f_stltypeid = #{fStltypeid}</if>
+            <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
+        </where>
+        ORDER BY f_dc DESC
+    </select>
+
     <select id="selectFTmsorderbillsfeesById" parameterType="Long" resultMap="FTmsorderbillsfeesResult">
         <include refid="selectFTmsorderbillsfeesVo"/>
         where f_id = #{fId}
     </select>
 
+    <select id="selectFTmsorderbillsfeesModifyById" parameterType="Long" resultMap="FTmsorderbillsfeesResult">
+        <include refid="selectFTmsorderbillsfeesTemporaryStorageVo"/>
+        where f_id = #{fId}
+    </select>
+
     <select id="selectFTmsorderbillsfeesByPId" parameterType="Long" resultMap="FTmsorderbillsfeesResult">
         <include refid="selectFTmsorderbillsfeesVo"/>
         where f_pid = #{fId}
     </select>
 
+    <select id="selectFTmsorderbillsfeesBySrcMId" parameterType="Long" resultMap="FTmsorderbillsfeesResult">
+        <include refid="selectFTmsorderbillsfeesTemporaryStorageVo"/>
+        where src_m_id = #{srcMId}
+    </select>
+
     <select id="selectFTmsorderbillsfeesCount" parameterType="FTmsorderbillsfees" resultType="int">
         select count(f_id) from F_TMSORDERBILLSFEES
         <where>
@@ -278,11 +344,180 @@
         </trim>
     </insert>
 
+    <insert id="insertFTmsorderbillsfeesTemporaryStorage" parameterType="FTmsorderbillsfees" useGeneratedKeys="true" keyProperty="fId">
+        insert into F_TMSORDERBILLSFEES_MODIFY
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fId != null">f_id,</if>
+            <if test="fPid != null">f_pid,</if>
+            <if test="srcMId != null">src_m_id,</if>
+            <if test="actId != null">act_id,</if>
+            <if test="orgId != null">org_id,</if>
+            <if test="fLineno != null">f_lineno,</if>
+            <if test="fCorpid != null">f_corpid,</if>
+            <if test="fFeeid != null">f_feeid,</if>
+            <if test="fFeeunitid != null">f_feeUnitid,</if>
+            <if test="fQty != null">f_qty,</if>
+            <if test="fUnitprice != null">f_unitprice,</if>
+            <if test="fAmount != null">f_amount,</if>
+            <if test="fCurrency != null">f_currency,</if>
+            <if test="fExrate != null">f_exrate,</if>
+            <if test="fTaxrate != null">f_taxrate,</if>
+            <if test="fDc != null">f_dc,</if>
+            <if test="fReviewDate != null">f_review_date,</if>
+            <if test="fBillstatus != null">f_billstatus,</if>
+            <if test="fStatementNo != null">f_statement_no,</if>
+            <if test="fAccamount != null">f_accamount,</if>
+            <if test="fAccamountDate != null">f_accamount_date,</if>
+            <if test="fStlamountNo != null">f_stlamount_no,</if>
+            <if test="fStlamount != null">f_stlamount,</if>
+            <if test="fStlamountDate != null">f_stlamount_date,</if>
+            <if test="fInvnos != null">f_invnos,</if>
+            <if test="fInvamount != null">f_invamount,</if>
+            <if test="fAskamount != null">f_askamount,</if>
+            <if test="fStatus != null">f_status,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="srcId != null">src_id,</if>
+            <if test="srcBillNo != null">src_bill_no,</if>
+            <if test="fMblno != null">f_mblno,</if>
+            <if test="fProductName != null">f_product_name,</if>
+            <if test="fMarks != null">f_marks,</if>
+            <if test="fChargedate != null">f_chargedate,</if>
+            <if test="fBillingDeadline != null">f_billing_deadline,</if>
+            <if test="fInventoryDays != null">f_inventory_days,</if>
+            <if test="fAmt != null">f_amt,</if>
+            <if test="fBillingDays != null">f_billing_days,</if>
+            <if test="fBillingQty != null">f_billing_qty,</if>
+            <if test="fBilltype != null">f_billtype,</if>
+            <if test="fBillingway != null">f_billingway,</if>
+            <if test="fBsdate != null">f_bsdate,</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate,</if>
+            <if test="fStltypeid != null">f_stltypeid,</if>
+            <if test="remarks != null">remarks,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fId != null">#{fId},</if>
+            <if test="fPid != null">#{fPid},</if>
+            <if test="srcMId != null">#{srcMId},</if>
+            <if test="actId != null">#{actId},</if>
+            <if test="orgId != null">#{orgId},</if>
+            <if test="fLineno != null">#{fLineno},</if>
+            <if test="fCorpid != null">#{fCorpid},</if>
+            <if test="fFeeid != null">#{fFeeid},</if>
+            <if test="fFeeunitid != null">#{fFeeunitid},</if>
+            <if test="fQty != null">#{fQty},</if>
+            <if test="fUnitprice != null">#{fUnitprice},</if>
+            <if test="fAmount != null">#{fAmount},</if>
+            <if test="fCurrency != null">#{fCurrency},</if>
+            <if test="fExrate != null">#{fExrate},</if>
+            <if test="fTaxrate != null">#{fTaxrate},</if>
+            <if test="fDc != null">#{fDc},</if>
+            <if test="fReviewDate != null">#{fReviewDate},</if>
+            <if test="fBillstatus != null">#{fBillstatus},</if>
+            <if test="fStatementNo != null">#{fStatementNo},</if>
+            <if test="fAccamount != null">#{fAccamount},</if>
+            <if test="fAccamountDate != null">#{fAccamountDate},</if>
+            <if test="fStlamountNo != null">#{fStlamountNo},</if>
+            <if test="fStlamount != null">#{fStlamount},</if>
+            <if test="fStlamountDate != null">#{fStlamountDate},</if>
+            <if test="fInvnos != null">#{fInvnos},</if>
+            <if test="fInvamount != null">#{fInvamount},</if>
+            <if test="fAskamount != null">#{fAskamount},</if>
+            <if test="fStatus != null">#{fStatus},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="srcId != null">#{srcId},</if>
+            <if test="srcBillNo != null">#{srcBillNo},</if>
+            <if test="fMblno != null">#{fMblno},</if>
+            <if test="fProductName != null">#{fProductName},</if>
+            <if test="fMarks != null">#{fMarks},</if>
+            <if test="fChargedate != null">#{fChargedate},</if>
+            <if test="fBillingDeadline != null">#{fBillingDeadline},</if>
+            <if test="fInventoryDays != null">#{fInventoryDays},</if>
+            <if test="fAmt != null">#{fAmt},</if>
+            <if test="fBillingDays != null">#{fBillingDays},</if>
+            <if test="fBillingQty != null">#{fBillingQty},</if>
+            <if test="fBilltype != null">#{fBilltype},</if>
+            <if test="fBillingway != null">#{fBillingway},</if>
+            <if test="fBsdate != null">#{fBsdate},</if>
+            <if test="fOriginalbilldate != null">#{fOriginalbilldate},</if>
+            <if test="fStltypeid != null">#{fStltypeid},</if>
+            <if test="remarks != null">#{remarks},</if>
+        </trim>
+    </insert>
+
+
     <update id="updateFTmsorderbillsfees" parameterType="FTmsorderbillsfees">
         update F_TMSORDERBILLSFEES
         <trim prefix="SET" suffixOverrides=",">
             <if test="fPid != null">f_pid = #{fPid},</if>
             <if test="actId != null">act_id = #{actId},</if>
+            <if test="srcMId != null">src_m_id = #{srcMId},</if>
+            <if test="orgId != null">org_id = #{orgId},</if>
+            <if test="fLineno != null">f_lineno = #{fLineno},</if>
+            <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
+            <if test="fFeeid != null">f_feeid = #{fFeeid},</if>
+            <if test="fFeeunitid != null">f_feeUnitid = #{fFeeunitid},</if>
+            <if test="fQty != null">f_qty = #{fQty},</if>
+            <if test="fUnitprice != null">f_unitprice = #{fUnitprice},</if>
+            <if test="fAmount != null">f_amount = #{fAmount},</if>
+            <if test="fCurrency != null">f_currency = #{fCurrency},</if>
+            <if test="fExrate != null">f_exrate = #{fExrate},</if>
+            <if test="fTaxrate != null">f_taxrate = #{fTaxrate},</if>
+            <if test="fDc != null">f_dc = #{fDc},</if>
+            <if test="fReviewDate != null">f_review_date = #{fReviewDate},</if>
+            <if test="fBillstatus != null">f_billstatus = #{fBillstatus},</if>
+            <if test="fStatementNo != null">f_statement_no = #{fStatementNo},</if>
+            <if test="fAccamount != null">f_accamount = #{fAccamount},</if>
+            <if test="fAccamountDate != null">f_accamount_date = #{fAccamountDate},</if>
+            <if test="fStlamountNo != null">f_stlamount_no = #{fStlamountNo},</if>
+            <if test="fStlamount != null">f_stlamount = #{fStlamount},</if>
+            <if test="fStlamountDate != null">f_stlamount_date = #{fStlamountDate},</if>
+            <if test="fInvnos != null">f_invnos = #{fInvnos},</if>
+            <if test="fInvamount != null">f_invamount = #{fInvamount},</if>
+            <if test="fAskamount != null">f_askamount = #{fAskamount},</if>
+            <if test="fStatus != null">f_status = #{fStatus},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="srcId != null">src_id = #{srcId},</if>
+            <if test="srcBillNo != null">src_bill_no = #{srcBillNo},</if>
+            <if test="fMblno != null">f_mblno = #{fMblno},</if>
+            <if test="fProductName != null">f_product_name = #{fProductName},</if>
+            <if test="fMarks != null">f_marks = #{fMarks},</if>
+            <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
+            <if test="fBillingDeadline != null">f_billing_deadline = #{fBillingDeadline},</if>
+            <if test="fInventoryDays != null">f_inventory_days = #{fInventoryDays},</if>
+            <if test="fAmt != null">f_amt = #{fAmt},</if>
+            <if test="fBillingDays != null">f_billing_days = #{fBillingDays},</if>
+            <if test="fBillingQty != null">f_billing_qty = #{fBillingQty},</if>
+            <if test="fBilltype != null">f_billtype = #{fBilltype},</if>
+            <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
+            <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
+            <if test="fOriginalbilldate != null">f_originalbilldate = #{fOriginalbilldate},</if>
+            <if test="fStltypeid != null">f_stltypeid = #{fStltypeid},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where f_id = #{fId}
+    </update>
+
+    <update id="updateFTmsorderbillsfeesModify" parameterType="FTmsorderbillsfees">
+        update F_TMSORDERBILLSFEES_MODIFY
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fPid != null">f_pid = #{fPid},</if>
+            <if test="actId != null">act_id = #{actId},</if>
+            <if test="srcMId != null">src_m_id = #{srcMId},</if>
             <if test="orgId != null">org_id = #{orgId},</if>
             <if test="fLineno != null">f_lineno = #{fLineno},</if>
             <if test="fCorpid != null">f_corpid = #{fCorpid},</if>
@@ -348,6 +583,10 @@
         delete from F_TMSORDERBILLSFEES where f_id = #{fId}
     </delete>
 
+    <delete id="deleteFTmsorderbillsfeesModifyById" parameterType="Long">
+        delete from F_TMSORDERBILLSFEES_MODIFY where f_id = #{fId}
+    </delete>
+
     <delete id="deleteFTmsorderbillsfeesByPId" parameterType="Long">
         delete from F_TMSORDERBILLSFEES where f_pid = #{fId}
     </delete>

ruoyi-framework/pom.xml

@@ -81,6 +81,12 @@
             <version>1.5.21</version>
         </dependency>
 
+        <!-- 仓库模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-warehouse</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-warehouse/src/main/java/com/ruoyi/quotation/domain/TSeaprice.java

@@ -30,6 +30,20 @@ public class TSeaprice extends BaseEntity
     @Excel(name = "船公司(客户表)")
     private Long fCorpid;
 
+    /** 客户名称 */
+    private String fCorpName;
+
+    /** 主表对应明细 */
+    private List<TSeapriceitem> listTseapriceitem;
+
+    public String getfCorpName() {
+        return fCorpName;
+    }
+
+    public void setfCorpName(String fCorpName) {
+        this.fCorpName = fCorpName;
+    }
+
     /** 起运港ID */
     @Excel(name = "起运港ID")
     private Long polId;
@@ -38,11 +52,65 @@ public class TSeaprice extends BaseEntity
     @Excel(name = "目的港ID")
     private Long podId;
 
+    /** 中转港ID */
+    private Long fTransitPortId;
+
+    /** 船期 */
+    private String fSailingSchedule;
+
+    /** 航程 */
+    private Long fVoyage;
+
+    public Long getfTransitPortId() {
+        return fTransitPortId;
+    }
+
+    public void setfTransitPortId(Long fTransitPortId) {
+        this.fTransitPortId = fTransitPortId;
+    }
+
+    public String getfSailingSchedule() {
+        return fSailingSchedule;
+    }
+
+    public void setfSailingSchedule(String fSailingSchedule) {
+        this.fSailingSchedule = fSailingSchedule;
+    }
+
+    public Long getfVoyage() {
+        return fVoyage;
+    }
+
+    public void setfVoyage(Long fVoyage) {
+        this.fVoyage = fVoyage;
+    }
+
     /** 有效期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date fValiddate;
 
+    /** 开航日开始时间 */
+    private String fValiddateBegin;
+    /** 开航日结束时间 */
+    private String fValiddateEnd;
+
+    public String getfValiddateBegin() {
+        return fValiddateBegin;
+    }
+
+    public void setfValiddateBegin(String fValiddateBegin) {
+        this.fValiddateBegin = fValiddateBegin;
+    }
+
+    public String getfValiddateEnd() {
+        return fValiddateEnd;
+    }
+
+    public void setfValiddateEnd(String fValiddateEnd) {
+        this.fValiddateEnd = fValiddateEnd;
+    }
+
     /** 校验时间戳 */
     private String fDateChanged;
 

ruoyi-warehouse/src/main/java/com/ruoyi/quotation/service/impl/TSeapriceServiceImpl.java

@@ -20,10 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -54,7 +51,23 @@ public class TSeapriceServiceImpl implements ITSeapriceService
      */
     @Override
     public List<Map<String, Object>> selectTSeapriceMapList(TSeaprice tSeaprice) {
-        return tSeapriceMapper.selectTSeapriceMapList(tSeaprice);
+        List<Map<String, Object>> list =tSeapriceMapper.selectTSeapriceMapList(tSeaprice);
+        List<Map<String, Object>> result = new ArrayList<>();
+        //新增主表内带item逻辑
+        for (int i = 0; i < list.size(); i++) {
+            Map<String,Object> m = list.get(i);
+            //获取主表id
+            Long fId = Long.parseLong(String.valueOf(m.get("fId")));
+            //获取明细表数据,填充到主表map
+            TSeapriceitem tSeapriceitem = new TSeapriceitem();
+            tSeapriceitem.setfPid(fId);
+            tSeapriceitem.setfType("0");
+            m.put("seapriceItem", tSeapriceitemMapper.selectTSeapriceitemList(tSeapriceitem));
+            tSeapriceitem.setfType("1");
+            m.put("seapriceFees", tSeapriceitemMapper.selectTSeapriceitemList(tSeapriceitem));
+            result.add(m);
+        }
+        return result;
     }
 
     /**

ruoyi-warehouse/src/main/resources/mapper/quotation/TSeapriceMapper.xml

@@ -23,6 +23,9 @@
         <result property="fBookagentid" column="f_bookagentid"/>
         <result property="fLineName" column="f_line_name"/>
         <result property="fBookagentName" column="f_bookagent_name"/>
+        <result property="fTransitPortId"    column="f_transit_port_id"    />
+        <result property="fSailingSchedule"    column="f_sailing_schedule"    />
+        <result property="fVoyage"    column="f_voyage"    />
     </resultMap>
 
     <sql id="selectTSeapriceVo">
@@ -42,7 +45,10 @@
                s.remarks,
                s.f_lineid,
                s.f_bookagentid,
-               j.f_name AS f_line_name,
+               s.f_transit_port_id,
+               s.f_sailing_schedule,
+               s.f_voyage,
+            j.f_name AS f_line_name,
                q.f_name AS f_bookagent_name
         from t_seaprice s
                  LEFT JOIN t_address j ON s.f_lineid = j.f_id
@@ -66,6 +72,9 @@
             </if>
             <if test="fLineid != null  and fLineid != ''">and f_lineid = #{fLineid}</if>
             <if test="fBookagentid != null  and fBookagentid != ''">and f_bookagentid = #{fBookagentid}</if>
+            <if test="fTransitPortId != null "> and f_transit_port_id = #{fTransitPortId}</if>
+            <if test="fSailingSchedule != null  and fSailingSchedule != ''"> and f_sailing_schedule = #{fSailingSchedule}</if>
+            <if test="fVoyage != null "> and f_voyage = #{fVoyage}</if>
 
         </where>
     </select>
@@ -79,15 +88,19 @@
         SELECT
         s.f_id fId,
         t.dict_label fBilltype,
-        c.f_cname fCorpid,
+        c.f_id fCorpid,
+        c.f_cname fCorpName,
         CASE
         WHEN s.f_billstatus = '0' THEN
         '正常'
         WHEN s.f_billstatus = '1' THEN
         '停用'
         END AS fBillstatus,
-        pol.dict_label polId,
-        pod.dict_label podId,
+        pol.f_name polId,
+        pod.f_name podId,
+        transit.f_name fTransitPortId,
+        s.f_sailing_schedule fSailingSchedule,
+        s.f_voyage fVoyage,
         s.create_by createBy,
         s.f_validdate fValiddate,
         s.remarks,
@@ -98,8 +111,9 @@
         FROM
         t_seaprice s
         LEFT JOIN sys_dict_data t ON t.dict_value = s.f_billtype AND t.dict_type = 'data_billType'
-        LEFT JOIN sys_dict_data pol ON pol.dict_value = s.pol_id AND pol.dict_type = 'port_start'
-        LEFT JOIN sys_dict_data pod ON pod.dict_value = s.pod_id AND pod.dict_type = 'port_end'
+        LEFT JOIN t_address pol ON s.pol_id = pol.f_id
+        LEFT JOIN t_address pod ON s.pod_id = pod.f_id
+        LEFT JOIN t_address transit ON s.f_transit_port_id = transit.f_id
         LEFT JOIN t_corps c ON c.f_id = s.f_corpid
         LEFT JOIN t_address j ON s.f_lineid = j.f_id
         LEFT JOIN t_corps q ON s.f_bookagentid = q.f_id
@@ -113,6 +127,12 @@
             <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
             <if test="fLineid != null  and fLineid != ''">and f_lineid = #{fLineid}</if>
             <if test="fBookagentid != null  and fBookagentid != ''">and f_bookagentid = #{fBookagentid}</if>
+            <if test="fTransitPortId != null "> and f_transit_port_id = #{fTransitPortId}</if>
+            <if test="fSailingSchedule != null  and fSailingSchedule != ''"> and f_sailing_schedule = #{fSailingSchedule}</if>
+            <if test="fVoyage != null "> and f_voyage = #{fVoyage}</if>
+            <if test="fValiddateBegin != null and fValiddateBegin != '' and fValiddateEnd != null and fValiddateEnd!= ''">
+             and s.f_validdate BETWEEN #{fValiddateBegin} AND #{fValiddateEnd}
+            </if>
         </where>
         ORDER BY s.f_id DESC
     </select>
@@ -192,6 +212,10 @@
             <if test="remarks != null">remarks,</if>
             <if test="fLineid != null">f_lineid,</if>
             <if test="fBookagentid != null">f_bookagentid,</if>
+            <if test="fTransitPortId != null">f_transit_port_id,</if>
+            <if test="fSailingSchedule != null">f_sailing_schedule,</if>
+            <if test="fVoyage != null">f_voyage,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBilltype != null">#{fBilltype},</if>
@@ -209,6 +233,9 @@
             <if test="remarks != null">#{remarks},</if>
             <if test="fLineid != null">#{fLineid},</if>
             <if test="fBookagentid != null">#{fBookagentid},</if>
+            <if test="fTransitPortId != null">#{fTransitPortId},</if>
+            <if test="fSailingSchedule != null">#{fSailingSchedule},</if>
+            <if test="fVoyage != null">#{fVoyage},</if>
         </trim>
     </insert>
 
@@ -230,6 +257,9 @@
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="fLineid != null">f_lineid = #{fLineid},</if>
             <if test="fBookagentid != null">f_bookagentid = #{fBookagentid},</if>
+            <if test="fTransitPortId != null">f_transit_port_id = #{fTransitPortId},</if>
+            <if test="fSailingSchedule != null">f_sailing_schedule = #{fSailingSchedule},</if>
+            <if test="fVoyage != null">f_voyage = #{fVoyage},</if>
         </trim>
         where f_id = #{fId}
     </update>

ruoyi-warehouse/target/classes/mapper/warehouseBusiness/TWarehouseWarehousecheckMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTWarehouseWarehousecheckList" parameterType="TWarehouseWarehousecheck" resultMap="TWarehouseWarehousecheckResult">
         <include refid="selectTWarehouseWarehousecheckVo"/>
         <where>
+            del_flag = '1'
             <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
             <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
             <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
     <select id="selectTWarehouseWarehousecheckById" parameterType="Long" resultMap="TWarehouseWarehousecheckResult">
         <include refid="selectTWarehouseWarehousecheckVo"/>
         where f_id = #{fId}
@@ -102,5 +104,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fId}
         </foreach>
     </delete>
+    <update id="updateTWarehouseWarehousecheckById" parameterType="TWarehouseWarehousecheck">
+        update t_warehouse_warehousecheck
+         set del_flag = '1'
+        where f_id in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </update>
 
 </mapper>

ruoyi-warehouse/target/classes/mapper/warehouseBusiness/TWarehouseWarehousecheckitemsMapper.xml

@@ -2,6 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
 <mapper namespace="com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckitemsMapper">
     <resultMap type="TWarehouseWarehousecheckitems" id="TWarehouseWarehousecheckitemsResult">
         <result property="fId"    column="f_id"    />
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTWarehouseWarehousecheckitemsList" parameterType="TWarehouseWarehousecheckitems" resultMap="TWarehouseWarehousecheckitemsResult">
         <include refid="selectTWarehouseWarehousecheckitemsVo"/>
         <where>
+            del_flag = '0'
             <if test="fPid != null "> and f_pid = #{fPid}</if>
             <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
             <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
@@ -111,5 +113,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fId}
         </foreach>
     </delete>
+    <update id="updateTWarehouseWarehousecheckitemsById" parameterType="TWarehouseWarehousecheckitems">
+        update t_warehouse_warehousecheckitems
+        set
+            del_flag = '1'
+        where f_pid in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </update>
 
 </mapper>