修改变更撤销判断问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TAddressController.java

@@ -37,6 +37,15 @@ public class TAddressController extends BaseController
     private ITAddressService tAddressService;
 
     /**
+     * 查询地点基础信息（港口 码头 堆场 航线）下拉列表
+     */
+    @GetMapping("/getBasicInformation")
+    public List<TAddress> getBasicInformation(TAddress tAddress)
+    {
+        return tAddressService.selectTAddressBasicList(tAddress);
+    }
+
+    /**
      * 查询地点基础信息（港口 码头 堆场 航线）列表
      */
     @PreAuthorize("@ss.hasPermi('shipping:address:list')")

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

@@ -19,305 +19,205 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class Ftmsorderbills extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * $column.columnComment
-     */
+    /** $column.columnComment */
     private Long id;
 
-    /**
-     * 编号两位前缀+YYMMNNNN
-     */
+    /** 编号两位前缀+YYMMNNNN */
     @Excel(name = "编号两位前缀+YYMMNNNN")
     private String billNo;
 
-    /**
-     * 活动号
-     */
+    /** 活动号 */
     @Excel(name = "活动号")
     private Long actId;
 
-    /**
-     * 客户id
-     */
+    /** 客户id */
     @Excel(name = "客户id")
     private Long corpId;
 
-    /**
-     * 业务员id
-     */
-    @Excel(name = "业务员id")
-    private String transUserName;
-
-    /**
-     * 调度员id
-     */
+    /** 调度员id */
     @Excel(name = "调度员id")
     private Long planUserId;
 
-    /**
-     * 调度员id
-     */
+    /** 业务员id */
+    @Excel(name = "业务员id")
+    private String transUserName;
+
+    /** 调度员id */
     @Excel(name = "调度员id")
     private String planUserName;
 
-    /**
-     * 1进口2出口3内贸4其他
-     */
+    /** 1进口2出口3内贸4其他 */
     @Excel(name = "1进口2出口3内贸4其他")
     private Long billType;
 
-    /**
-     * 业务员id
-     */
+    /** 业务员id */
     @Excel(name = "业务员id")
     private Long transUserId;
 
-    /**
-     * 1集装箱2大件3散货
-     */
+    /** 1集装箱2大件3散货 */
     @Excel(name = "1集装箱2大件3散货")
     private String transType;
 
-    /**
-     * 1重去重回2重去空回3空去重回
-     */
+    /** 1重去重回2重去空回3空去重回 */
     @Excel(name = "1重去重回2重去空回3空去重回")
     private String transProp;
 
-    /**
-     * 是否有合同(1有，0没有)
-     */
+    /** 是否有合同(1有，0没有) */
     @Excel(name = "是否有合同(1有，0没有)")
     private String ifContracted;
 
-    /**
-     * 合同号
-     */
+    /** 合同号 */
     @Excel(name = "合同号")
     private String contractNo;
 
-    /**
-     * 参考号
-     */
+    /** 参考号 */
     @Excel(name = "参考号")
     private String refNo;
 
-    /**
-     * 账期类型：天数、月底
-     */
+    /** 账期类型：天数、月底 */
     @Excel(name = "账期类型：天数、月底")
     private Long accstlType;
 
-    /**
-     * 账期天数
-     */
+    /** 账期天数 */
     @Excel(name = "账期天数")
     private Long accdays;
 
-    /**
-     * 品名id
-     */
+    /** 品名id */
     @Excel(name = "品名id")
     private Long goodsId;
 
-    /**
-     * 货值
-     */
+    /** 货值 */
     @Excel(name = "货值")
     private BigDecimal goodsPrice;
 
-    /**
-     * 损耗类型：公斤、千分百
-     */
+    /** 损耗类型：公斤、千分百 */
     @Excel(name = "损耗类型：公斤、千分百")
     private String goodsLossType;
 
-    /**
-     * 耗损标准
-     */
+    /** 耗损标准 */
     @Excel(name = "耗损标准")
     private BigDecimal goodsLossStd;
 
