安品财务中心收费付费修改

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -641,16 +641,16 @@ public class TFeeServiceImpl implements ITFeeService {
         Map<String, Object> map = new HashMap<>();
         map.put("tWareHouseFees", tWareHouseFees);
         Map<String,Object> mapMessage = new HashMap<>();
-        if (billsType.equals("DZ")
-                || billsType.equals("SF")
-                || billsType.equals("FF")
-                || billsType.equals("SQFP")
-                || billsType.equals("XXFP")
+        if (billsType.equals("XXFP")
                 || billsType.equals("JXFP")) {
             List<Map<String, Object>> tFeeDo = tFeeMapper.anPinFinanceCenter(map);
             List<Map<String, Object>> tFeeInvice = tFeeMapper.anPinFinanceCenterInVoice(map);
             mapMessage.put("tFeeDo",tFeeDo);
             mapMessage.put("tFeeInvice",tFeeInvice);
+        }else if (billsType.equals("SF")
+                || billsType.equals("FF")){
+            List<Map<String, Object>> tFeeDo = tFeeMapper.anPinFinanceCenter(map);
+            mapMessage.put("tFeeDo",tFeeDo);
         }
         return mapMessage;
     }

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -1879,6 +1879,14 @@
             ifnull( w.f_amount, 0 ) - ifnull( w.f_invamount, 0 ) AS fAmtdr,
             ifnull( w.f_amount, 0 ) - ifnull( w.f_invamount, 0 ) AS fAmt,
         </if>
+        <if test="map.tWareHouseFees.fBilltype != null  and map.tWareHouseFees.fBilltype != '' and map.tWareHouseFees.fBilltype == 'SF'">
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmtdr,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmt,
+        </if>
+        <if test="map.tWareHouseFees.fBilltype != null  and map.tWareHouseFees.fBilltype != '' and map.tWareHouseFees.fBilltype == 'FF'">
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmtdr,
+            ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmt,
+        </if>
         dict.dict_label AS feeUnitName,
         w.f_qty AS fQty,
         w.f_unitprice AS fUnitprice,
@@ -2059,6 +2067,14 @@
                 and ifnull(w.f_amount, 0) - ifnull(w.f_invamount, 0) > 0
                 and t.f_billtype = 'SQ'
             </if>
+            <if test="map.tWareHouseFees.fBilltype != null  and map.tWareHouseFees.fBilltype != '' and map.tWareHouseFees.fBilltype == 'SF'">
+                and ifnull(w.f_amount, 0) - ifnull(w.f_stlamount, 0) > 0
+                and t.f_billtype = 'XS'
+            </if>
+            <if test="map.tWareHouseFees.fBilltype != null  and map.tWareHouseFees.fBilltype != '' and map.tWareHouseFees.fBilltype == 'FF'">
+                and ifnull(w.f_amount, 0) - ifnull(w.f_stlamount, 0) > 0
+                and t.f_billtype = 'SQ'
+            </if>
             <if test="map.tWareHouseFees.fBillstatus != null  and map.tWareHouseFees.fBillstatus != '' and map.tWareHouseFees.fBillstatus == 6 ">
                 and t.f_review_date IS NOT NULL
             </if>