Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/approvalFlow/AuditPathsController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.warehouse.approvalFlow;
 
 import java.util.List;
+import java.util.Map;
 
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.approvalFlow.domain.AuditItems;
@@ -149,19 +150,18 @@ public class AuditPathsController extends BaseController {
         }*/
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         auditItems.setAuditUserId(loginUser.getUser().getUserId());
-        return auditPathsService.selectAllAuditItems(auditItems);
+        return AjaxResult.success(auditPathsService.selectAllAuditItems(auditItems));
     }
 
     /** 审批条件查询 */
     @GetMapping(value = "/selectAuditItems")
-    public AjaxResult selectAuditItems(AuditItems auditItems) {
+    public TableDataInfo selectAuditItems(AuditItems auditItems) {
         startPage();
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
         auditItems.setAuditUserId(loginUser.getUser().getUserId());
-        return auditPathsService.selectAllAuditItems(auditItems);
+        return getDataTable(auditPathsService.selectAllAuditItems(auditItems));
     }
 
-
     /** 审批查询条件条数*/
     @GetMapping(value = "/selectCountAuditItems")
     public AjaxResult selectCountAuditItems() {

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

@@ -51,14 +51,6 @@ public class TWarehouseGoodsTransferController extends BaseController {
 
 
     /**
-     * 查询货转详情主表列表
-     */
-    @GetMapping("/getWarehouseGoodsTransfer")
-    public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) {
-        return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
-    }
-
-    /**
      * 导出货转详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:goodsTransfer:export')")

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

@@ -37,15 +37,6 @@ public class TWarehouseInStockController extends BaseController {
     private ITWarehouseBillsService itWarehouseBillsService;
 
     /**
-     * 查询出库详情主表列表
-     */
-    @GetMapping("/getWarehouseInStock")
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) {
-        return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
-    }
-
-    /**
      * 查询入库详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:list')")
@@ -139,6 +130,31 @@ public class TWarehouseInStockController extends BaseController {
     }
 
     /**
+     * 仓库主表审批
+     */
+    /*@PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:add')")
+    @Log(title = "详情主表", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/warehouseSubmission")
+    @RepeatSubmit
+    public AjaxResult warehouseSubmission(@RequestParam("tWarehouseBills") String tWarehouseBills,
+                                          @RequestParam("tEnclosure") String tEnclosure,
+                                          @RequestParam("tCntr") String tCntr,
+                                          @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
+                                          @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr,
+                                          @RequestParam("tWarehousebillsitems") String tWarehousebillsitems) {
+        String billsType = "SJRK";
+        if (StringUtils.isNull(tWarehouseBills) || "{}".equals(tWarehouseBills)) {
+            return AjaxResult.error("未找到仓库主表数据，请确认");
+        }
+        if (StringUtils.isNull(tWarehousebillsitems) || "[]".equals(tWarehousebillsitems)) {
+            return AjaxResult.error("未找到仓库明细数据，请确认");
+        }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return itWarehouseBillsService.warehouseSubmission(tWarehouseBills, tWarehousebillsfeesCr,
+                tWarehousebillsfeesDr, tWarehousebillsitems, tEnclosure, loginUser, tCntr, billsType);
+    }*/
+
+    /**
      * 修改入库详情主表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:inStock:edit')")

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

@@ -37,15 +37,6 @@ public class TWarehouseStockTransferController extends BaseController {
     private ITWarehouseBillsService itWarehouseBillsService;
 
     /**
-     * 查询出库详情主表列表
-     */
-    @GetMapping("/getWarehouseStockTransfer")
-    @DataScope(deptAlias = "d", userAlias = "u")
-    public String getWarehouseStockTransferBillsNo(TWarehouseBills tWarehouseBills) {
-        return itWarehouseBillsService.getWarehouseInStockBillsNo(tWarehouseBills);
-    }
-
-    /**
      * 查询入库详情主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:stockTransfer:list')")

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

@@ -222,6 +222,11 @@ public class Ftmsorderbills extends BaseEntity {
     private String remarks;
 
     /**
+     * 派车状态
+     */
+    private String planBillStatus;
+
+    /**
      * 接单状态
      */
     private Long orderStatus;
@@ -275,6 +280,14 @@ public class Ftmsorderbills extends BaseEntity {
     /** 车队id */
     private Long fleetId;
 
+    public String getPlanBillStatus() {
+        return planBillStatus;
+    }
+
+    public void setPlanBillStatus(String planBillStatus) {
+        this.planBillStatus = planBillStatus;
+    }
+
     public Long getFleetId() {
         return fleetId;
     }

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

@@ -102,6 +102,9 @@ public class VehicleLedgerExcel {
     @Excel(name = "车利润")
     private BigDecimal profitCar;
 
+    @Excel(name = "单据类型")
+    private String billKind;
+
     /**
      *  检索条件：结算单位
      */
@@ -132,6 +135,14 @@ public class VehicleLedgerExcel {
      */
     private String invStatus;
 
+    public String getBillKind() {
+        return billKind;
+    }
+
+    public void setBillKind(String billKind) {
+        this.billKind = billKind;
+    }
+
     public Long gettCorpId() {
         return tCorpId;
     }

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

@@ -444,6 +444,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         long pId = tmsorderbillscars.getId();
         long orgId = tmsorderbillscars.getOrgId();
         Ftmsorderbillscars ftmsorderbillscars = ftmsorderbillscarsMapper.selectftmsorderbillscarsById(pId);
+        if (StringUtils.isNull(tmsorderbillscars.getAcceptDate())) {
+            return AjaxResult.error("该运单未填写接单日期");
+        }
         if (ftmsorderbillscars.getOrderStatus() < 60L) {
             return AjaxResult.error("运单状态异常该运单未回单：" + ftmsorderbillscars.getBillStatus());
         }

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

@@ -207,7 +207,7 @@
             AND f.bill_status LIKE "%${billStatus}%"
         </if>
         ${params.dataScope}
-        ORDER BY f.id desc
+        ORDER BY f.bill_status, f.id asc
     </select>
 
     <select id="selectftmsorderbillsById" parameterType="Long" resultMap="ftmsorderbillsResult">

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

@@ -132,6 +132,9 @@
             <if test="goodsId != null and goodsId != 0">
                 AND f.goods_id = #{goodsId}
             </if>
+            <if test="planBillStatus != null and planBillStatus != ''">
+                AND plan.bill_status = #{planBillStatus}
+            </if>
             <if test="mblno != null and mblno != ''">
                 AND f.mblno LIKE "%${mblno}%"
             </if>
@@ -147,7 +150,7 @@
             <if test="billStatus != null and billStatus != ''">
                 AND f.bill_status LIKE "%${billStatus}%"
             </if>
-        ORDER BY plan.id desc
+        ORDER BY plan.bill_status, plan.id asc
     </select>
 
     <select id="selectftmsorderbillsplansCountList" parameterType="ftmsorderbillsplans" resultType="int">

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/domain/AuditItems.java

@@ -146,6 +146,14 @@ public class AuditItems extends BaseEntity {
     @Excel(name = "业务日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date billTime;
 
+    /** 存储对应审批字段 */
+    @Excel(name = "存储对应审批字段")
+    private String fidStatus;
+
+    /** 第几次提交审批 */
+    @Excel(name = "第几次提交审批")
+    private Long times;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -314,30 +322,48 @@ public class AuditItems extends BaseEntity {
         this.billTime = billTime;
     }
 
+    public String getFidStatus() {
+        return fidStatus;
+    }
+
+    public void setFidStatus(String fidStatus) {
+        this.fidStatus = fidStatus;
+    }
+
+    public Long getTimes() {
+        return times;
+    }
+
+    public void setTimes(Long times) {
+        this.times = times;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("billNo", getBillNo())
-                .append("billId", getBillId())
-                .append("actId", getActId())
-                .append("pathId", getPathId())
-                .append("levelId", getLevelId())
-                .append("refno1", getRefno1())
-                .append("iffinalItem", getIffinalItem())
-                .append("refno2", getRefno2())
-                .append("refno3", getRefno3())
-                .append("branchId", getBranchId())
-                .append("sendUserId", getSendUserId())
-                .append("sendName", getSendName())
-                .append("sendTime", getSendTime())
-                .append("sendMsg", getSendMsg())
-                .append("auditUserId", getAuditUserId())
-                .append("auditItem", getAuditItem())
-                .append("auditOpTime", getAuditOpTime())
-                .append("auditMsg", getAuditMsg())
-                .append("auditStatus", getAuditStatus())
-                .append("billTime", getBillTime())
-                .toString();
+        return "AuditItems{" +
+                "id=" + id +
+                ", billNo='" + billNo + '\'' +
+                ", billId=" + billId +
+                ", actId=" + actId +
+                ", pathId=" + pathId +
+                ", levelId=" + levelId +
+                ", refno1='" + refno1 + '\'' +
+                ", iffinalItem='" + iffinalItem + '\'' +
+                ", refno2='" + refno2 + '\'' +
+                ", refno3='" + refno3 + '\'' +
+                ", branchId=" + branchId +
+                ", sendUserId=" + sendUserId +
+                ", sendName='" + sendName + '\'' +
+                ", sendTime=" + sendTime +
+                ", sendMsg='" + sendMsg + '\'' +
+                ", auditUserId=" + auditUserId +
+                ", auditItem=" + auditItem +
+                ", auditOpTime=" + auditOpTime +
+                ", auditMsg='" + auditMsg + '\'' +
+                ", auditStatus='" + auditStatus + '\'' +
+                ", billTime=" + billTime +
+                ", fidStatus='" + fidStatus + '\'' +
+                ", times=" + times +
+                '}';
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/domain/AuditItemsUsers.java

@@ -1,7 +1,5 @@
 package com.ruoyi.approvalFlow.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
@@ -49,6 +47,14 @@ public class AuditItemsUsers extends BaseEntity {
     @Excel(name = "状态")
     private String auditStatus;
 
+    /** 存储对应审批字段 */
+    @Excel(name = "存储对应审批字段")
+    private String fidStatus;
+
+    /** 第几次提交审批 */
+    @Excel(name = "第几次提交审批")
+    private Long times;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -97,15 +103,33 @@ public class AuditItemsUsers extends BaseEntity {
         return auditStatus;
     }
 
+    public String getFidStatus() {
+        return fidStatus;
+    }
+
+    public void setFidStatus(String fidStatus) {
+        this.fidStatus = fidStatus;
+    }
+
+    public Long getTimes() {
+        return times;
+    }
+
+    public void setTimes(Long times) {
+        this.times = times;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("pid", getPid())
-                .append("billNo", getBillNo())
-                .append("actId", getActId())
-                .append("userId", getUserId())
-                .append("auditStatus", getAuditStatus())
-                .toString();
+        return "AuditItemsUsers{" +
+                "id=" + id +
+                ", pid=" + pid +
+                ", billNo='" + billNo + '\'' +
+                ", actId=" + actId +
+                ", userId=" + userId +
+                ", auditStatus='" + auditStatus + '\'' +
+                ", fidStatus='" + fidStatus + '\'' +
+                ", times=" + times +
+                '}';
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/IAuditPathsService.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 审批流配置主Service接口
@@ -82,7 +83,7 @@ public interface IAuditPathsService {
      * @param auditItems  查询条件
      * @return  结果
      */
-    AjaxResult selectAllAuditItems(AuditItems auditItems);
+    List<Map<String, Object>> selectAllAuditItems(AuditItems auditItems);
 
     /**
      *  审批通过

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -291,8 +291,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
      * @return 结果
      */
     @Override
-    public AjaxResult selectAllAuditItems(AuditItems auditItems) {
-        return AjaxResult.success(auditItemsMapper.selectAuditItems(auditItems));
+    public List<Map<String, Object>> selectAllAuditItems(AuditItems auditItems) {
+        return auditItemsMapper.selectAuditItems(auditItems);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -485,6 +485,68 @@ public class TWarehouseBills extends BaseEntity {
     @Excel(name = "箱量")
     private String fCntval;
 
+    /**
+     * 箱使日期
+     */
+    @Excel(name = "箱使日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date freeContainerDate;
+
+    /** 业务归属(取自数据字典) */
+    @Excel(name = "业务归属(取自数据字典)")
+    private Long fBusinessAttribution;
+
+    /** 监管单位(取自客户资料) */
+    @Excel(name = "监管单位(取自客户资料)")
+    private Long fSupervisionUnit;
+
+    /** 申报要素(取自数据字典) */
+    @Excel(name = "申报要素(取自数据字典)")
+    private Long fDeclarationElements;
+
+    /** 料件号 */
+    @Excel(name = "料件号")
+    private String fPartNumber;
+
+    /** 是否法检(取自数据字典) */
+    @Excel(name = "是否法检(取自数据字典)")
+    private Long fIfinspection;
+
+    /** 货值 */
+    @Excel(name = "货值")
+    private BigDecimal fValue;
+
+    /** 过磅时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "过磅时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date fWeighingDate;
+
+    /** 是否取样 */
+    @Excel(name = "是否取样")
+    private Long fIfsampling;
+
+    /** 送样时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "送样时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date sendSampleDate;
+
+    /** 是否复磅(取数据字典) */
+    @Excel(name = "是否复磅(取数据字典)")
+    private Long fIfweightRecovery;
+
+    /** 复磅时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "复磅时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date weightRecoveryDate;
+
+
+    /** 新加审批(只审批主表标星字段)2暂存3审批驳回、4提交、5审批中、6审批通过*/
+    @Excel(name = "新加审批(只审批主表标星字段)2暂存3审批驳回、4提交、5审批中、6审批通过")
+    private Long warehouseStatus;
+
+    /** 审批提交次数 */
+    @Excel(name = "审批提交次数")
+    private Long fTimes;
+
     //起运港中文名
     private String loadportidName;
     //目的港中文名
@@ -529,10 +591,12 @@ public class TWarehouseBills extends BaseEntity {
     private String corpName;
     //查询时间区间
     private List<String> cLoadDate;
+    //查询箱使日期时间区间
+    private List<String> freeContainerList;
     //应收款信息
     private List<TWarehousebillsfees> tWarehousebillsfeesDr;
     //应付款信息
-    List<TWarehousebillsfees> warehousebillsfeesCr;
+    private List<TWarehousebillsfees> warehousebillsfeesCr;
     //费用状态
     private Long moneyStatus;
 
@@ -1411,6 +1475,126 @@ public class TWarehouseBills extends BaseEntity {
         this.fCartype = fCartype;
     }
 
+    public Date getFreeContainerDate() {
+        return freeContainerDate;
+    }
+
+    public void setFreeContainerDate(Date freeContainerDate) {
+        this.freeContainerDate = freeContainerDate;
+    }
+
+    public List<String> getFreeContainerList() {
+        return freeContainerList;
+    }
+
+    public void setFreeContainerList(List<String> freeContainerList) {
+        this.freeContainerList = freeContainerList;
+    }
+
+    public Long getfBusinessAttribution() {
+        return fBusinessAttribution;
+    }
+
+    public void setfBusinessAttribution(Long fBusinessAttribution) {
+        this.fBusinessAttribution = fBusinessAttribution;
+    }
+
+    public Long getfSupervisionUnit() {
+        return fSupervisionUnit;
+    }
+
+    public void setfSupervisionUnit(Long fSupervisionUnit) {
+        this.fSupervisionUnit = fSupervisionUnit;
+    }
+
+    public Long getfDeclarationElements() {
+        return fDeclarationElements;
+    }
+
+    public void setfDeclarationElements(Long fDeclarationElements) {
+        this.fDeclarationElements = fDeclarationElements;
+    }
+
+    public String getfPartNumber() {
+        return fPartNumber;
+    }
+
+    public void setfPartNumber(String fPartNumber) {
+        this.fPartNumber = fPartNumber;
+    }
+
+    public Long getfIfinspection() {
+        return fIfinspection;
+    }
+
+    public void setfIfinspection(Long fIfinspection) {
+        this.fIfinspection = fIfinspection;
+    }
+
+    public BigDecimal getfValue() {
+        return fValue;
+    }
+
+    public void setfValue(BigDecimal fValue) {
+        this.fValue = fValue;
+    }
+
+    public Date getfWeighingDate() {
+        return fWeighingDate;
+    }
+
+    public void setfWeighingDate(Date fWeighingDate) {
+        this.fWeighingDate = fWeighingDate;
+    }
+
+    public Long getfIfsampling() {
+        return fIfsampling;
+    }
+
+    public void setfIfsampling(Long fIfsampling) {
+        this.fIfsampling = fIfsampling;
+    }
+
+    public Date getSendSampleDate() {
+        return sendSampleDate;
+    }
+
+    public void setSendSampleDate(Date sendSampleDate) {
+        this.sendSampleDate = sendSampleDate;
+    }
+
+    public Long getfIfweightRecovery() {
+        return fIfweightRecovery;
+    }
+
+    public void setfIfweightRecovery(Long fIfweightRecovery) {
+        this.fIfweightRecovery = fIfweightRecovery;
+    }
+
+    public Date getWeightRecoveryDate() {
+        return weightRecoveryDate;
+    }
+
+    public void setWeightRecoveryDate(Date weightRecoveryDate) {
+        this.weightRecoveryDate = weightRecoveryDate;
+    }
+
+    public Long getWarehouseStatus() {
+        return warehouseStatus;
+    }
+
+    public void setWarehouseStatus(Long warehouseStatus) {
+        this.warehouseStatus = warehouseStatus;
+    }
+
+    public Long getfTimes() {
+        return fTimes;
+    }
+
+    public void setfTimes(Long fTimes) {
+        this.fTimes = fTimes;
+    }
+
     @Override
     public String toString() {
         return "TWarehouseBills{" +
@@ -1491,6 +1675,18 @@ public class TWarehouseBills extends BaseEntity {
                 ", fPaymode=" + fPaymode +
                 ", fLaneid=" + fLaneid +
                 ", fCntval='" + fCntval + '\'' +
+                ", freeContainerDate=" + freeContainerDate +
+                ", fBusinessAttribution=" + fBusinessAttribution +
+                ", fSupervisionUnit=" + fSupervisionUnit +
+                ", fDeclarationElements=" + fDeclarationElements +
+                ", fPartNumber='" + fPartNumber + '\'' +
+                ", fIfinspection=" + fIfinspection +
+                ", fValue=" + fValue +
+                ", fWeighingDate=" + fWeighingDate +
+                ", fIfsampling=" + fIfsampling +
+                ", sendSampleDate=" + sendSampleDate +
+                ", fIfweightRecovery=" + fIfweightRecovery +
+                ", weightRecoveryDate=" + weightRecoveryDate +
                 ", loadportidName='" + loadportidName + '\'' +
                 ", destportidName='" + destportidName + '\'' +
                 ", serviceitemsName='" + serviceitemsName + '\'' +
@@ -1511,8 +1707,11 @@ public class TWarehouseBills extends BaseEntity {
                 ", endTime=" + endTime +
                 ", boxNumber='" + boxNumber + '\'' +
                 ", corpName='" + corpName + '\'' +
+                ", cLoadDate=" + cLoadDate +
+                ", freeContainerList=" + freeContainerList +
                 ", tWarehousebillsfeesDr=" + tWarehousebillsfeesDr +
                 ", warehousebillsfeesCr=" + warehousebillsfeesCr +
+                ", moneyStatus=" + moneyStatus +
                 ", timeInterval=" + timeInterval +
                 ", fGoodsid=" + fGoodsid +
                 ", delFlag='" + delFlag + '\'' +

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

@@ -137,8 +137,6 @@ public interface ITWarehouseBillsService {
      */
     public int deleteTWarehousebillsById(Long fId);
 
-    String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills);
-
     String getWarehouseOutStockBillsNo(TWarehouseBills tWarehouseBills);
 
     /**

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

@@ -185,8 +185,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 corpsId.add(tWarehousebills.getfFleet());
             }
             corpsId.add(tWarehousebills.getfCorpid());
-            corpsId.add(tWarehousebills.getfCorpid());
-            corpsId.add(tWarehousebills.getfCorpid());
             // 查询制单人
             SysUser logUser = sysUserMapper.selectUserByUserName(tWarehousebills.getCreateBy());
             if (StringUtils.isNotNull(logUser)) {
@@ -2895,7 +2893,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             wbItem.setfPid(fPid);
             wbItem.setfBilltype(billsType);
             wbItem.setfBillno(tWarehouseBills.getfBillno());
-            wbItem.setfBsdate(tWarehouseBills.getfBsdate());
+//            wbItem.setfBsdate(tWarehouseBills.getfBsdate());
             if (StringUtils.isNotNull(wbItem.getfId())) {
                 wbItem.setUpdateBy(loginUser.getUser().getUserName());
                 wbItem.setUpdateTime(new Date());
@@ -3631,12 +3629,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     @Override
-    public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) {
-
-        return null;
-    }
-
-    @Override
     public String getWarehouseOutStockBillsNo(TWarehouseBills tWarehouseBills) {
         return null;
     }
@@ -3725,7 +3717,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
          * 流水号回收
          *  1、 获取所有流水号
          */
-        List<String> SerialNumberList = new ArrayList<>();
+        List<String> serialNumberList = new ArrayList<>();
         if (StringUtils.isNotEmpty(warehousebillsitemsList)) {
             int i = 1;
             for (TWarehousebillsitems wb : warehousebillsitemsList) {
@@ -3733,7 +3725,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if ("1".equals(goods.getIfCntrno()) && StringUtils.isNull(wb.getfCntrno())) {
                     return AjaxResult.error("仓库明细第"+i+"行未找到箱号");
                 }
-                SerialNumberList.add(wb.getfSerialNumber()); // 流水号回收
+                if (StringUtils.isNotNull(wb.getfSerialNumber())) {
+                    serialNumberList.add(wb.getfSerialNumber()); // 流水号回收
+                }
                 // 查询库存总账
                 TWhgenleg tWhgenle = queryTWhgenleg(tWarehousebills, wb, goods.getIfCntrno());
                 if ("SJRKRevoke".equals(billsType)) { // 撤销 入库
@@ -3834,7 +3828,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
              *  2、 流水号去重
              *  3、 添加到 billno_del
              */
-            List<String> serialNumberNewList = delRepeat(SerialNumberList);
+            List<String> serialNumberNewList = delRepeat(serialNumberList);
             serialNumberNewList.forEach(item -> {
                 BillnoDel billnoDel = new BillnoDel();
                 billnoDel.setBillType(item.substring(0, 2));

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -5,31 +5,34 @@
 <mapper namespace="com.ruoyi.approvalFlow.mapper.AuditItemsMapper">
 
     <resultMap type="AuditItems" id="AuditItemsResult">
-        <result property="id" column="id"/>
-        <result property="billNo" column="bill_no"/>
-        <result property="billId" column="bill_id"/>
-        <result property="actId" column="act_id"/>
-        <result property="pathId" column="path_id"/>
-        <result property="levelId" column="level_id"/>
-        <result property="refno1" column="refno1"/>
-        <result property="iffinalItem" column="iffinal_item"/>
-        <result property="refno2" column="refno2"/>
-        <result property="refno3" column="refno3"/>
-        <result property="branchId" column="branch_id"/>
-        <result property="sendUserId" column="send_user_id"/>
-        <result property="sendName" column="send_name"/>
-        <result property="sendTime" column="send_time"/>
-        <result property="sendMsg" column="send_msg"/>
-        <result property="auditUserId" column="audit_user_id"/>
-        <result property="auditItem" column="audit_item"/>
-        <result property="auditOpTime" column="audit_op_time"/>
-        <result property="auditMsg" column="audit_msg"/>
-        <result property="auditStatus" column="audit_status"/>
-        <result property="billTime" column="bill_time"/>
+        <result property="id"    column="id"    />
+        <result property="actId"    column="act_id"    />
+        <result property="billId"    column="bill_id"    />
+        <result property="billNo"    column="bill_no"    />
+        <result property="refno1"    column="refno1"    />
+        <result property="refno2"    column="refno2"    />
+        <result property="refno3"    column="refno3"    />
+        <result property="pathId"    column="path_id"    />
+        <result property="levelId"    column="level_id"    />
+        <result property="iffinalItem"    column="iffinal_item"    />
+        <result property="branchId"    column="branch_id"    />
+        <result property="sendUserId"    column="send_user_id"    />
+        <result property="sendName"    column="send_name"    />
+        <result property="sendTime"    column="send_time"    />
+        <result property="sendMsg"    column="send_msg"    />
+        <result property="auditUserId"    column="audit_user_id"    />
+        <result property="auditItem"    column="audit_item"    />
+        <result property="auditOpTime"    column="audit_op_time"    />
+        <result property="auditMsg"    column="audit_msg"    />
+        <result property="auditStatus"    column="audit_status"    />
+        <result property="billTime"    column="bill_time"    />
+        <result property="fidStatus"    column="fid_status"    />
+        <result property="times"    column="times"    />
     </resultMap>
 
     <sql id="selectAuditItemsVo">
-        select id, bill_no, bill_id, act_id, path_id, level_id, refno1, iffinal_item, refno2, refno3, branch_id, send_user_id, send_name, send_time, send_msg, audit_user_id, audit_item,audit_op_time, audit_msg, audit_status,bill_time from audit_items
+        select id, act_id, bill_id, bill_no, refno1, refno2, refno3, path_id, level_id, iffinal_item, branch_id, send_user_id, send_name,
+         send_time, send_msg, audit_user_id, audit_item, audit_op_time, audit_msg, audit_status, bill_time, fid_status, times from audit_items
     </sql>
 
     <select id="selectAuditItemsList" parameterType="AuditItems" resultMap="AuditItemsResult">
@@ -55,6 +58,8 @@
             <if test="auditMsg != null  and auditMsg != ''">and audit_msg = #{auditMsg}</if>
             <if test="auditStatus != null  and auditStatus != ''">and audit_status = #{auditStatus}</if>
             <if test="billTime != null "> and bill_time = #{billTime},</if>
+            <if test="fidStatus != null  and fidStatus != ''"> and fid_status = #{fidStatus}</if>
+            <if test="times != null "> and times = #{times}</if>
         </where>
     </select>
 
@@ -66,15 +71,15 @@
     <insert id="insertAuditItems" parameterType="AuditItems" useGeneratedKeys="true" keyProperty="id">
         insert into audit_items
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="billNo != null">bill_no,</if>
-            <if test="billId != null">bill_id,</if>
             <if test="actId != null">act_id,</if>
-            <if test="pathId != null">path_id,</if>
-            <if test="levelId != null">level_id,</if>
+            <if test="billId != null">bill_id,</if>
+            <if test="billNo != null">bill_no,</if>
             <if test="refno1 != null">refno1,</if>
-            <if test="iffinalItem != null">iffinal_item,</if>
             <if test="refno2 != null">refno2,</if>
             <if test="refno3 != null">refno3,</if>
+            <if test="pathId != null">path_id,</if>
+            <if test="levelId != null">level_id,</if>
+            <if test="iffinalItem != null">iffinal_item,</if>
             <if test="branchId != null">branch_id,</if>
             <if test="sendUserId != null">send_user_id,</if>
             <if test="sendName != null">send_name,</if>
@@ -82,21 +87,23 @@
             <if test="sendMsg != null">send_msg,</if>
             <if test="auditUserId != null">audit_user_id,</if>
             <if test="auditItem != null">audit_item,</if>
-            <if test="auditOpTime != null ">audit_op_time,</if>
+            <if test="auditOpTime != null">audit_op_time,</if>
             <if test="auditMsg != null">audit_msg,</if>
             <if test="auditStatus != null">audit_status,</if>
-            <if test="billTime != null ">bill_time,</if>
+            <if test="billTime != null">bill_time,</if>
+            <if test="fidStatus != null">fid_status,</if>
+            <if test="times != null">times,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="billNo != null">#{billNo},</if>
-            <if test="billId != null">#{billId},</if>
             <if test="actId != null">#{actId},</if>
-            <if test="pathId != null">#{pathId},</if>
-            <if test="levelId != null">#{levelId},</if>
+            <if test="billId != null">#{billId},</if>
+            <if test="billNo != null">#{billNo},</if>
             <if test="refno1 != null">#{refno1},</if>
-            <if test="iffinalItem != null">#{iffinalItem},</if>
             <if test="refno2 != null">#{refno2},</if>
             <if test="refno3 != null">#{refno3},</if>
+            <if test="pathId != null">#{pathId},</if>
+            <if test="levelId != null">#{levelId},</if>
+            <if test="iffinalItem != null">#{iffinalItem},</if>
             <if test="branchId != null">#{branchId},</if>
             <if test="sendUserId != null">#{sendUserId},</if>
             <if test="sendName != null">#{sendName},</if>
@@ -104,25 +111,27 @@
             <if test="sendMsg != null">#{sendMsg},</if>
             <if test="auditUserId != null">#{auditUserId},</if>
             <if test="auditItem != null">#{auditItem},</if>
-            <if test="auditOpTime != null ">#{auditOpTime},</if>
+            <if test="auditOpTime != null">#{auditOpTime},</if>
             <if test="auditMsg != null">#{auditMsg},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
-            <if test="billTime != null ">#{billTime},</if>
+            <if test="billTime != null">#{billTime},</if>
+            <if test="fidStatus != null">#{fidStatus},</if>
+            <if test="times != null">#{times},</if>
         </trim>
     </insert>
 
     <update id="updateAuditItems" parameterType="AuditItems">
         update audit_items
         <trim prefix="SET" suffixOverrides=",">
-            <if test="billNo != null">bill_no = #{billNo},</if>
-            <if test="billId != null">bill_id = #{billId},</if>
             <if test="actId != null">act_id = #{actId},</if>
-            <if test="pathId != null">path_id = #{pathId},</if>
-            <if test="levelId != null">level_id = #{levelId},</if>
+            <if test="billId != null">bill_id = #{billId},</if>
+            <if test="billNo != null">bill_no = #{billNo},</if>
             <if test="refno1 != null">refno1 = #{refno1},</if>
-            <if test="iffinalItem != null">iffinal_item = #{iffinalItem},</if>
             <if test="refno2 != null">refno2 = #{refno2},</if>
             <if test="refno3 != null">refno3 = #{refno3},</if>
+            <if test="pathId != null">path_id = #{pathId},</if>
+            <if test="levelId != null">level_id = #{levelId},</if>
+            <if test="iffinalItem != null">iffinal_item = #{iffinalItem},</if>
             <if test="branchId != null">branch_id = #{branchId},</if>
             <if test="sendUserId != null">send_user_id = #{sendUserId},</if>
             <if test="sendName != null">send_name = #{sendName},</if>
@@ -130,10 +139,12 @@
             <if test="sendMsg != null">send_msg = #{sendMsg},</if>
             <if test="auditUserId != null">audit_user_id = #{auditUserId},</if>
             <if test="auditItem != null">audit_item = #{auditItem},</if>
-            <if test="auditOpTime != null ">audit_op_time = #{auditOpTime},</if>
+            <if test="auditOpTime != null">audit_op_time = #{auditOpTime},</if>
             <if test="auditMsg != null">audit_msg = #{auditMsg},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
-            <if test="billTime != null ">bill_time = #{billTime},</if>
+            <if test="billTime != null">bill_time = #{billTime},</if>
+            <if test="fidStatus != null">fid_status = #{fidStatus},</if>
+            <if test="times != null">times = #{times},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsUsersMapper.xml

@@ -5,26 +5,30 @@
 <mapper namespace="com.ruoyi.approvalFlow.mapper.AuditItemsUsersMapper">
 
     <resultMap type="AuditItemsUsers" id="AuditItemsUsersResult">
-        <result property="id" column="id"/>
-        <result property="pid" column="pid"/>
-        <result property="billNo" column="bill_no"/>
-        <result property="actId" column="act_id"/>
-        <result property="userId" column="user_id"/>
-        <result property="auditStatus" column="audit_status"/>
+        <result property="id"    column="id"    />
+        <result property="pid"    column="pid"    />
+        <result property="billNo"    column="bill_no"    />
+        <result property="actId"    column="act_id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="auditStatus"    column="audit_status"    />
+        <result property="fidStatus"    column="fid_status"    />
+        <result property="times"    column="times"    />
     </resultMap>
 
     <sql id="selectAuditItemsUsersVo">
-        select id, pid, bill_no, act_id, user_id, audit_status from audit_items_users
+        select id, pid, bill_no, act_id, user_id, audit_status, fid_status, times from audit_items_users
     </sql>
 
     <select id="selectAuditItemsUsersList" parameterType="AuditItemsUsers" resultMap="AuditItemsUsersResult">
         <include refid="selectAuditItemsUsersVo"/>
         <where>
-            <if test="pid != null ">and pid = #{pid}</if>
-            <if test="billNo != null  and billNo != ''">and bill_no = #{billNo}</if>
-            <if test="actId != null ">and act_id = #{actId}</if>
-            <if test="userId != null ">and user_id = #{userId}</if>
-            <if test="auditStatus != null  and auditStatus != ''">and audit_status = #{auditStatus}</if>
+            <if test="pid != null "> and pid = #{pid}</if>
+            <if test="billNo != null  and billNo != ''"> and bill_no = #{billNo}</if>
+            <if test="actId != null "> and act_id = #{actId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
+            <if test="fidStatus != null  and fidStatus != ''"> and fid_status = #{fidStatus}</if>
+            <if test="times != null "> and times = #{times}</if>
         </where>
     </select>
 
@@ -41,6 +45,8 @@
             <if test="actId != null">act_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="auditStatus != null">audit_status,</if>
+            <if test="fidStatus != null">fid_status,</if>
+            <if test="times != null">times,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pid != null">#{pid},</if>
@@ -48,6 +54,8 @@
             <if test="actId != null">#{actId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="auditStatus != null">#{auditStatus},</if>
+            <if test="fidStatus != null">#{fidStatus},</if>
+            <if test="times != null">#{times},</if>
         </trim>
     </insert>
 
@@ -59,6 +67,8 @@
             <if test="actId != null">act_id = #{actId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="fidStatus != null">fid_status = #{fidStatus},</if>
+            <if test="times != null">times = #{times},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -5,90 +5,104 @@
 <mapper namespace="com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper">
 
     <resultMap type="TWarehousebills" id="TWarehousebillsResult">
-        <result property="fId" column="f_id"/>
-        <result property="fBillno" column="f_billno"/>
-        <result property="fCustomsdeclartion" column="f_customsdeclartion"/>
-        <result property="fOriginalbillno" column="f_originalbillno"/>
-        <result property="fDeptid" column="f_deptid"/>
-        <result property="fBsdeptid" column="f_bsdeptid"/>
-        <result property="fContacts" column="f_contacts"/>
-        <result property="fTel" column="f_tel"/>
-        <result property="fCorpid" column="f_corpid"/>
-        <result property="fTocorpid" column="f_tocorpid"/>
-        <result property="fStltypeid" column="f_stltypeid"/>
-        <result property="fBscorpno" column="f_bscorpno"/>
-        <result property="fWarehouseid" column="f_warehouseid"/>
-        <result property="fStorekeeper" column="f_storekeeper"/>
-        <result property="fChargedate" column="f_chargedate"/>
-        <result property="fBsdate" column="f_bsdate"/>
-        <result property="fPlanqty" column="f_planqty"/>
-        <result property="fPlangrossweight" column="f_plangrossweight"/>
-        <result property="fPlannetweight" column="f_plannetweight"/>
-        <result property="fPlanvolumn" column="f_planvolumn"/>
-        <result property="fQty" column="f_qty"/>
-        <result property="fGrossweight" column="f_grossweight"/>
-        <result property="fNetweight" column="f_netweight"/>
-        <result property="fVolumn" column="f_volumn"/>
-        <result property="fBillingway" column="f_billingway"/>
-        <result property="fTrademodeid" column="f_trademodeid"/>
-        <result property="fSbu" column="f_sbu"/>
-        <result property="fFeetunit" column="f_feetunit"/>
-        <result property="fMblno" column="f_mblno"/>
-        <result property="fMarks" column="f_marks"/>
-        <result property="fVslvoy" column="f_vslvoy"/>
-        <result property="fEta" column="f_eta"/>
-        <result property="fCustomno" column="f_customno"/>
-        <result property="fIfweigh" column="f_ifweigh"/>
-        <result property="fIfpledge" column="f_ifpledge"/>
-        <result property="fIfdamage" column="f_ifdamage"/>
-        <result property="fBankcorpid" column="f_bankcorpid"/>
-        <result property="fBilltype" column="f_billtype"/>
-        <result property="fBillstatus" column="f_billstatus"/>
-        <result property="fItemsStatus" column="f_items_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="remark" column="remark"/>
-        <result property="fBillingDeadline" column="f_billing_deadline"/>
-        <result property="fProductName" column="f_product_name"/>
-        <result property="fReviewDate" column="f_review_date"/>
-        <result property="fTruckno" column="f_truckno"/>
-        <result property="fDriverName" column="f_driver_name"/>
-        <result property="fDriverTel" column="f_driver_tel"/>
-        <result property="fDriverIdCar" column="f_driver_id_car"/>
-        <result property="fBusinessType" column="f_business_type"/>
-        <result property="fLabour" column="f_labour"/>
-        <result property="fFleet" column="f_fleet"/>
-        <result property="fInwarehouseid" column="f_inwarehouseid"/>
-        <result property="fBstime" column="f_bstime"/>
-        <result property="fCartype" column="f_cartype"/>
-        <result property="fGoodsid" column="f_goodsid"/>
-        <result property="fNewTrademodeid" column="f_new_trademodeid"/>
-        <result property="fLoadportid" column="f_loadportid"/>
-        <result property="fDestportid" column="f_destportid"/>
-        <result property="fServiceitems" column="f_serviceitems"/>
-        <result property="fInvoceobj" column="f_invoceobj"/>
-        <result property="fSign" column="f_sign"/>
-        <result property="fDetentioncargo" column="f_detentioncargo"/>
-        <result property="fBooksmarks" column="f_booksmarks"/>
-        <result property="fShippername" column="f_shippername"/>
-        <result property="fShipperattn" column="f_shipperattn"/>
-        <result property="fShippertel" column="f_shippertel"/>
-        <result property="fConsigneername" column="f_consigneername"/>
-        <result property="fConsigneeattn" column="f_consigneeattn"/>
-        <result property="fConsigneetel" column="f_consigneetel"/>
-        <result property="fInsurance" column="f_insurance"/>
-        <result property="fInsuranceamt" column="f_insuranceamt"/>
-        <result property="fClosedate" column="f_closedate"/>
-        <result property="fDocmentdate" column="f_docmentdate"/>
-        <result property="fVslid" column="f_vslid"/>
-        <result property="fVoyid" column="f_voyid"/>
-        <result property="fTypeid" column="f_typeid"/>
-        <result property="fPaymode" column="f_paymode"/>
-        <result property="fLaneid" column="f_laneid"/>
-        <result property="fCntval" column="f_cntval"/>
+        <result property="fId"    column="f_id"    />
+        <result property="fBillno"    column="f_billno"    />
+        <result property="fCustomsdeclartion"    column="f_customsdeclartion"    />
+        <result property="fOriginalbillno"    column="f_originalbillno"    />
+        <result property="fDeptid"    column="f_deptid"    />
+        <result property="fBsdeptid"    column="f_bsdeptid"    />
+        <result property="fContacts"    column="f_contacts"    />
+        <result property="fTel"    column="f_tel"    />
+        <result property="fCorpid"    column="f_corpid"    />
+        <result property="fTocorpid"    column="f_tocorpid"    />
+        <result property="fStltypeid"    column="f_stltypeid"    />
+        <result property="fBscorpno"    column="f_bscorpno"    />
+        <result property="fWarehouseid"    column="f_warehouseid"    />
+        <result property="fStorekeeper"    column="f_storekeeper"    />
+        <result property="fChargedate"    column="f_chargedate"    />
+        <result property="fBsdate"    column="f_bsdate"    />
+        <result property="fPlanqty"    column="f_planqty"    />
+        <result property="fPlangrossweight"    column="f_plangrossweight"    />
+        <result property="fPlannetweight"    column="f_plannetweight"    />
+        <result property="fPlanvolumn"    column="f_planvolumn"    />
+        <result property="fQty"    column="f_qty"    />
+        <result property="fGrossweight"    column="f_grossweight"    />
+        <result property="fNetweight"    column="f_netweight"    />
+        <result property="fVolumn"    column="f_volumn"    />
+        <result property="fTrademodeid"    column="f_trademodeid"    />
+        <result property="fBillingway"    column="f_billingway"    />
+        <result property="fSbu"    column="f_sbu"    />
+        <result property="fFeetunit"    column="f_feetunit"    />
+        <result property="fMblno"    column="f_mblno"    />
+        <result property="fVslvoy"    column="f_vslvoy"    />
+        <result property="fEta"    column="f_eta"    />
+        <result property="fMarks"    column="f_marks"    />
+        <result property="fCustomno"    column="f_customno"    />
+        <result property="fIfweigh"    column="f_ifweigh"    />
+        <result property="fIfpledge"    column="f_ifpledge"    />
+        <result property="fIfdamage"    column="f_ifdamage"    />
+        <result property="fBankcorpid"    column="f_bankcorpid"    />
+        <result property="fBilltype"    column="f_billtype"    />
+        <result property="fBillstatus"    column="f_billstatus"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="fItemsStatus"    column="f_items_status"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="fBillingDeadline"    column="f_billing_deadline"    />
+        <result property="fProductName"    column="f_product_name"    />
+        <result property="fReviewDate"    column="f_review_date"    />
+        <result property="fTruckno"    column="f_truckno"    />
+        <result property="fDriverName"    column="f_driver_name"    />
+        <result property="fDriverTel"    column="f_driver_tel"    />
+        <result property="fDriverIdCar"    column="f_driver_id_car"    />
+        <result property="fBusinessType"    column="f_business_type"    />
+        <result property="fLabour"    column="f_labour"    />
+        <result property="fFleet"    column="f_fleet"    />
+        <result property="fInwarehouseid"    column="f_inwarehouseid"    />
+        <result property="fBstime"    column="f_bstime"    />
+        <result property="fCartype"    column="f_cartype"    />
+        <result property="fGoodsid"    column="f_goodsid"    />
+        <result property="fNewTrademodeid"    column="f_new_trademodeid"    />
+        <result property="fLoadportid"    column="f_loadportid"    />
+        <result property="fDestportid"    column="f_destportid"    />
+        <result property="fServiceitems"    column="f_serviceitems"    />
+        <result property="fInvoceobj"    column="f_invoceobj"    />
+        <result property="fSign"    column="f_sign"    />
+        <result property="fDetentioncargo"    column="f_detentioncargo"    />
+        <result property="fBooksmarks"    column="f_booksmarks"    />
+        <result property="fShippername"    column="f_shippername"    />
+        <result property="fShipperattn"    column="f_shipperattn"    />
+        <result property="fShippertel"    column="f_shippertel"    />
+        <result property="fConsigneername"    column="f_consigneername"    />
+        <result property="fConsigneeattn"    column="f_consigneeattn"    />
+        <result property="fConsigneetel"    column="f_consigneetel"    />
+        <result property="fInsurance"    column="f_insurance"    />
+        <result property="fInsuranceamt"    column="f_insuranceamt"    />
+        <result property="fClosedate"    column="f_closedate"    />
+        <result property="fDocmentdate"    column="f_docmentdate"    />
+        <result property="fVslid"    column="f_vslid"    />
+        <result property="fVoyid"    column="f_voyid"    />
+        <result property="fTypeid"    column="f_typeid"    />
+        <result property="fPaymode"    column="f_paymode"    />
+        <result property="fLaneid"    column="f_laneid"    />
+        <result property="fCntval"    column="f_cntval"    />
+        <result property="freeContainerDate"    column="free_container_date"    />
+        <result property="fBusinessAttribution"    column="f_business_attribution"    />
+        <result property="fSupervisionUnit"    column="f_supervision_unit"    />
+        <result property="fDeclarationElements"    column="f_declaration_elements"    />
+        <result property="fPartNumber"    column="f_part_number"    />
+        <result property="fIfinspection"    column="f_ifinspection"    />
+        <result property="fValue"    column="f_value"    />
+        <result property="fWeighingDate"    column="f_weighing_date"    />
+        <result property="fIfsampling"    column="f_ifsampling"    />
+        <result property="sendSampleDate"    column="send_sample_date"    />
+        <result property="fIfweightRecovery"    column="f_ifweight_recovery"    />
+        <result property="weightRecoveryDate"    column="weight_recovery_date"    />
+        <result property="warehouseStatus"    column="warehouse_status"    />
+        <result property="fTimes"    column="f_times"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
@@ -98,8 +112,9 @@
         f_billtype, f_billstatus, f_items_status, del_flag, create_by, create_time, update_by, update_time, remark, f_billing_deadline, f_product_name, f_review_date,
         f_truckno, f_driver_name, f_driver_tel, f_driver_id_car, f_business_type, f_labour, f_fleet, f_inwarehouseid, f_bstime, f_cartype, f_goodsid, f_new_trademodeid,
         f_loadportid, f_destportid, f_serviceitems, f_invoceobj, f_sign, f_detentioncargo, f_booksmarks, f_shippername, f_shipperattn, f_shippertel, f_consigneername,
-        f_consigneeattn, f_consigneetel, f_insurance, f_insuranceamt, f_closedate, f_docmentdate, f_vslid, f_voyid, f_typeid, f_paymode, f_laneid, f_cntval
-        from t_warehousebills
+        f_consigneeattn, f_consigneetel, f_insurance, f_insuranceamt, f_closedate, f_docmentdate, f_vslid, f_voyid, f_typeid, f_paymode, f_laneid, f_cntval,
+        free_container_date, f_business_attribution, f_supervision_unit, f_declaration_elements, f_part_number, f_ifinspection, f_value, f_weighing_date,
+        f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -198,7 +213,8 @@
             bill.f_grossweight AS fGrossweight,
             bill.f_product_name AS fProductName,
             bill.f_billing_deadline AS fBillingDeadline,
-            CASE WHEN bill.f_billstatus = '1' THEN '录入'
+            bill.free_container_date AS freeContainerDate,
+        CASE WHEN bill.f_billstatus = '1' THEN '录入'
             WHEN bill.f_billstatus = '2' THEN '暂存'
             WHEN bill.f_billstatus = '3' THEN '驳回'
             WHEN bill.f_billstatus = '4' THEN '请核'
@@ -291,6 +307,12 @@
             <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
                 and bill.f_bsdate &lt;= #{timeInterval[1]}
             </if>
+            <if test='freeContainerList != null and freeContainerList[0] != null and freeContainerList[0]!= ""'>
+                and bill.free_container_date &gt;= #{freeContainerList[0]}
+            </if>
+            <if test='freeContainerList != null and freeContainerList[1] != null and freeContainerList[1]!= ""'>
+                and bill.free_container_date &lt;= #{freeContainerList[1]}
+            </if>
             <if test="fGoodsid != null  and fGoodsid != ''">and item.f_goodsid = #{fGoodsid}</if>
             <if test="fContacts != null  and fContacts != ''">and bill.f_contacts = #{fContacts}</if>
             <if test="fTel != null  and fTel != ''">and bill.f_tel = #{fTel}</if>
@@ -380,6 +402,7 @@
         bill.f_grossweight AS fGrossweight,
         bill.f_product_name AS fProductName,
         bill.f_billing_deadline AS fBillingDeadline,
+        bill.free_container_date AS freeContainerDate,
         CASE
         WHEN bill.f_billtype = 'HQZY' AND bill.f_billstatus = '1' THEN '录入'
         WHEN bill.f_billtype = 'HQZY' AND bill.f_billstatus = '2' THEN '暂存'
@@ -447,6 +470,12 @@
             <if test='timeInterval != null and timeInterval[1] != null and timeInterval[1]!= ""'>
                 and bill.f_bsdate &lt;= #{timeInterval[1]}
             </if>
+            <if test='freeContainerList != null and freeContainerList[0] != null and freeContainerList[0]!= ""'>
+                and bill.free_container_date &gt;= #{freeContainerList[0]}
+            </if>
+            <if test='freeContainerList != null and freeContainerList[1] != null and freeContainerList[1]!= ""'>
+                and bill.free_container_date &lt;= #{freeContainerList[1]}
+            </if>
             <if test="fGoodsid != null  and fGoodsid != ''">and item.f_goodsid = #{fGoodsid}</if>
             <if test="fContacts != null  and fContacts != ''">and bill.f_contacts = #{fContacts}</if>
             <if test="fTel != null  and fTel != ''">and bill.f_tel = #{fTel}</if>
@@ -757,14 +786,14 @@
             <if test="fGrossweight != null">f_grossweight,</if>
             <if test="fNetweight != null">f_netweight,</if>
             <if test="fVolumn != null">f_volumn,</if>
-            <if test="fBillingway != null">f_billingway,</if>
             <if test="fTrademodeid != null">f_trademodeid,</if>
+            <if test="fBillingway != null">f_billingway,</if>
             <if test="fSbu != null">f_sbu,</if>
             <if test="fFeetunit != null">f_feetunit,</if>
             <if test="fMblno != null">f_mblno,</if>
-            <if test="fMarks != null">f_marks,</if>
             <if test="fVslvoy != null">f_vslvoy,</if>
             <if test="fEta != null">f_eta,</if>
+            <if test="fMarks != null">f_marks,</if>
             <if test="fCustomno != null">f_customno,</if>
             <if test="fIfweigh != null">f_ifweigh,</if>
             <if test="fIfpledge != null">f_ifpledge,</if>
@@ -772,10 +801,10 @@
             <if test="fBankcorpid != null">f_bankcorpid,</if>
             <if test="fBilltype != null">f_billtype,</if>
             <if test="fBillstatus != null">f_billstatus,</if>
-            <if test="fItemsStatus != null">f_items_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="fItemsStatus != null">f_items_status,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="remark != null">remark,</if>
@@ -817,6 +846,20 @@
             <if test="fPaymode != null">f_paymode,</if>
             <if test="fLaneid != null">f_laneid,</if>
             <if test="fCntval != null">f_cntval,</if>
+            <if test="freeContainerDate != null">free_container_date,</if>
+            <if test="fBusinessAttribution != null">f_business_attribution,</if>
+            <if test="fSupervisionUnit != null">f_supervision_unit,</if>
+            <if test="fDeclarationElements != null">f_declaration_elements,</if>
+            <if test="fPartNumber != null">f_part_number,</if>
+            <if test="fIfinspection != null">f_ifinspection,</if>
+            <if test="fValue != null">f_value,</if>
+            <if test="fWeighingDate != null">f_weighing_date,</if>
+            <if test="fIfsampling != null">f_ifsampling,</if>
+            <if test="sendSampleDate != null">send_sample_date,</if>
+            <if test="fIfweightRecovery != null">f_ifweight_recovery,</if>
+            <if test="weightRecoveryDate != null">weight_recovery_date,</if>
+            <if test="warehouseStatus != null">warehouse_status,</if>
+            <if test="fTimes != null">f_times,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -842,14 +885,14 @@
             <if test="fGrossweight != null">#{fGrossweight},</if>
             <if test="fNetweight != null">#{fNetweight},</if>
             <if test="fVolumn != null">#{fVolumn},</if>
-            <if test="fBillingway != null">#{fBillingway},</if>
             <if test="fTrademodeid != null">#{fTrademodeid},</if>
+            <if test="fBillingway != null">#{fBillingway},</if>
             <if test="fSbu != null">#{fSbu},</if>
             <if test="fFeetunit != null">#{fFeetunit},</if>
             <if test="fMblno != null">#{fMblno},</if>
-            <if test="fMarks != null">#{fMarks},</if>
             <if test="fVslvoy != null">#{fVslvoy},</if>
             <if test="fEta != null">#{fEta},</if>
+            <if test="fMarks != null">#{fMarks},</if>
             <if test="fCustomno != null">#{fCustomno},</if>
             <if test="fIfweigh != null">#{fIfweigh},</if>
             <if test="fIfpledge != null">#{fIfpledge},</if>
@@ -857,10 +900,10 @@
             <if test="fBankcorpid != null">#{fBankcorpid},</if>
             <if test="fBilltype != null">#{fBilltype},</if>
             <if test="fBillstatus != null">#{fBillstatus},</if>
-            <if test="fItemsStatus != null">#{fItemsStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="fItemsStatus != null">#{fItemsStatus},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
@@ -902,6 +945,20 @@
             <if test="fPaymode != null">#{fPaymode},</if>
             <if test="fLaneid != null">#{fLaneid},</if>
             <if test="fCntval != null">#{fCntval},</if>
+            <if test="freeContainerDate != null">#{freeContainerDate},</if>
+            <if test="fBusinessAttribution != null">#{fBusinessAttribution},</if>
+            <if test="fSupervisionUnit != null">#{fSupervisionUnit},</if>
+            <if test="fDeclarationElements != null">#{fDeclarationElements},</if>
+            <if test="fPartNumber != null">#{fPartNumber},</if>
+            <if test="fIfinspection != null">#{fIfinspection},</if>
+            <if test="fValue != null">#{fValue},</if>
+            <if test="fWeighingDate != null">#{fWeighingDate},</if>
+            <if test="fIfsampling != null">#{fIfsampling},</if>
+            <if test="sendSampleDate != null">#{sendSampleDate},</if>
+            <if test="fIfweightRecovery != null">#{fIfweightRecovery},</if>
+            <if test="weightRecoveryDate != null">#{weightRecoveryDate},</if>
+            <if test="warehouseStatus != null">#{warehouseStatus},</if>
+            <if test="fTimes != null">#{fTimes},</if>
         </trim>
     </insert>
 
@@ -921,8 +978,8 @@
             <if test="fBscorpno != null">f_bscorpno = #{fBscorpno},</if>
             <if test="fWarehouseid != null">f_warehouseid = #{fWarehouseid},</if>
             <if test="fStorekeeper != null">f_storekeeper = #{fStorekeeper},</if>
-            <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
             <if test="fBsdate != null">f_bsdate = #{fBsdate},</if>
+            <if test="fChargedate != null">f_chargedate = #{fChargedate},</if>
             <if test="fPlanqty != null">f_planqty = #{fPlanqty},</if>
             <if test="fPlangrossweight != null">f_plangrossweight = #{fPlangrossweight},</if>
             <if test="fPlannetweight != null">f_plannetweight = #{fPlannetweight},</if>
@@ -931,14 +988,14 @@
             <if test="fGrossweight != null">f_grossweight = #{fGrossweight},</if>
             <if test="fNetweight != null">f_netweight = #{fNetweight},</if>
             <if test="fVolumn != null">f_volumn = #{fVolumn},</if>
-            <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
             <if test="fTrademodeid != null">f_trademodeid = #{fTrademodeid},</if>
+            <if test="fBillingway != null">f_billingway = #{fBillingway},</if>
             <if test="fSbu != null">f_sbu = #{fSbu},</if>
             <if test="fFeetunit != null">f_feetunit = #{fFeetunit},</if>
             <if test="fMblno != null">f_mblno = #{fMblno},</if>
-            <if test="fMarks != null">f_marks = #{fMarks},</if>
             <if test="fVslvoy != null">f_vslvoy = #{fVslvoy},</if>
             <if test="fEta != null">f_eta = #{fEta},</if>
+            <if test="fMarks != null">f_marks = #{fMarks},</if>
             <if test="fCustomno != null">f_customno = #{fCustomno},</if>
             <if test="fIfweigh != null">f_ifweigh = #{fIfweigh},</if>
             <if test="fIfpledge != null">f_ifpledge = #{fIfpledge},</if>
@@ -946,10 +1003,10 @@
             <if test="fBankcorpid != null">f_bankcorpid = #{fBankcorpid},</if>
             <if test="fBilltype != null">f_billtype = #{fBilltype},</if>
             <if test="fBillstatus != null">f_billstatus = #{fBillstatus},</if>
-            <if test="fItemsStatus != null">f_items_status = #{fItemsStatus},</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="fItemsStatus != null">f_items_status = #{fItemsStatus},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
@@ -991,9 +1048,24 @@
             <if test="fPaymode != null">f_paymode = #{fPaymode},</if>
             <if test="fLaneid != null">f_laneid = #{fLaneid},</if>
             <if test="fCntval != null">f_cntval = #{fCntval},</if>
+            <if test="freeContainerDate != null">free_container_date = #{freeContainerDate},</if>
+            <if test="fBusinessAttribution != null">f_business_attribution = #{fBusinessAttribution},</if>
+            <if test="fSupervisionUnit != null">f_supervision_unit = #{fSupervisionUnit},</if>
+            <if test="fDeclarationElements != null">f_declaration_elements = #{fDeclarationElements},</if>
+            <if test="fPartNumber != null">f_part_number = #{fPartNumber},</if>
+            <if test="fIfinspection != null">f_ifinspection = #{fIfinspection},</if>
+            <if test="fValue != null">f_value = #{fValue},</if>
+            <if test="fWeighingDate != null">f_weighing_date = #{fWeighingDate},</if>
+            <if test="fIfsampling != null">f_ifsampling = #{fIfsampling},</if>
+            <if test="sendSampleDate != null">send_sample_date = #{sendSampleDate},</if>
+            <if test="fIfweightRecovery != null">f_ifweight_recovery = #{fIfweightRecovery},</if>
+            <if test="weightRecoveryDate != null">weight_recovery_date = #{weightRecoveryDate},</if>
+            <if test="warehouseStatus != null">warehouse_status = #{warehouseStatus},</if>
+            <if test="fTimes != null">f_times = #{fTimes},</if>
         </trim>
         where f_id = #{fId}
     </update>
+
     <update id="updateKaHeOrder" parameterType="TWarehousebills">
         update t_warehousebills
         <trim prefix="SET" suffixOverrides=",">
@@ -1081,6 +1153,20 @@
             <if test="fPaymode != null">f_paymode = #{fPaymode},</if>
             <if test="fLaneid != null">f_laneid = #{fLaneid},</if>
             <if test="fTypeid != null">f_typeid = #{fTypeid},</if>
+            <if test="freeContainerDate != null">free_container_date = #{freeContainerDate},</if>
+            <if test="fBusinessAttribution != null">f_business_attribution = #{fBusinessAttribution},</if>
+            <if test="fSupervisionUnit != null">f_supervision_unit = #{fSupervisionUnit},</if>
+            <if test="fDeclarationElements != null">f_declaration_elements = #{fDeclarationElements},</if>
+            <if test="fPartNumber != null">f_part_number = #{fPartNumber},</if>
+            <if test="fIfinspection != null">f_ifinspection = #{fIfinspection},</if>
+            <if test="fValue != null">f_value = #{fValue},</if>
+            <if test="fWeighingDate != null">f_weighing_date = #{fWeighingDate},</if>
+            <if test="fIfsampling != null">f_ifsampling = #{fIfsampling},</if>
+            <if test="sendSampleDate != null">send_sample_date = #{sendSampleDate},</if>
+            <if test="fIfweightRecovery != null">f_ifweight_recovery = #{fIfweightRecovery},</if>
+            <if test="weightRecoveryDate != null">weight_recovery_date = #{weightRecoveryDate},</if>
+            <if test="warehouseStatus != null">warehouse_status = #{warehouseStatus},</if>
+            <if test="fTimes != null">f_times = #{fTimes},</if>
         </trim>
         where f_id = #{fId}
     </update>