-    /**
-     * 提单号
-     */
+    /** 提单号 */
     @Excel(name = "提单号")
     private String mblno;
 
-    /**
-     * 船名
-     */
+    /** 船名 */
     @Excel(name = "船名")
     private String ysl;
 
-    /**
-     * 航次
-     */
+    /** 航次 */
     @Excel(name = "航次")
     private String voy;
 
-    /**
-     * 起运港ID
-     */
+    /** 起运港ID */
     @Excel(name = "起运港ID")
     private Long polId;
 
-    /**
-     * 目的港ID
-     */
-    @Excel(name = "目的港ID")
-    private Long podId;
-
-    /**
-     * 计划件数或总箱量
-     */
+    /** 计划件数或总箱量 */
     @Excel(name = "计划件数或总箱量")
     private BigDecimal qtyPlan;
 
-    /**
-     * 已安排数
-     */
+    /** 目的港ID */
+    @Excel(name = "目的港ID")
+    private Long podId;
+
+    /** 已安排数 */
     @Excel(name = "已安排数")
-    private BigDecimal qtyDisPatch;
+    private Long qtyDisPatch;
 
-    /**
-     * 计划重量
-     */
+    /** 计划重量 */
     @Excel(name = "计划重量")
     private BigDecimal weightPlan;
 
-    /**
-     * 箱型箱量明细表自动生成
-     */
+    /** 箱型箱量明细表自动生成 */
     @Excel(name = "箱型箱量明细表自动生成")
     private String cntrDesc;
 
-    /**
-     * 车号列表，根据派车自动生成
-     */
+    /** 车号列表，根据派车自动生成 */
     @Excel(name = "车号列表，根据派车自动生成")
     private String carNoList;
 
-    /**
-     * 装车地
-     */
+    /** 装车地 */
     @Excel(name = "装车地")
     private String loadAddr;
 
-    /**
-     * 装车联系人
-     */
+    /** 装车联系人 */
     @Excel(name = "装车联系人")
     private String loadAttn;
 
-    /**
-     * 联系电话
-     */
+    /** 联系电话 */
     @Excel(name = "联系电话")
     private String loadAttntel;
 
-    /**
-     * 要求装车时间
-     */
+    /** 要求装车时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "要求装车时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date loadDate;
 
-    /**
-     * 装卸货地
-     */
+    /** 装卸货地 */
     @Excel(name = "装卸货地")
     private String mdLoadAddr;
 
-    /**
-     * 装卸货联系人
-     */
+    /** 装卸货联系人 */
     @Excel(name = "装卸货联系人")
     private String mdLoadAttn;
 
-    /**
-     * 装卸货联系电话
-     */
+    /** 装卸货联系电话 */
     @Excel(name = "装卸货联系电话")
     private String mdLoadAttnTel;
 
-    /**
-     * 要求装卸货时间
-     */
+    /** 要求装卸货时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "要求装卸货时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date mdLoadDate;
 
-    /**
-     * 卸车地
-     */
+    /** 卸车地 */
     @Excel(name = "卸车地")
     private String unLoadAddr;
 
-    /**
-     * 卸车联系人
-     */
+    /** 卸车联系人 */
     @Excel(name = "卸车联系人")
     private String unLoadAttn;
 
-    /**
-     * 卸车联系电话
-     */
+    /** 卸车联系电话 */
     @Excel(name = "卸车联系电话")
     private String unLoadAttnTel;
 
-    /**
-     * 要求卸车时间
-     */
+    /** 要求卸车时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "要求卸车时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date unLoadDate;
 
-    /**
-     * 规定线路(将来会做基础资料)
-     */
+    /** 规定线路(将来会做基础资料) */
     @Excel(name = "规定线路(将来会做基础资料)")
     private Long routeId;
 
-    /**
-     * 线路描述
-     */
+    /** 线路描述 */
     @Excel(name = "线路描述")
     private String routeDesc;
 
