Explorar el Código

仓库业务 添加 保存时检测是否同一提单号 同一操作日期出现多少次

阿伏兔 hace 4 años
padre
commit
0237497f9e
Se han modificado 17 ficheros con 748 adiciones y 18 borrados
  1. 7 5
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillscarsController.java
  2. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsplansController.java
  3. 12 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java
  4. 12 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java
  5. 12 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java
  6. 12 1
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java
  7. 3 0
      ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java
  8. 2 2
      ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/Ftmsorderbillscars.java
  9. 633 0
      ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/FtmsorderbillscarsExcel.java
  10. 2 1
      ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscarsMapper.java
  11. 2 1
      ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/IftmsorderbillscarsService.java
  12. 1 1
      ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java
  13. 3 3
      ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml
  14. 8 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java
  15. 7 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java
  16. 18 0
      ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java
  17. 13 0
      ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

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

@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.FtmsorderbillscarsExcel;
 import com.ruoyi.orderPlan.service.IftmsorderbillscarsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -57,7 +58,7 @@ public class ftmsorderbillscarsController extends BaseController {
         Map<String, Object> map = new HashMap<>();
         Ftmsorderbills tmsorder = ftmsorderbillscarsService.judgmentFleet(ftmsorderbills);
         startPage();
-        List<Map<String, Object>> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(tmsorder);
+        List<FtmsorderbillscarsExcel> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(tmsorder);
         map.put("dataTable", getDataTable(list));
         map.put("buttonValue", ftmsorderbillscarsService.getButtonValue());
         return map;
@@ -82,10 +83,11 @@ public class ftmsorderbillscarsController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:export')")
     @Log(title = "车队派车", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(Ftmsorderbillscars ftmsorderbillscars) {
-        List<Ftmsorderbillscars> list = ftmsorderbillscarsService.selectftmsorderbillscarsList(ftmsorderbillscars);
-        ExcelUtil<Ftmsorderbillscars> util = new ExcelUtil<Ftmsorderbillscars>(Ftmsorderbillscars.class);
-        return util.exportExcel(list, "ftmsorderbillscars");
+    public AjaxResult export(Ftmsorderbills ftmsorderbills) {
+        Ftmsorderbills tmsorder = ftmsorderbillscarsService.judgmentFleet(ftmsorderbills);
+        List<FtmsorderbillscarsExcel> list = ftmsorderbillscarsService.selectftmsorderbillscarsMapList(tmsorder);
+        ExcelUtil<FtmsorderbillscarsExcel> util = new ExcelUtil<FtmsorderbillscarsExcel>(FtmsorderbillscarsExcel.class);
+        return util.exportExcel(list, "状态跟踪");
     }
 
     /**

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/fleet/orderPlan/ftmsorderbillsplansController.java

@@ -59,7 +59,7 @@ public class ftmsorderbillsplansController extends BaseController {
     /**
      * 查询车队派车列表
      */
-    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillsplans:query')")
+    @PreAuthorize("@ss.hasPermi('fleet:ftmsorderbillscars:query')")
     @GetMapping("/query")
     public TableDataInfo query(Ftmsorderbills ftmsorderbills) {
         startPage();

+ 12 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.GoodsTransfer;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -93,7 +94,8 @@ public class TWarehouseGoodsTransferController extends BaseController {
                           @RequestParam("tEnclosure") String tWhgenleg,
                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("warehousebillsitems") String tWarehousebillsitems,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType = "HQZY";
         if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败:请检查主表数据");
@@ -101,6 +103,15 @@ public class TWarehouseGoodsTransferController extends BaseController {
         if (StringUtils.isEmpty(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
             return AjaxResult.error("提交失败:请检查库存明细数据");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(tWarehouseBills);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return result;
+            }
+        }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,

+ 12 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseInStockController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.InStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -93,11 +94,21 @@ public class TWarehouseInStockController extends BaseController {
                           @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType = "SJRK";
         if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据,请确认");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(tWarehouseBills);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return result;
+            }
+        }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,
                 tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, billsType);

+ 12 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseOutStockController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.OutStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -118,11 +119,21 @@ public class TWarehouseOutStockController extends BaseController {
                           @RequestParam("tEnclosure") String tEnclosure,
                           @RequestParam("warehousebillsfeesCr") String tWarehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String tWarehousebillsfeesDr,
-                          @RequestParam("warehousebillsitems") String tWarehousebillsitems) {
+                          @RequestParam("warehousebillsitems") String tWarehousebillsitems,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType = "SJCK";
         if (StringUtils.isEmpty(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
             return AjaxResult.error("提交失败:请检查主表数据");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(tWarehouseBills);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return result;
+            }
+        }
         // 获取当前的用户
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(tWarehouseBills, tWarehousebillsfeesCr,

+ 12 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseStockTransferController.java

@@ -18,6 +18,7 @@ import com.ruoyi.warehouseBusiness.excel.StockTransfer;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -105,7 +106,8 @@ public class TWarehouseStockTransferController extends BaseController {
                           @RequestParam("warehousebillsfeesCr") String warehousebillsfeesCr,
                           @RequestParam("warehousebillsfeesDr") String warehousebillsfeesDr,
                           @RequestParam("warehousebillsitems") String warehousebillsitems,
-                          @RequestParam("type") String type) {
+                          @RequestParam("type") String type,
+                          @RequestParam("mblnoStatus") String mblnoStatus) {
         String billsType =null;
         if(type.equals("1")){
              billsType = "CKDB";
@@ -115,6 +117,15 @@ public class TWarehouseStockTransferController extends BaseController {
         if (StringUtils.isNull(warehouseBills) || "{}".equals(warehouseBills)) {
             return AjaxResult.error("未找到仓库主表数据,请确认");
         }
+        if (StringUtils.isEmpty(mblnoStatus)) {
+            // 判断是提单号是否在一天当中出现第二次或以上
+            AjaxResult result = itWarehouseBillsService.selectContainMblno(warehouseBills);
+            String ajaxCode = result.get("code").toString();
+            if ("500".equals(ajaxCode)) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return result;
+            }
+        }
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         return itWarehouseBillsService.insertTWarehousebills(warehouseBills, warehousebillsfeesCr,
                 warehousebillsfeesDr, warehousebillsitems, tEnclosure, loginUser, billsType);

+ 3 - 0
ruoyi-fleet/src/main/java/com/ruoyi/basicData/service/impl/FleetDriverMsgServiceImpl.java

@@ -136,6 +136,7 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             SysUser user = userMapper.selectUserByTel(tCorps.getfTel());
             if (StringUtils.isNotNull(user)) {
                 // 该用户提前关注小程序了
+                user.setStatus("1");
                 user.setRelatedNo("T");
                 user.setUserSystem("2");
                 user.setUpdateTime(new Date());
@@ -147,6 +148,7 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             } else {
                 // 添加用户表
                 SysUser use = new SysUser();
+                use.setStatus("1");
                 use.setUserSystem("2");
                 use.setUserName(tCorps.getfTel());
                 use.setNickName(tCorps.getfTel());
@@ -214,6 +216,7 @@ public class FleetDriverMsgServiceImpl implements IFleetDriverMsgService {
             sysUser.setNickName(tCorps.getfName());
             if (!sysUser.getPhonenumber().equals(tCorps.getfTel())) {
                 user.setUserSystem("2");
+                user.setStatus("1");
                 user.setUserType("11");
                 user.setUserName(tCorps.getfTel());
                 user.setNickName(tCorps.getfName());

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

@@ -344,8 +344,8 @@ public class Ftmsorderbillscars extends BaseEntity {
     @Excel(name = "状态(1新建,2暂存,6提交)")
     private Long billStatus;
 
-    /** 订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜60费用确认70回单 */
-    @Excel(name = "订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜60费用确认70回单")
+    /** 订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜60费用确认70回单 */
+    @Excel(name = "订单状态0新录入10车队安排20司机受理30提箱40装卸货50还卸柜60费用确认70回单")
     private Long orderStatus;
 
     /** 对账日期 */

+ 633 - 0
ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/domain/FtmsorderbillscarsExcel.java

@@ -0,0 +1,633 @@
+package com.ruoyi.orderPlan.domain;
+
+import com.ruoyi.common.annotation.Excel;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class FtmsorderbillscarsExcel {
+    private Long id;
+
+    @Excel(name = "运单号")
+    private String orderNo;
+
+    @Excel(name = "提单号")
+    private String mblno;
+
+    @Excel(name = "车号")
+    private String carregNo;
+
+    @Excel(name = "司机")
+    private String driverName;
+
+    @Excel(name = "司机电话")
+    private String driverTel;
+
+    @Excel(name = "状态")
+    private String orderName;
+
+    private String orderStatus;
+
+    @Excel(name = "托运人")
+    private String corpId;
+
+    @Excel(name = "贸易方式")
+    private String billType;
+
+    @Excel(name = "运输方式")
+    private String transType;
+
+    @Excel(name = "运输性质")
+    private String transProp;
+
+    @Excel(name = "品名")
+    private String goodsId;
+
+    @Excel(name = "重量")
+    private String cntrWeight;
+
+    private String qtyPlan;
+
+    private String weightPlan;
+
+    @Excel(name = "船名")
+    private String ysl;
+
+    @Excel(name = "航次")
+    private String voy;
+
+    @Excel(name = "提箱场站")
+    private String loadAddr;
+
+    private Date tLoadDate;
+
+    private String loadAttn;
+
+    private String loadAttntel;
+
+    @Excel(name = "装货地")
+    private String mdLoadAddr;
+
+    private Date tMdLoadDate;
+
+    private String mdLoadAttn;
+
+    private String mdLoadAttnTel;
+
+    @Excel(name = "卸货地")
+    private String unLoadAddr;
+
+    private String tUnLoadDate;
+
+    private String unLoadAttn;
+
+    private String unLoadAttnTel;
+
+    @Excel(name = "柜型")
+    private String cntrId;
+
+    @Excel(name = "起运港")
+    private String polId;
+
+    @Excel(name = "目的港")
+    private String podId;
+
+    @Excel(name = "接单日期")
+    private Date acceptDate;
+
+    @Excel(name = "柜量")
+    private Long cntrQty;
+
+    private Date offData;
+
+    @Excel(name = "提箱日期")
+    private Date loadDate;
+
+    @Excel(name = "装卸日期")
+    private Date mdLoadDate;
+
+    @Excel(name = "还柜日期")
+    private Date unLoadDate;
+
+    private Date waybillDate;
+
+    private String waybillRemarks;
+
+    @Excel(name = "油气费")
+    private BigDecimal oilAmt;
+
+    @Excel(name = "其他费用")
+    private BigDecimal costOth;
+
+    @Excel(name = "单趟提成")
+    private BigDecimal driverbonus;
+
+    @Excel(name = "备注")
+    private String costRemarks;
+
+    @Excel(name = "提箱费")
+    private BigDecimal costomAmt06;
+
+    @Excel(name = "港杂费")
+    private BigDecimal costomAmt05;
+
+    @Excel(name = "吊装费")
+    private BigDecimal costomAmt04;
+
+    @Excel(name = "修洗费")
+    private BigDecimal costomAmt03;
+
+    @Excel(name = "进口其他费用")
+    private BigDecimal costomAmt02;
+
+    @Excel(name = "出口其他费用")
+    private BigDecimal costomAmt01;
+
+    @Excel(name = "进口费用备注")
+    private BigDecimal costomStr02;
+
+    @Excel(name = "出口费用备注")
+    private BigDecimal costomStr01;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getMblno() {
+        return mblno;
+    }
+
+    public void setMblno(String mblno) {
+        this.mblno = mblno;
+    }
+
+    public String getCarregNo() {
+        return carregNo;
+    }
+
+    public void setCarregNo(String carregNo) {
+        this.carregNo = carregNo;
+    }
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName;
+    }
+
+    public String getDriverTel() {
+        return driverTel;
+    }
+
+    public void setDriverTel(String driverTel) {
+        this.driverTel = driverTel;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public String getCorpId() {
+        return corpId;
+    }
+
+    public void setCorpId(String corpId) {
+        this.corpId = corpId;
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getTransType() {
+        return transType;
+    }
+
+    public void setTransType(String transType) {
+        this.transType = transType;
+    }
+
+    public String getTransProp() {
+        return transProp;
+    }
+
+    public void setTransProp(String transProp) {
+        this.transProp = transProp;
+    }
+
+    public String getGoodsId() {
+        return goodsId;
+    }
+
+    public void setGoodsId(String goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    public String getCntrWeight() {
+        return cntrWeight;
+    }
+
+    public void setCntrWeight(String cntrWeight) {
+        this.cntrWeight = cntrWeight;
+    }
+
+    public String getQtyPlan() {
+        return qtyPlan;
+    }
+
+    public void setQtyPlan(String qtyPlan) {
+        this.qtyPlan = qtyPlan;
+    }
+
+    public String getWeightPlan() {
+        return weightPlan;
+    }
+
+    public void setWeightPlan(String weightPlan) {
+        this.weightPlan = weightPlan;
+    }
+
+    public String getYsl() {
+        return ysl;
+    }
+
+    public void setYsl(String ysl) {
+        this.ysl = ysl;
+    }
+
+    public String getVoy() {
+        return voy;
+    }
+
+    public void setVoy(String voy) {
+        this.voy = voy;
+    }
+
+    public String getLoadAddr() {
+        return loadAddr;
+    }
+
+    public void setLoadAddr(String loadAddr) {
+        this.loadAddr = loadAddr;
+    }
+
+    public Date gettLoadDate() {
+        return tLoadDate;
+    }
+
+    public void settLoadDate(Date tLoadDate) {
+        this.tLoadDate = tLoadDate;
+    }
+
+    public String getLoadAttn() {
+        return loadAttn;
+    }
+
+    public void setLoadAttn(String loadAttn) {
+        this.loadAttn = loadAttn;
+    }
+
+    public String getLoadAttntel() {
+        return loadAttntel;
+    }
+
+    public void setLoadAttntel(String loadAttntel) {
+        this.loadAttntel = loadAttntel;
+    }
+
+    public String getMdLoadAddr() {
+        return mdLoadAddr;
+    }
+
+    public void setMdLoadAddr(String mdLoadAddr) {
+        this.mdLoadAddr = mdLoadAddr;
+    }
+
+    public Date gettMdLoadDate() {
+        return tMdLoadDate;
+    }
+
+    public void settMdLoadDate(Date tMdLoadDate) {
+        this.tMdLoadDate = tMdLoadDate;
+    }
+
+    public String getMdLoadAttn() {
+        return mdLoadAttn;
+    }
+
+    public void setMdLoadAttn(String mdLoadAttn) {
+        this.mdLoadAttn = mdLoadAttn;
+    }
+
+    public String getMdLoadAttnTel() {
+        return mdLoadAttnTel;
+    }
+
+    public void setMdLoadAttnTel(String mdLoadAttnTel) {
+        this.mdLoadAttnTel = mdLoadAttnTel;
+    }
+
+    public String getUnLoadAddr() {
+        return unLoadAddr;
+    }
+
+    public void setUnLoadAddr(String unLoadAddr) {
+        this.unLoadAddr = unLoadAddr;
+    }
+
+    public String gettUnLoadDate() {
+        return tUnLoadDate;
+    }
+
+    public void settUnLoadDate(String tUnLoadDate) {
+        this.tUnLoadDate = tUnLoadDate;
+    }
+
+    public String getUnLoadAttn() {
+        return unLoadAttn;
+    }
+
+    public void setUnLoadAttn(String unLoadAttn) {
+        this.unLoadAttn = unLoadAttn;
+    }
+
+    public String getUnLoadAttnTel() {
+        return unLoadAttnTel;
+    }
+
+    public void setUnLoadAttnTel(String unLoadAttnTel) {
+        this.unLoadAttnTel = unLoadAttnTel;
+    }
+
+    public String getCntrId() {
+        return cntrId;
+    }
+
+    public void setCntrId(String cntrId) {
+        this.cntrId = cntrId;
+    }
+
+    public String getPolId() {
+        return polId;
+    }
+
+    public void setPolId(String polId) {
+        this.polId = polId;
+    }
+
+    public String getPodId() {
+        return podId;
+    }
+
+    public void setPodId(String podId) {
+        this.podId = podId;
+    }
+
+    public Date getAcceptDate() {
+        return acceptDate;
+    }
+
+    public void setAcceptDate(Date acceptDate) {
+        this.acceptDate = acceptDate;
+    }
+
+    public Long getCntrQty() {
+        return cntrQty;
+    }
+
+    public void setCntrQty(Long cntrQty) {
+        this.cntrQty = cntrQty;
+    }
+
+    public Date getOffData() {
+        return offData;
+    }
+
+    public void setOffData(Date offData) {
+        this.offData = offData;
+    }
+
+    public Date getLoadDate() {
+        return loadDate;
+    }
+
+    public void setLoadDate(Date loadDate) {
+        this.loadDate = loadDate;
+    }
+
+    public Date getMdLoadDate() {
+        return mdLoadDate;
+    }
+
+    public void setMdLoadDate(Date mdLoadDate) {
+        this.mdLoadDate = mdLoadDate;
+    }
+
+    public Date getUnLoadDate() {
+        return unLoadDate;
+    }
+
+    public void setUnLoadDate(Date unLoadDate) {
+        this.unLoadDate = unLoadDate;
+    }
+
+    public Date getWaybillDate() {
+        return waybillDate;
+    }
+
+    public void setWaybillDate(Date waybillDate) {
+        this.waybillDate = waybillDate;
+    }
+
+    public String getWaybillRemarks() {
+        return waybillRemarks;
+    }
+
+    public void setWaybillRemarks(String waybillRemarks) {
+        this.waybillRemarks = waybillRemarks;
+    }
+
+    public BigDecimal getOilAmt() {
+        return oilAmt;
+    }
+
+    public void setOilAmt(BigDecimal oilAmt) {
+        this.oilAmt = oilAmt;
+    }
+
+    public BigDecimal getCostOth() {
+        return costOth;
+    }
+
+    public void setCostOth(BigDecimal costOth) {
+        this.costOth = costOth;
+    }
+
+    public BigDecimal getDriverbonus() {
+        return driverbonus;
+    }
+
+    public void setDriverbonus(BigDecimal driverbonus) {
+        this.driverbonus = driverbonus;
+    }
+
+    public String getCostRemarks() {
+        return costRemarks;
+    }
+
+    public void setCostRemarks(String costRemarks) {
+        this.costRemarks = costRemarks;
+    }
+
+    public BigDecimal getCostomAmt06() {
+        return costomAmt06;
+    }
+
+    public void setCostomAmt06(BigDecimal costomAmt06) {
+        this.costomAmt06 = costomAmt06;
+    }
+
+    public BigDecimal getCostomAmt05() {
+        return costomAmt05;
+    }
+
+    public void setCostomAmt05(BigDecimal costomAmt05) {
+        this.costomAmt05 = costomAmt05;
+    }
+
+    public BigDecimal getCostomAmt04() {
+        return costomAmt04;
+    }
+
+    public void setCostomAmt04(BigDecimal costomAmt04) {
+        this.costomAmt04 = costomAmt04;
+    }
+
+    public BigDecimal getCostomAmt03() {
+        return costomAmt03;
+    }
+
+    public void setCostomAmt03(BigDecimal costomAmt03) {
+        this.costomAmt03 = costomAmt03;
+    }
+
+    public BigDecimal getCostomAmt02() {
+        return costomAmt02;
+    }
+
+    public void setCostomAmt02(BigDecimal costomAmt02) {
+        this.costomAmt02 = costomAmt02;
+    }
+
+    public BigDecimal getCostomAmt01() {
+        return costomAmt01;
+    }
+
+    public void setCostomAmt01(BigDecimal costomAmt01) {
+        this.costomAmt01 = costomAmt01;
+    }
+
+    public BigDecimal getCostomStr02() {
+        return costomStr02;
+    }
+
+    public void setCostomStr02(BigDecimal costomStr02) {
+        this.costomStr02 = costomStr02;
+    }
+
+    public BigDecimal getCostomStr01() {
+        return costomStr01;
+    }
+
+    public void setCostomStr01(BigDecimal costomStr01) {
+        this.costomStr01 = costomStr01;
+    }
+
+    @Override
+    public String toString() {
+        return "FtmsorderbillscarsExcel{" +
+                "orderNo='" + orderNo + '\'' +
+                ", mblno='" + mblno + '\'' +
+                ", carregNo='" + carregNo + '\'' +
+                ", driverName='" + driverName + '\'' +
+                ", driverTel='" + driverTel + '\'' +
+                ", orderName='" + orderName + '\'' +
+                ", orderStatus='" + orderStatus + '\'' +
+                ", corpId='" + corpId + '\'' +
+                ", billType='" + billType + '\'' +
+                ", transType='" + transType + '\'' +
+                ", transProp='" + transProp + '\'' +
+                ", goodsId='" + goodsId + '\'' +
+                ", cntrWeight='" + cntrWeight + '\'' +
+                ", qtyPlan='" + qtyPlan + '\'' +
+                ", weightPlan='" + weightPlan + '\'' +
+                ", ysl='" + ysl + '\'' +
+                ", voy='" + voy + '\'' +
+                ", loadAddr='" + loadAddr + '\'' +
+                ", tLoadDate='" + tLoadDate + '\'' +
+                ", loadAttn='" + loadAttn + '\'' +
+                ", loadAttntel='" + loadAttntel + '\'' +
+                ", mdLoadAddr='" + mdLoadAddr + '\'' +
+                ", tMdLoadDate='" + tMdLoadDate + '\'' +
+                ", mdLoadAttn='" + mdLoadAttn + '\'' +
+                ", mdLoadAttnTel='" + mdLoadAttnTel + '\'' +
+                ", unLoadAddr='" + unLoadAddr + '\'' +
+                ", tUnLoadDate='" + tUnLoadDate + '\'' +
+                ", unLoadAttn='" + unLoadAttn + '\'' +
+                ", unLoadAttnTel='" + unLoadAttnTel + '\'' +
+                ", cntrId='" + cntrId + '\'' +
+                ", polId='" + polId + '\'' +
+                ", podId='" + podId + '\'' +
+                ", acceptDate='" + acceptDate + '\'' +
+                ", cntrQty='" + cntrQty + '\'' +
+                ", offData='" + offData + '\'' +
+                ", loadDate='" + loadDate + '\'' +
+                ", mdLoadDate='" + mdLoadDate + '\'' +
+                ", unLoadDate='" + unLoadDate + '\'' +
+                ", waybillDate='" + waybillDate + '\'' +
+                ", waybillRemarks='" + waybillRemarks + '\'' +
+                ", oilAmt='" + oilAmt + '\'' +
+                ", costOth='" + costOth + '\'' +
+                ", driverbonus='" + driverbonus + '\'' +
+                ", costRemarks='" + costRemarks + '\'' +
+                ", costomAmt06='" + costomAmt06 + '\'' +
+                ", costomAmt05='" + costomAmt05 + '\'' +
+                ", costomAmt04='" + costomAmt04 + '\'' +
+                ", costomAmt03='" + costomAmt03 + '\'' +
+                ", costomAmt02='" + costomAmt02 + '\'' +
+                ", costomAmt01='" + costomAmt01 + '\'' +
+                ", costomStr02='" + costomStr02 + '\'' +
+                ", costomStr01='" + costomStr01 + '\'' +
+                '}';
+    }
+}

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

@@ -2,6 +2,7 @@ package com.ruoyi.orderPlan.mapper;
 
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.FtmsorderbillscarsExcel;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscntrs;
 import org.apache.ibatis.annotations.Param;
 
@@ -101,7 +102,7 @@ public interface FtmsorderbillscarsMapper {
      * @param ftmsorderbills 条件
      * @return 结果
      */
-    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
+    public List<FtmsorderbillscarsExcel> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
 
     /**
      * 根据orgId更新数据状态

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.orderPlan.domain.Ftmsorderbills;
 import com.ruoyi.orderPlan.domain.Ftmsorderbillscars;
+import com.ruoyi.orderPlan.domain.FtmsorderbillscarsExcel;
 
 import java.util.List;
 import java.util.Map;
@@ -82,7 +83,7 @@ public interface IftmsorderbillscarsService {
      * @param ftmsorderbills    条件
      * @return  结果
      */
-    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
+    public List<FtmsorderbillscarsExcel> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills);
 
     /**
      *  司机操作接单/提箱/装卸货/还卸柜/回单操作  保存

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

@@ -170,7 +170,7 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
      * @return 结果
      */
     @Override
-    public List<Map<String, Object>> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills) {
+    public List<FtmsorderbillscarsExcel> selectftmsorderbillscarsMapList(Ftmsorderbills ftmsorderbills) {
         return ftmsorderbillscarsMapper.selectftmsorderbillscarsMapList(ftmsorderbills);
     }
 

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

@@ -407,7 +407,7 @@
         </where>
     </select>
 
-    <select id="selectftmsorderbillscarsMapList" parameterType="ftmsorderbills" resultType="Map">
+    <select id="selectftmsorderbillscarsMapList" parameterType="ftmsorderbills" resultType="ftmsorderbillscarsExcel">
         SELECT
             c.id,
             c.order_no orderNo,
@@ -426,7 +426,7 @@
             WHEN 50 THEN
             '装卸货'
             WHEN 60 THEN
-            '还卸柜'
+            '还卸柜'
             WHEN 80 THEN
             '回单'
             END orderName,
@@ -632,7 +632,7 @@
             IFNULL( c.costom_amt_06, 0 ) AS costomAmt06,
             c.costom_str_01 AS costomStr01,
             c.costom_str_02 AS costomStr02,
-            IFNULL( c.load_date, t.load_date ) AS loadDate,
+            c.load_date AS loadDate,
             c.load_remarks AS loadRemarks,
             date_format( c.md_load_date, '%Y-%m-%d' ) AS mdLoadDate,
             c.md_load_remarks AS mdLoadRemarks,

+ 8 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -100,4 +100,12 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
     public List<TWareHouseItemsExcel> selectTWarehousebillsItemList(TWarehouseBills tWarehouseBills);
 
     public List<Map<String, Object>> selectDetailedList(TWarehousebill tWarehousebill);
+
+    /**
+     *  根据提单号在当天时出现多少次
+     * @param getfMblno     提单号
+     * @param currentDay    当前日期
+     * @return  结果
+     */
+    public int selectContainMblno(@Param("mblNo") String getfMblno, @Param("currentDay") List<String> currentDay);
 }

+ 7 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -216,4 +216,11 @@ public interface ITWarehouseBillsService {
      * @return  结果
      */
     public AjaxResult saveWarehouse(String information);
+
+    /**
+     *  查询提单号是否在一天当中出现多次
+     * @param tWarehouseBills   仓库数据
+     * @return  结果
+     */
+    public AjaxResult selectContainMblno(String tWarehouseBills);
 }

+ 18 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -945,6 +945,24 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success();
     }
 
+    /**
+     *  查询提单号是否在一天当中出现多次
+     * @param tWarehouseBills   仓库数据
+     * @return  结果
+     */
+    @Override
+    public AjaxResult selectContainMblno(String tWarehouseBills) {
+        TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
+        List<String> currentDay = DateUtils.getCurrentDay();
+        String mblno = warehouseBills.getfMblno();
+        Date bsdate = warehouseBills.getfBsdate();
+        int count = tWarehouseBillsMapper.selectContainMblno(mblno, currentDay);
+        if (count > 1) {
+            return AjaxResult.error("提单号:" + mblno + ",日期:" + DateUtils.dateTime(bsdate) + ",出现" + count + "次");
+        }
+        return AjaxResult.success();
+    }
+
     @Override
     @Transactional
     public AjaxResult addCreditItems(String tEnclosure ,String  tWarehousebillsitems, String billsType,LoginUser loginUser) {

+ 13 - 0
ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -570,6 +570,7 @@
         </where>
         ${params.dataScope}
     </select>
+
     <select id="selectInventorySJCKList" parameterType="TWarehousebills"  resultType="java.util.Map">
         SELECT
         co.f_name AS fName,
@@ -637,6 +638,7 @@
         </where>
         ${params.dataScope}
     </select>
+
     <select id="selectTWarehousebillsItemList"
             resultType="com.ruoyi.reportManagement.domain.TWareHouseItemsExcel">
         SELECT
@@ -692,6 +694,17 @@
         </if>
     </select>
 
+    <select id="selectContainMblno" resultType="int">
+        SELECT
+            count( f_id )
+        FROM
+            t_warehouse
+        where
+            f_mblno = #{mblNo}
+            AND f_bsdate &gt; #{currentDay[0]}
+            AND f_bsdate &lt; #{currentDay[1]}
+    </select>
+
     <insert id="insertTWarehousebills" parameterType="TWarehousebills" useGeneratedKeys="true" keyProperty="fId">
         insert into t_warehousebills
         <trim prefix="(" suffix=")" suffixOverrides=",">