2023年7月31日11:31:49

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

@@ -4809,7 +4809,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             } else if (WarehouseTypeEnum.CKDB.getType().equals(billsType) || WarehouseTypeEnum.HWTG.getType().equals(billsType)) { // 调拨查询
                 //校验计费日期是等于库存总帐计费日，如果不相等则报错
                 checkWhgenleg(wbItem, tWhgenle);
-                if (fCharg != 0) {
+                if (fCharg == 0) {
                     wbItem.setfBsdate(tWarehouseBills.getfBsdate());
                 }
                 if (!Objects.equals(wbItem.getfWarehouselocid(), wbItem.getfTransferWarehouselocid())) {

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

@@ -789,6 +789,7 @@
                 LEFT JOIN sys_dict_data dict ON dict.dict_value = wi.f_billingway,
             ( SELECT @ii := 0 ) AS ii
         WHERE w.f_id = #{fId}
+          and w.del_flag = '0'
           AND w.f_typeid IS NULL
           AND dict.status = '0'
           AND dict.dict_type = 'data_unitfees'
@@ -877,6 +878,7 @@
         LEFT JOIN sys_dict_data dictF ON wf.f_billingway = dictF.dict_value
         WHERE w.f_typeid IS NULL
             AND dict.status = '0'
+            and wf.del_flag = '0'
             AND dictF.status = '0'
             AND dictF.dict_type = 'data_unitfees'
             <if test="fId != null and fId!= ''">AND wf.f_pid = #{fId}</if>