-    /**
-     * 是否要求回单(1要求，0不要求)
-     */
+    /** 是否要求回单(1要求，0不要求) */
     @Excel(name = "是否要求回单(1要求，0不要求)")
     private String ifWaybill;
 
-    /**
-     * 是否要求开票(1要求，0不要求)
-     */
+    /** 是否要求开票(1要求，0不要求) */
     @Excel(name = "是否要求开票(1要求，0不要求)")
     private String ifNeedinvDr;
 
-    /**
-     * 业务完成日期
-     */
+    /** 业务完成日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "业务完成日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date postDate;
 
-    /**
-     * 状态 (10计划新建、20计划暂存、30计划撤回、40计划提交、50计划变更中、60调度暂存、70调度撤回、80调度提交，90调度变更中)
-     */
-    @Excel(name = "状态")
+    /** 状态(1新建，2暂存，6提交) */
+    @Excel(name = "状态(1新建，2暂存，6提交)")
     private Long billStatus;
 
-    /**
-     * 删除状态
-     */
+    /** 删除状态 */
     private String delFlag;
 
-    /**
-     * 备注
-     */
+    /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 

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

@@ -14,56 +14,42 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class Ftmsorderbillsattachs extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * $column.columnComment
-     */
+    /** $column.columnComment */
     private Long id;
 
-    /**
-     * 父id
-     */
+    /** 父id */
     @Excel(name = "父id")
     private Long pId;
 
-    /**
-     * 来源id
-     */
+    /** 来源id */
     @Excel(name = "来源id")
     private Long orgId;
 
-    /**
-     * 活动号
-     */
+    /** 活动号 */
     @Excel(name = "活动号")
     private Long actId;
 
-    /**
-     * 附件地址
-     */
+    /** 附件地址 */
     @Excel(name = "附件地址")
     private String attachUrl;
 
-    /**
-     * 附件名称
-     */
+    /** 附件名称 */
     @Excel(name = "附件名称")
     private String attachName;
 
-    /**
-     * 状态(1新建，2暂存，6提交)
-     */
+    /** 状态(1新建，2暂存，6提交) */
     @Excel(name = "状态(1新建，2暂存，6提交)")
     private Long billStatus;
 
-    /**
-     * 删除状态
-     */
+    /** 删除状态 */
     private String delFlag;
 
-    /**
-     * 备注
-     */
+    /** 备注 */
     @Excel(name = "备注")
     private String remarks;
 
+    /** 缩略图地址 */
+    @Excel(name = "缩略图地址")
+    private String thumbnailUrl;
+
 }

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

