Merge remote-tracking branch 'origin/dev' into dev

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

@@ -113,6 +113,10 @@ public class InStock  {
     @Excel(name = "司机身份证")
     private String fDriverIdCar;
 
+    /** 系统编号 */
+    @Excel(name = "系统编号")
+    private String fBillno;
+
     public String getCreateBy() {
         return createBy;
     }
@@ -258,4 +262,12 @@ public class InStock  {
     public void setfNetweight(BigDecimal fNetweight) {
         this.fNetweight = fNetweight;
     }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
 }

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

@@ -118,6 +118,9 @@ public class OutStock  {
     @Excel(name = "费用状态")
     private String fBillstatus;
 
+    /** 系统编号 */
+    @Excel(name = "系统编号")
+    private String fBillno;
 
     public String getCreateBy() {
         return createBy;
@@ -291,4 +294,12 @@ public class OutStock  {
     public void setfNetweight(BigDecimal fNetweight) {
         this.fNetweight = fNetweight;
     }
+
+    public String getfBillno() {
+        return fBillno;
+    }
+
+    public void setfBillno(String fBillno) {
+        this.fBillno = fBillno;
+    }
 }

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

@@ -7366,7 +7366,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
             throw new WarehouseException("未找到费用信息或费用已计算费用");
         }
-        if (isCalculateFees(warehousebillsfees.getfPid())) {
+        if (isCalculateFees(warehousebillsfees.getfId())) {
             return AjaxResult.error("财务已计算费用");
         }
         tWarehousebillsfeesMapper.warehouseFeesFollowUpdateById(id, Long.parseLong(FeesTypeEnum.SAVE.getType()), new Date());
@@ -8111,6 +8111,13 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return tFeeDoList.size() > 0;
     }
 
+    private boolean isCalculateFeesById(Long id) {
+        TFeeDo feeDo = new TFeeDo();
+        feeDo.setfSrcid(id);
+        List<TFeeDo> tFeeDoList = tFeeDoMapper.selectTFeeDoList(feeDo);
+        return tFeeDoList.size() > 0;
+    }
+
     /**
      * 出入库、库存统计
      *

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

@@ -35,6 +35,7 @@
             <if test="fName != null  and fName != ''">and f_name like concat('%', #{fName}, '%')</if>
             <if test="fDesc != null  and fDesc != ''">and f_desc = #{fDesc}</if>
             <if test="fUrl != null  and fUrl != ''">and f_url = #{fUrl}</if>
+            <if test="fType != null  and fType != ''">and f_type = #{fType}</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
         </where>
     </select>
@@ -65,6 +66,7 @@
             <if test="fName != null and fName != ''">f_name,</if>
             <if test="fDesc != null and fDesc != ''">f_desc,</if>
             <if test="fUrl != null and fUrl != ''">f_url,</if>
+            <if test="fType != null and fType != ''">f_type,</if>
             <if test="fStatus != null">f_status,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -80,6 +82,7 @@
             <if test="fName != null and fName != ''">#{fName},</if>
             <if test="fDesc != null and fDesc != ''">#{fDesc},</if>
             <if test="fUrl != null and fUrl != ''">#{fUrl},</if>
+            <if test="fType != null and fType != ''">#{fType},</if>
             <if test="fStatus != null">#{fStatus},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -99,6 +102,7 @@
             <if test="fName != null and fName != ''">f_name = #{fName},</if>
             <if test="fDesc != null and fDesc != ''">f_desc = #{fDesc},</if>
             <if test="fUrl != null and fUrl != ''">f_url = #{fUrl},</if>
+            <if test="fType != null and fType != ''">f_type = #{fType},</if>
             <if test="fStatus != null">f_status = #{fStatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

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

@@ -93,6 +93,7 @@
             resultType="Map">
         SELECT DISTINCT
         agre.f_id AS fId,
+        agre.f_billno AS fBillno,
         corp.f_name AS fCorpid,
         agre.f_contractno AS fContractno,
         goods.f_id AS fGoodsid,

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

@@ -397,7 +397,7 @@
             <if test="fBillingway != null ">and bill.f_billingway = #{fBillingway}</if>
             <if test="fSbu != null ">and bill.f_sbu = #{fSbu}</if>
             <if test="fFeetunit != null  and fFeetunit != ''">and bill.f_feetunit = #{fFeetunit}</if>
-            <if test="fMblno != null  and fMblno != ''">and bill.f_mblno like concat('%', #{fMblno}, '%')</if>
+            <if test="fMblno != null  and fMblno != ''">and item.f_mblno like concat('%', #{fMblno}, '%')</if>
             <if test="fEmblno != null  and fEmblno != ''">and bill.f_emblno like concat('%', #{fEmblno}, '%')</if>
             <if test="fVslvoy != null  and fVslvoy != ''">and bill.f_vslvoy = #{fVslvoy}</if>
             <if test="fEta != null ">and bill.f_eta = #{fEta}</if>