1.修复调拨产生费用单票分析不显示相关费用

2.改动分类监管导出数据账册序号错误命名
3.新增仓储费计算弹框点击客户名称下拉接口，关闭仓储费协议则默认找不到对应客户

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TCorpsController.java

@@ -54,6 +54,11 @@ public class TCorpsController extends BaseController {
         return getDataTable(list);
     }
 
+    @GetMapping("/agreementCorpListNoParams")
+    public AjaxResult agreementCorpList() {
+        return tCorpsService.selectAgreementCorpListNoParams();
+    }
+
     /**
      * 车队使用，查询客户、司机信息
      */

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

@@ -19,6 +19,7 @@ import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.excel.StorageDetail;
 import com.ruoyi.warehouseBusiness.excel.StorageFee;
+import com.ruoyi.warehouseBusiness.service.ITWarehouseAgreementService;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -41,7 +42,7 @@ public class TStorageFeeCalculationController extends BaseController {
 
 
     /**
-     * 查询入库详情主表列表
+     * 查询仓储费主表列表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:list')")
     @DataScope(deptAlias = "d", userAlias = "u")
@@ -82,7 +83,7 @@ public class TStorageFeeCalculationController extends BaseController {
     }
 
     /**
-     * 获取入库仓库详细信息
+     * 根据 id 获取仓储费计算明细
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:query')")
     @GetMapping(value = "/{fId}")
@@ -90,8 +91,19 @@ public class TStorageFeeCalculationController extends BaseController {
         return itWarehouseBillsService.selectStorageFeeById(fId);
     }
 
+    @Autowired
+    private ITWarehouseAgreementService itWarehouseAgreementService;
     /**
-     * 新增库存费计算
+     * 根据 corpID 获取对应的费用协议数据
+     */
+    @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:query')")
+    @GetMapping(value = "/agreement/{fCorpId}")
+    public AjaxResult getAgreementData(@PathVariable("fCorpId") Long fCorpId) {
+        return itWarehouseAgreementService.selectTWarehouseAgreementByCorpsId(fCorpId);
+    }
+
+    /**
+     * 仓储费计算提交以及暂存
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
@@ -109,7 +121,7 @@ public class TStorageFeeCalculationController extends BaseController {
         return itWarehouseBillsService.insertStorageFee(warehouseBills, warehouseItems, warehouseFees, loginUser, billsType);
     }
     /**
-     * 新增库存费批量计算
+     * 仓储费计算list提交以及暂存
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
@@ -124,7 +136,7 @@ public class TStorageFeeCalculationController extends BaseController {
     }
 
     /**
-     * 库存费计算
+     * 计算仓储费
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
@@ -137,7 +149,7 @@ public class TStorageFeeCalculationController extends BaseController {
         return itWarehouseBillsService.calculateStorageFees(tWarehouseBills, loginUser, billsType);
     }
     /**
-     * 出库库存费批量计算
+     * 仓储费批量计算
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:add')")
     @Log(title = "详情主表", businessType = BusinessType.INSERT)
@@ -154,7 +166,7 @@ public class TStorageFeeCalculationController extends BaseController {
     }
 
     /**
-     * 删除入库详情主表
+     * 批量删除详情主表
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:storageFeeCalculation:remove')")
     @Log(title = "详情主表", businessType = BusinessType.DELETE)
@@ -171,7 +183,7 @@ public class TStorageFeeCalculationController extends BaseController {
     }
 
     /**
-     * 导出入库详情主表列表
+     * 导出计算仓储费
      */
     @GetMapping("/exportItems/{fId}")
     public AjaxResult exportItems(@PathVariable("fId") Long fId) {
@@ -181,7 +193,7 @@ public class TStorageFeeCalculationController extends BaseController {
     }
 
     /**
-     * 导出仓储详情
+     * 导出仓储费明细
      */
     @GetMapping("/exportDetail/{fId}")
     public AjaxResult exportDetail(@PathVariable("fId") Long fId) {

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TCorpsMapper.java

@@ -39,6 +39,8 @@ public interface TCorpsMapper extends BaseMapper<TCorps> {
      */
     List<Map<String,Object>> selectAgreementCorpList(TCorps tCorps);
 
+    List<Map<String,Object>> selectAgreementCorpListNoData();
+
     /**
      * 新增客户详情
      *

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITCorpsService.java

@@ -36,6 +36,8 @@ public interface ITCorpsService {
      */
     List<Map<String,Object>> selectAgreementCorpList(TCorps tCorps);
 
+    AjaxResult selectAgreementCorpListNoParams();
+
     /**
      * 新增客户详情
      *

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TCorpsServiceImpl.java

@@ -107,6 +107,13 @@ public class TCorpsServiceImpl implements ITCorpsService {
         return tCorpsMapper.selectAgreementCorpList(tCorps);
     }
 
+    @Override
+    public AjaxResult selectAgreementCorpListNoParams() {
+        Map<String,Object> map = new HashMap<>();
+        map.put("corpList",tCorpsMapper.selectAgreementCorpListNoData());
+        return AjaxResult.success(map);
+    }
+
     /**
      *  车队使用，查询客户、司机信息、车队信息
      * @param fId

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/domain/SingleAnalysisExcel.java

@@ -23,6 +23,9 @@ public class SingleAnalysisExcel {
     @Excel(name = "品名")
     private String goodsName;
 
+    /** 出口单号 */
+    private String fEmblno;
+
     /** 货物属性 */
     @Excel(name = "货物属性")
     private String fBusinessTypes;
@@ -96,6 +99,14 @@ public class SingleAnalysisExcel {
     /** 日期区间 */
     private List<String> bsdateList;
 
+    public String getfEmblno() {
+        return fEmblno;
+    }
+
+    public void setfEmblno(String fEmblno) {
+        this.fEmblno = fEmblno;
+    }
+
     public String getfBusinessTypes() {
         return fBusinessTypes;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -122,9 +122,9 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
                 if ("保税".equals(map.get("fGoodsType"))) {
                     String strEmsSeqNo;
                     if (StringUtils.isNull(map.get("fEmsSeqNo"))) {
-                        strEmsSeqNo = "        <EmsNo></EmsNo>\n" ;
+                        strEmsSeqNo = "        <EmsSeqNo></EmsSeqNo>\n" ;
                     } else {
-                        strEmsSeqNo = "        <EmsNo>"+ map.get("fEmsNo") +"</EmsNo>\n" ;
+                        strEmsSeqNo = "        <EmsSeqNo>"+ map.get("fEmsSeqNo") +"</EmsSeqNo>\n" ;
                     }
                     String str = "      <StockInfo>\n" +
                             "        <EmsNo>"+ map.get("fEmsNo") +"</EmsNo>\n" +

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

@@ -53,6 +53,17 @@ public class TWarehousebillsfees extends BaseEntity {
     @Excel(name = "发货方")
     private String fShipper;
 
+    /** 出口单号 */
+    private String fEmblno;
+
+    public String getfEmblno() {
+        return fEmblno;
+    }
+
+    public void setfEmblno(String fEmblno) {
+        this.fEmblno = fEmblno;
+    }
+
     public String getfShipper() {
         return fShipper;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/excel/QueryMenu.java

@@ -180,6 +180,17 @@ public class QueryMenu {
     @Excel(name = "发货方")
     private String fShipper;
 
+    /** 出口单号 */
+    private String fEmblno;
+
+    public String getfEmblno() {
+        return fEmblno;
+    }
+
+    public void setfEmblno(String fEmblno) {
+        this.fEmblno = fEmblno;
+    }
+
     public Date getfOriginalbilldate() {
         return fOriginalbilldate;
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseAgreementMapper.java

@@ -25,6 +25,8 @@ public interface TWarehouseAgreementMapper {
      */
     public TWarehouseAgreement selectTWarehouseAgreementById(Long fId);
 
+    public List<Map<String,Object>> selectTWarehouseAgreementByCorpsId(Long fCorpId);
+
     /**
      * 查询仓储费列表
      *

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

@@ -24,6 +24,8 @@ public interface ITWarehouseAgreementService {
     public TWarehouseAgreement selectTWarehouseAgreementById(Long fId);
 
     public Map<String, Object> selectTWarehouseAgreementById1(Long fId);
+
+    public AjaxResult selectTWarehouseAgreementByCorpsId(Long fCorpId);
     /**
      * 查询仓储费列表
      *

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

@@ -153,6 +153,17 @@ public class TWarehouseAgreementServiceImpl implements ITWarehouseAgreementServi
         return map;
     }
 
+    @Override
+    public AjaxResult selectTWarehouseAgreementByCorpsId(Long fCorpId) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String,Object>> list = tWarehouseAgreementMapper.selectTWarehouseAgreementByCorpsId(fCorpId);
+        for (Map<String,Object> mp : list) {
+            mp.put("tPackages",StringUtils.stringArrayDQMToInt((String) mp.get("tPackages")));
+        }
+        map.put("contractnoList",list);
+        return AjaxResult.success(map);
+    }
+
 
     /**
      * 查询仓储费列表

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -144,9 +144,22 @@
             t_warehouse_agreement agre
             LEFT JOIN t_corps corp ON corp.f_id = agre.f_corpid
         <where>
+            agre.f_status = '0'
             <if test="fName != null  and fName != ''"> and corp.f_name like concat('%', #{fName}, '%')</if>
         </where>
-        GROUP BY corp.f_id
+        GROUP BY corp.f_name
+    </select>
+
+    <select id="selectAgreementCorpListNoData" parameterType="TCorps" resultType="map">
+        select
+        corp.f_id AS fId,
+        corp.f_name AS fName
+        FROM
+        t_warehouse_agreement agre
+        LEFT JOIN t_corps corp ON corp.f_id = agre.f_corpid
+        where
+        agre.f_status = '0'
+        GROUP BY corp.f_name
     </select>
 
     <select id="selectTCorpsById" parameterType="Long" resultMap="TCorpsResult">

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

@@ -230,6 +230,29 @@
         where f_id = #{fId}
     </select>
 
+    <select id="selectTWarehouseAgreementByCorpsId" parameterType="TWarehouseAgreement" resultType="map">
+        SELECT DISTINCT
+            agre.f_id AS fId,
+            agre.f_billno AS fBillno,
+            corp.f_name AS fName,
+            agre.f_contractno AS fContractno,
+            agre.t_packages AS tPackages,
+            agre.f_begindate AS fBegindate,
+            agre.f_enddate AS fEnddate,
+            agre.f_feetypeid AS fFeetypeid,
+            agre.f_billstatus AS fBillstatus,
+            agre.f_status AS fStatus,
+            agre.f_task_type AS fTaskType,
+            agre.f_dc AS fDc,
+            agre.f_billtype_name AS fBilltypeName
+        FROM
+            t_warehouse_agreement agre
+                LEFT JOIN t_corps corp ON corp.f_id = agre.f_corpid
+        <where>
+            <if test="fCorpId != null  and fCorpId != ''">and corp.f_id = #{fCorpId}</if>
+        </where>
+    </select>
+
     <insert id="insertTWarehouseAgreement" parameterType="TWarehouseAgreement" useGeneratedKeys="true"
             keyProperty="fId">
         insert into t_warehouse_agreement

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

@@ -2834,6 +2834,7 @@
             c.f_name corpName,
             #{fMblno} fMblno,
             w.f_product_name goodsName,
+            w.f_emblno fEmblno,
             d.dict_label fBusinessType,
             w.f_cntval fCntval,
             ware.f_warehouse_information fWName,
@@ -2884,7 +2885,7 @@
             dict.dict_type = 'storage_type' AND
             w.f_corpid = #{fCorpid}
             AND item.f_mblno = #{fMblno}
-            AND IF(item.f_billtype = 'CKDB' and ware.f_charg = 0, w.f_id = '', w.f_id != '')
+            AND IF(item.f_billtype = 'CKDB' and ware.f_charg = 0, w.f_id != '', w.f_id != '')
             AND IF( item.f_billtype = 'SJRK', d.dict_type = 'st_in_type', IF(item.f_billtype = 'SJCK', d.dict_type = 'st_out_type', d.dict_type = 'st_trans_type'))
             <if test='bsdateList != null and bsdateList[0] != null and bsdateList[0]!= ""'>
                 AND item.f_bsdate &gt;= #{bsdateList[0]}
@@ -2892,6 +2893,9 @@
             <if test='bsdateList != null and bsdateList[1] != null and bsdateList[1]!= ""'>
                 AND item.f_bsdate &lt;= #{bsdateList[1]}
             </if>
+            <if test="fEmblno != null  and fEmblno != ''">
+                and w.f_emblno like concat('%', #{fEmblno}, '%')
+            </if>
         order by item.f_bsdate asc
     </select>
 
@@ -2921,7 +2925,7 @@
             LEFT JOIN sys_dict_data d ON d.dict_value = f.f_business_type
         WHERE
             item.f_mblno = #{fMblno}
-            AND IF(item.f_billtype = 'CKDB' and ware.f_charg = 0, w.f_id = '', w.f_id != '')
+            AND IF(item.f_billtype = 'CKDB' and ware.f_charg = 0, w.f_id != '', w.f_id != '')
             AND IF( item.f_billtype = 'SJRK', d.dict_type = 'st_in_type', IF(item.f_billtype = 'SJCK', d.dict_type = 'st_out_type', d.dict_type = 'st_trans_type'))
             <if test='bsdateList != null and bsdateList[0] != null and bsdateList[0]!= ""'>
                 AND item.f_bsdate &gt;= #{bsdateList[0]}

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

@@ -938,6 +938,7 @@
         tf.f_amount AS fAmount,
         tf.f_stlamount_no AS fStlamountNo,
         tw.f_shipper AS fShipper,
+        tw.f_emblno AS fEmblno,
         tf.f_stlamount AS fStlamount,
         tf.f_stlamount_date AS fStlamountDate,
         tf.f_invamount AS fInvamount,
@@ -982,6 +983,7 @@
             <if test="fInvnosStatus == 2">and tf.f_invnos is null</if>
             <if test="fCorpid != null  and fCorpid != ''">and tf.f_corpid = #{fCorpid}</if>
             <if test="fShipper != null  and fShipper != ''">and tw.f_shipper like concat('%',#{fShipper},'%')</if>
+            <if test="fEmblno != null  and fEmblno != ''">and tw.f_emblno like concat('%',#{fEmblno},'%')</if>
             <if test="fStltypeid != null">and tf.f_stltypeid = #{fStltypeid}</if>
             <if test="fSrcBillno != null">and tf.src_bill_no = #{fSrcBillno}</if>
             <if test='fFeeids != null'>