@@ -81,7 +81,11 @@ public class FtmsorderbillsServiceImpl implements IftmsorderbillsService {
         fleetCarManage.setBillStatus(6L);
         fleetCarManage.setDelFlag("0");
         int carManageQuantity = fleetCarManageMapper.selectFleetCarManageCount(fleetCarManage);
-        map.put("upperLeftOldCarQuantity", carManageQuantity - carQuantity);
+        int carNumber = carManageQuantity - carQuantity;
+        if (carNumber < 0) {
+            carNumber = 0;
+        }
+        map.put("upperLeftOldCarQuantity", carNumber);
         // 查询左下
         map.put("lowerLeft", ftmsorderbillscarsMapper.selectHomeUpperRightMapList());
         return AjaxResult.success(map);

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

@@ -814,6 +814,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         // 若允许删除则删掉后续模块
         ftmsorderbillsfeesMapper.deleteFTmsorderbillsfeesByPId(tmsorderbillscars.getId());
         ftmsorderbillsattachsMapper.deleteftmsorderbillsattachsByPId(tmsorderbillscars.getId());
+        BillnoDel billnoDel = new BillnoDel();
+        billnoDel.setBillType("SJLSH");
+        billnoDel.setBillNo(tmsorderbillscars.getOrderNo());
+        billnoDelMapper.insertBillnoDel(billnoDel);
         if (ftmsorderbillscarsMapper.deleteftmsorderbillscarsById(tmsorderbillscars.getId()) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("删除车辆信息失败，若多次失败请联系管理员");

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

@@ -250,9 +250,6 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         // 计划数据
         Ftmsorderbills tmsorderbills = JSONArray.parseObject(tmsorder, Ftmsorderbills.class);
         long pId = tmsorderbills.getId();
-        tmsorderbills.setPlanUserId(loginUser.getUser().getUserId());
-        tmsorderbills.setPlanUserName(loginUser.getUser().getNickName());
-        ftmsorderbillsMapper.updateftmsorderbills(tmsorderbills);
         String status = ftmsorderbillsService.objValidation(null, null, null, plans, null);
         if (StringUtils.isNotEmpty(status)) {
             return AjaxResult.error(status);
@@ -295,13 +292,19 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         }
         // 计划下达数据
         Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
-        BigDecimal qtyDisPatch = bills.getQtyDisPatch().add(new BigDecimal(tmsorderbillsplans.getCntrQty()));
-        bills.setQtyDisPatch(qtyDisPatch);
+        bills.setPlanUserId(loginUser.getUser().getUserId());
+        bills.setPlanUserName(loginUser.getUser().getNickName());
+        bills.setQtyDisPatch(bills.getQtyDisPatch() + tmsorderbillsplans.getCntrQty());
         if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
         }
-        return AjaxResult.success(ftmsorderbillsplansMapper.selectftmsorderbillsplansById(tmsorderbillsplans.getId()));
+        Map<String, Object> map = new HashMap<>();
+        Ftmsorderbillscntrs tmsorderbillscntrs = new Ftmsorderbillscntrs();
+        tmsorderbillscntrs.setId(tmsorderbillsplans.getPId());
+        map.put("plan", tmsorderbillsplans);
+        map.put("cntrs", ftmsorderbillscntrsMapper.selectftmsorderbillscntrsList(tmsorderbillscntrs));
+        return AjaxResult.success(map);
     }
 
     /**
@@ -365,8 +368,7 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         // 计划下达数据
         Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(tmsorderbillsplans.getOrgId());
         long cntrQty = tmsorderbillsplans.getCntrQty() - ftmsorderbillsplans.getCntrQty();
-        BigDecimal qtyDisPatch = bills.getQtyDisPatch().add(new BigDecimal(cntrQty));
-        bills.setQtyDisPatch(qtyDisPatch);
+        bills.setQtyDisPatch(bills.getQtyDisPatch() + cntrQty);
         if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
@@ -378,7 +380,13 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次失败请联系管理员");
         }
-        return AjaxResult.success(ftmsorderbillsplansMapper.selectftmsorderbillsplansById(tmsorderbillsplans.getId()));
+        Map<String, Object> map = new HashMap<>();
+        Ftmsorderbillscntrs scntrs = new Ftmsorderbillscntrs();
+        scntrs.setId(tmsorderbillsplans.getPId());
+        scntrs.setBillStatus(6L);
+        map.put("plan", tmsorderbillsplans);
+        map.put("cntrs", ftmsorderbillscntrsMapper.selectftmsorderbillscntrsList(scntrs));
+        return AjaxResult.success(map);
     }
 
     /**
@@ -394,14 +402,30 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
     public AjaxResult schedulingRevoke(Ftmsorderbillsplans plans, String type, LoginUser loginUser) {
         long pId = plans.getId();
         Ftmsorderbillsplans ftmsorderbillsplans = ftmsorderbillsplansMapper.selectftmsorderbillsplansById(plans.getId());
-        if (ftmsorderbillsplans.getBillStatus() != 6) {
-            return AjaxResult.error("操作失败，该单据未提交");
-        }
         Ftmsorderbillscars ftmsorderbillscars = new Ftmsorderbillscars();
         ftmsorderbillscars.setPId(pId);
         if (ftmsorderbillscarsMapper.selectftmsorderbillscarsCount(ftmsorderbillscars) > 0) {
             return AjaxResult.error("撤销失败，车队已派车");
         }
+        // 删除操作
+        if ("remove".equals(type)) {
+            if (ftmsorderbillsplans.getBillStatus() == 6L) {
+                return AjaxResult.error("操作失败，该单据已提交");
+            }
+            if (ftmsorderbillsplans.getCarQty() > 0) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error("该调度安排已派车，无法删除");
+            }
+            if (ftmsorderbillsplansMapper.deleteftmsorderbillsplansById(pId) <= 0) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return AjaxResult.error("删除订单数据失败，若多次出现请联系管理员");
+            }
+            ftmsorderbillscarsMapper.deleteftmsorderbillscarsByPId(pId);
+            return AjaxResult.success();
+        }
+        if (ftmsorderbillsplans.getBillStatus() != 6) {
+            return AjaxResult.error("操作失败，该单据未提交");
+        }
         // 查询箱量
         Ftmsorderbillscntrs ftmsorderbillscntrs = ftmsorderbillscntrsMapper.selectftmsorderbillscntrsById(plans.getPId());
         long planQty = ftmsorderbillscntrs.getCntrPlanQty() - plans.getCntrQty();
@@ -412,25 +436,11 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
         }
         // 计划下达数据
         Ftmsorderbills bills = ftmsorderbillsMapper.selectftmsorderbillsById(plans.getOrgId());
-        BigDecimal qtyDisPatch = bills.getQtyDisPatch().subtract(new BigDecimal(plans.getCntrQty()));
-        bills.setQtyDisPatch(qtyDisPatch);
+        bills.setQtyDisPatch(bills.getQtyDisPatch() + plans.getCntrQty());
         if (ftmsorderbillsMapper.updateftmsorderbills(bills) <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新派车数据失败，若多次失败请联系管理员");
         }
-        // 删除操作
-        if ("remove".equals(type)) {
-            if (ftmsorderbillsplans.getCarQty() > 0) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("该调度安排已派车，无法删除");
-            }
-            if (ftmsorderbillsplansMapper.deleteftmsorderbillsplansById(pId) <= 0) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return AjaxResult.error("删除订单数据失败，若多次出现请联系管理员");
-            }
-            ftmsorderbillscarsMapper.deleteftmsorderbillscarsByPId(pId);
-            return AjaxResult.success();
-        }
         String planJson = JSON.toJSONString(ftmsorderbillsplans);
         Date time = new Date();
         // 调度备份流水号
@@ -453,7 +463,13 @@ public class FtmsorderbillsplansServiceImpl implements IftmsorderbillsplansServi
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("更新调度数据失败，若多次出现请联系管理员");
         }
-        return AjaxResult.success(ftmsorderbillsplansMapper.selectftmsorderbillsplansById(plans.getId()));
+        Map<String, Object> map = new HashMap<>();
+        Ftmsorderbillscntrs tmsorderbillscntrs = new Ftmsorderbillscntrs();
+        tmsorderbillscntrs.setId(plans.getPId());
+        tmsorderbillscntrs.setBillStatus(6L);
+        map.put("plan", plans);
+        map.put("cntrs", ftmsorderbillscntrsMapper.selectftmsorderbillscntrsList(tmsorderbillscntrs));
+        return AjaxResult.success(map);
     }
 
     /**

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

@@ -5,60 +5,60 @@
 <mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillsMapper">
 
     <resultMap type="ftmsorderbills" id="ftmsorderbillsResult">
-        <result property="id" column="id"/>
-        <result property="billNo" column="bill_no"/>
-        <result property="actId" column="act_id"/>
-        <result property="corpId" column="corp_id"/>
-        <result property="transUserName" column="trans_user_name"/>
-        <result property="planUserId" column="plan_user_id"/>
-        <result property="planUserName" column="plan_user_name"/>
-        <result property="billType" column="bill_type"/>
-        <result property="transUserId" column="trans_user_id"/>
-        <result property="transType" column="trans_type"/>
-        <result property="transProp" column="trans_prop"/>
-        <result property="ifContracted" column="if_contracted"/>
-        <result property="contractNo" column="contract_no"/>
-        <result property="refNo" column="ref_no"/>
-        <result property="accstlType" column="accstl_type"/>
-        <result property="accdays" column="accdays"/>
-        <result property="goodsId" column="goods_id"/>
-        <result property="goodsPrice" column="goods_price"/>
-        <result property="goodsLossType" column="goods_loss_type"/>
-        <result property="goodsLossStd" column="goods_loss_std"/>
-        <result property="mblno" column="mblno"/>
-        <result property="ysl" column="ysl"/>
-        <result property="voy" column="voy"/>
-        <result property="polId" column="pol_id"/>
-        <result property="podId" column="pod_id"/>
-        <result property="qtyPlan" column="qty_plan"/>
-        <result property="qtyDisPatch" column="qty_dis_patch"/>
-        <result property="weightPlan" column="weight_plan"/>
-        <result property="cntrDesc" column="cntr_desc"/>
-        <result property="carNoList" column="car_no_list"/>
-        <result property="loadAddr" column="load_addr"/>
-        <result property="loadAttn" column="load_attn"/>
-        <result property="loadAttntel" column="load_attntel"/>
-        <result property="loadDate" column="load_date"/>
-        <result property="mdLoadAddr" column="md_load_addr"/>
-        <result property="mdLoadAttn" column="md_load_attn"/>
-        <result property="mdLoadAttnTel" column="md_load_attn_tel"/>
-        <result property="mdLoadDate" column="md_load_date"/>
-        <result property="unLoadAddr" column="un_load_addr"/>
-        <result property="unLoadAttn" column="un_load_attn"/>
-        <result property="unLoadAttnTel" column="un_load_attn_tel"/>
-        <result property="unLoadDate" column="un_load_date"/>
-        <result property="routeId" column="route_id"/>
-        <result property="routeDesc" column="route_desc"/>
-        <result property="ifWaybill" column="if_waybill"/>
-        <result property="ifNeedinvDr" column="if_needinv_dr"/>
-        <result property="postDate" column="post_date"/>
-        <result property="billStatus" column="bill_status"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remarks" column="remarks"/>
+        <result property="id"    column="id"    />
+        <result property="billNo"    column="bill_no"    />
+        <result property="actId"    column="act_id"    />
+        <result property="corpId"    column="corp_id"    />
+        <result property="planUserId"    column="plan_user_id"    />
+        <result property="transUserName"    column="trans_user_name"    />
+        <result property="planUserName"    column="plan_user_name"    />
+        <result property="billType"    column="bill_type"    />
+        <result property="transUserId"    column="trans_user_id"    />
+        <result property="transType"    column="trans_type"    />
+        <result property="transProp"    column="trans_prop"    />
+        <result property="ifContracted"    column="if_contracted"    />
+        <result property="contractNo"    column="contract_no"    />
+        <result property="refNo"    column="ref_no"    />
+        <result property="accstlType"    column="accstl_type"    />
+        <result property="accdays"    column="accdays"    />
+        <result property="goodsId"    column="goods_id"    />
+        <result property="goodsPrice"    column="goods_price"    />
+        <result property="goodsLossType"    column="goods_loss_type"    />
+        <result property="goodsLossStd"    column="goods_loss_std"    />
+        <result property="mblno"    column="mblno"    />
+        <result property="ysl"    column="ysl"    />
+        <result property="voy"    column="voy"    />
+        <result property="polId"    column="pol_id"    />
+        <result property="qtyPlan"    column="qty_plan"    />
+        <result property="podId"    column="pod_id"    />
+        <result property="qtyDisPatch"    column="qty_dis_patch"    />
+        <result property="weightPlan"    column="weight_plan"    />
+        <result property="cntrDesc"    column="cntr_desc"    />
+        <result property="carNoList"    column="car_no_list"    />
+        <result property="loadAddr"    column="load_addr"    />
+        <result property="loadAttn"    column="load_attn"    />
+        <result property="loadAttntel"    column="load_attntel"    />
+        <result property="loadDate"    column="load_date"    />
+        <result property="mdLoadAddr"    column="md_load_addr"    />
+        <result property="mdLoadAttn"    column="md_load_attn"    />
+        <result property="mdLoadAttnTel"    column="md_load_attn_tel"    />
+        <result property="mdLoadDate"    column="md_load_date"    />
+        <result property="unLoadAddr"    column="un_load_addr"    />
+        <result property="unLoadAttn"    column="un_load_attn"    />
+        <result property="unLoadAttnTel"    column="un_load_attn_tel"    />
+        <result property="unLoadDate"    column="un_load_date"    />
+        <result property="routeId"    column="route_id"    />
+        <result property="routeDesc"    column="route_desc"    />
+        <result property="ifWaybill"    column="if_waybill"    />
+        <result property="ifNeedinvDr"    column="if_needinv_dr"    />
+        <result property="postDate"    column="post_date"    />
+        <result property="billStatus"    column="bill_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remarks"    column="remarks"    />
     </resultMap>
 
     <sql id="selectftmsorderbillsVo">

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

@@ -5,23 +5,24 @@
 <mapper namespace="com.ruoyi.orderPlan.mapper.FtmsorderbillsattachsMapper">
 
     <resultMap type="ftmsorderbillsattachs" id="ftmsorderbillsattachsResult">
-        <result property="id" column="id"/>
-        <result property="pId" column="p_id"/>
-        <result property="orgId" column="org_id"/>
-        <result property="actId" column="act_id"/>
-        <result property="attachUrl" column="attach_url"/>
-        <result property="attachName" column="attach_name"/>
-        <result property="billStatus" column="bill_status"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="remarks" column="remarks"/>
+        <result property="id"    column="id"    />
+        <result property="pId"    column="p_id"    />
+        <result property="orgId"    column="org_id"    />
+        <result property="actId"    column="act_id"    />
+        <result property="attachUrl"    column="attach_url"    />
+        <result property="attachName"    column="attach_name"    />
+        <result property="billStatus"    column="bill_status"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="thumbnailUrl"    column="thumbnail_url"    />
     </resultMap>
 
     <sql id="selectftmsorderbillsattachsVo">
-        select id, p_id, org_id, act_id, attach_url, attach_name, bill_status, del_flag, create_by, create_time, update_by, update_time, remarks from F_TMSORDERBILLSATTACHS
+        select id, p_id, org_id, act_id, attach_url, attach_name, bill_status, del_flag, create_by, create_time, update_by, update_time, remarks, thumbnail_url from F_TMSORDERBILLSATTACHS
     </sql>
 
     <select id="selectftmsorderbillsattachsList" parameterType="ftmsorderbillsattachs"
@@ -59,6 +60,7 @@
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="thumbnailUrl != null">thumbnail_url,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pId != null">#{pId},</if>
@@ -73,6 +75,7 @@
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="thumbnailUrl != null">#{thumbnailUrl},</if>
         </trim>
     </insert>
 
@@ -91,6 +94,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="thumbnailUrl != null">thumbnail_url = #{thumbnailUrl},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -588,12 +588,12 @@
             c.odometer_end AS odometerEnd,
             c.accept_date AS acceptDate,
             c.accept_remarks AS acceptRemarks,
-            c.costom_amt_01 AS costomAmt01,
-            c.costom_amt_02 AS costomAmt02,
-            c.costom_amt_03 AS costomAmt03,
-            c.costom_amt_04 AS costomAmt04,
-            c.costom_amt_05 AS costomAmt05,
-            c.costom_amt_06 AS costomAmt06,
+            IFNULL(c.costom_amt_01, 0) AS costomAmt01,
+            IFNULL(c.costom_amt_02, 0) AS costomAmt02,
+            IFNULL(c.costom_amt_03, 0) AS costomAmt03,
+            IFNULL(c.costom_amt_04, 0) AS costomAmt04,
+            IFNULL(c.costom_amt_05, 0) AS costomAmt05,
+            IFNULL(c.costom_amt_06, 0) AS costomAmt06,
             c.costom_str_01 AS costomStr01,
             c.costom_str_02 AS costomStr02,
             c.load_date AS loadDate,

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TAddressMapper.java

@@ -122,6 +122,13 @@ public interface TAddressMapper
     public int updateTAddressStatus(Long[] fIds);
 
     /**
+     *  查询地点基础 下拉信息
+     * @param tAddress  条件
+     * @return  结果
+     */
+    public List<TAddress> selectTAddressBasicList(TAddress tAddress);
+
+    /**
      * 查询地址表里的编号
      * @param tAddress
      * @return

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/ITAddressService.java

@@ -117,6 +117,12 @@ public interface ITAddressService
      */
     public List<Map<String, Object>>selectAirLineName(TAddress tAddress);
     /**
+     *  查询地点基础 下拉信息
+     * @param tAddress  条件
+     * @return  结果
+     */
+    List<TAddress> selectTAddressBasicList(TAddress tAddress);
+    /**
      * 查询地址表里的编号
      * @param  tAddress
      * @return

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TAddressServiceImpl.java

@@ -149,6 +149,16 @@ public class TAddressServiceImpl implements ITAddressService
         return tAddressMapper.selectAirLineName(tAddress);
     }
 
+    /**
+     *  查询地点基础 下拉信息
+     * @param tAddress  条件
+     * @return  结果
+     */
+    @Override
+    public List<TAddress> selectTAddressBasicList(TAddress tAddress) {
+        return tAddressMapper.selectTAddressBasicList(tAddress);
+    }
+
     @Override
     public String selectAddressFno(TAddress tAddress) {
         return tAddressMapper.selectAddressFno(tAddress);

ruoyi-shipping/src/main/resources/mapper/shipping/TAddressMapper.xml

@@ -90,6 +90,27 @@
         ORDER BY CONVERT(t.f_name USING gbk) asc
     </select>
 
+    <select id="selectTAddressBasicList" parameterType="TAddress" resultMap="TAddressResult">
+         select f_id, f_types, f_no, f_name from t_address
+        <where>
+            <if test="fTypes != null  and fTypes != ''"> and f_types = #{fTypes}</if>
+            <if test="fNo != null  and fNo != ''"> and f_no = #{fNo}</if>
+            <if test="fName != null  and fName != ''"> and f_name like concat('%', #{fName}, '%')</if>
+            <if test="fEname != null  and fEname != ''"> and f_ename like concat('%', #{fEname}, '%')</if>
+            <if test="fLaneid != null "> and f_laneid = #{fLaneid}</if>
+            <if test="fPortid != null "> and f_portid = #{fPortid}</if>
+            <if test="fCountry != null  and fCountry != ''"> and f_country = #{fCountry}</if>
+            <if test="fProvince != null  and fProvince != ''"> and f_province = #{fProvince}</if>
+            <if test="fCity != null  and fCity != ''"> and f_city = #{fCity}</if>
+            <if test="fTel != null  and fTel != ''"> and f_tel = #{fTel}</if>
+            <if test="fEmail != null  and fEmail != ''"> and f_email = #{fEmail}</if>
+            <if test="fManagerid != null "> and f_managerid = #{fManagerid}</if>
+            <if test="fUncode != null  and fUncode != ''"> and f_uncode = #{fUncode}</if>
+            <if test="fPort != null  and fPort != ''"> and f_port = #{fPort}</if>
+            <if test="fStatus != null  and fStatus != ''"> and f_status = #{fStatus}</if>
+        </where>
+    </select>
+
     <select id="selectTAddressById" parameterType="Long" resultMap="TAddressResult">
         <include refid="selectTAddressVo"/>
         where f_id = #{fId}