update bug

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

@@ -385,18 +385,10 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                                 if (tWarehousebillsitemsMapper.selectIsCalculateStorageFeesByIds(ids) > 0) {
                                     throw new WarehouseException("计算费用中存在已计算仓储费信息");
                                 }
+                                // 查出主表数据
+                                TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(auditItems.getBillId());
                                 for (TWarehousebillsfees fees : feesList) {
-                                    // 如果是库存总帐
-                                    if (WarehouseTypeEnum.KCZZ.getType().equals(fees.getfBilltype())) {
-                                        TWhgenleg whgenleg = new TWhgenleg();
-                                        whgenleg.setfId(fees.getSrcId());
-                                        whgenleg.setfChargedate(DateUtils.dateAdd(fees.getfBillingDeadline(), 1));
-                                        tWhgenlegMapper.updateTWhgenleg(whgenleg);
-                                    } else {
-                                        TWarehousebillsitems billsItem = new TWarehousebillsitems();
-                                        storageFeeUpdateItem(fees, billsItem);
-                                        tWarehousebillsitemsMapper.updateTWarehousebillsitems(billsItem);
-                                    }
+                                    storageFeeUpdateItem(warehouseBills, fees);
                                 }
                             }
                         }
@@ -680,18 +672,46 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
     /**
      * 计算仓储费计算更新出库货转信息
      *
-     * @param fees      仓储费信息
-     * @param billsItem 仓储费明细信息
+     * @param warehouseBills 主表信息
+     * @param fees           仓储费信息
      */
-    private void storageFeeUpdateItem(TWarehousebillsfees fees, TWarehousebillsitems billsItem) {
-        billsItem.setfId(fees.getSrcId());
-        billsItem.setfChargedate(DateUtils.dateAdd(fees.getfBillingDeadline(), 1));
-        if ("SJCK".equals(fees.getfBilltype())) {
-            billsItem.setfStorageFeeDeadline(fees.getfBillingDeadline());
+    private void storageFeeUpdateItem(TWarehouseBills warehouseBills, TWarehousebillsfees fees) {
+        Date chargeDate = DateUtils.addDays(fees.getfBillingDeadline(), 1);
+        // 如果是库存总帐
+        if (WarehouseTypeEnum.KCZZ.getType().equals(fees.getfBilltype())) {
+            TWhgenleg whgenleg = new TWhgenleg();
+            whgenleg.setfId(fees.getSrcId());
+            whgenleg.setfChargedate(chargeDate);
+            tWhgenlegMapper.updateTWhgenleg(whgenleg);
             // 如果计算之前信息
-            if (!fees.getfBillingDeadline().after(new Date())) {
+            if (!fees.getfBillingDeadline().after(warehouseBills.getUpdateTime())) {
+                // 查询时间区间内的仓储业务明细信息
+                List<String> timeList = new ArrayList<>();
+                timeList.add(DateUtils.dateToString(DateUtils.dateConversionMin(fees.getfBillingDeadline())));
+                timeList.add(DateUtils.dateToString(DateUtils.dateConversionMax(warehouseBills.getUpdateTime())));
+                warehouseBills.setItemBsDateList(timeList);
+                List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectListByCorpId(warehouseBills);
+                // 过滤出出库、货转，更新对应仓储费计费日期
+                List<TWarehousebillsitems> itemList = warehousebillsitemsList.stream().filter(li ->
+                        li.getfBilltype().equals(WarehouseTypeEnum.SJCK.getType()) ||
+                                li.getfBilltype().equals(WarehouseTypeEnum.HQZY.getType())).collect(toList());
+                if (CollectionUtils.isNotEmpty(itemList)) {
+                    itemList.forEach(li -> {
+                        li.setfChargedate(chargeDate);
+                        li.setUpdateTime(new Date());
+                        tWarehousebillsitemsMapper.updateTWarehousebillsitems(li);
+                    });
+                }
+            }
+        } else {
+            TWarehousebillsitems billsItem = new TWarehousebillsitems();
+            billsItem.setfId(fees.getSrcId());
+            billsItem.setfChargedate(chargeDate);
+            if ("SJCK".equals(fees.getfBilltype())) {
+                billsItem.setfStorageFeeDeadline(fees.getfBillingDeadline());
                 billsItem.setIsCalculateStorageFees(WarehouseTypeEnum.CALCULATE.getType());
             }
+            tWarehousebillsitemsMapper.updateTWarehousebillsitems(billsItem);
         }
     }
 
@@ -715,6 +735,9 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             tWarehousebillsfeesMapper.warehouseFeesFollowUpdate(auditItems.getBillId(), fettle, auditItems.getAuditItem());
             if (Objects.equals(auditItems.getActId(), 150L)) {
                 List<TWarehousebillsfees> feesList = tWarehousebillsfeesMapper.selectWarehousebillsfeesByPId(auditItems.getBillId());
+                // 查询仓储费计算主表
+                TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(auditItems.getBillId());
+
                 for (TWarehousebillsfees wareItem : feesList) {
                     if (StringUtils.isNull(wareItem.getSrcId())) {
                         continue;
@@ -723,11 +746,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                         TWhgenleg whgenleg = new TWhgenleg();
                         whgenleg.setfId(wareItem.getSrcId());
                         whgenleg.setfChargedate(wareItem.getfChargedate());
-                        int i = tWhgenlegMapper.updateTWhgenleg(whgenleg);
-                        if (i <= 0) {
-                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                            return AjaxResult.error("更新库存费用状态失败，请联系管理员");
-                        }
+                        tWhgenlegMapper.updateTWhgenleg(whgenleg);
                     } else {
                         TWarehousebillsitems billsItem = new TWarehousebillsitems();
                         billsItem.setfId(wareItem.getSrcId());
@@ -736,10 +755,7 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
                             billsItem.setfChargedate(wareItem.getfBillingDeadline());
                             tWarehousebillsitemsMapper.updateTWarehousebillsitems(billsItem);
                         } else {
-                            // 如果计算之前信息
-                            if (!wareItem.getfBillingDeadline().after(new Date())) {
-                                billsItem.setIsCalculateStorageFees(WarehouseTypeEnum.NOT_CALCULATE.getType());
-                            }
+                            billsItem.setIsCalculateStorageFees(WarehouseTypeEnum.NOT_CALCULATE.getType());
                             billsItem.setfChargedate(wareItem.getfChargedate());
                         }
                         tWarehousebillsitemsMapper.agreementApprovalRejected(billsItem);

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

@@ -167,6 +167,19 @@ public interface ITWarehouseBillsService {
                                           String warehousebillsfeesCr, String warehousebillsfeesDr,
                                           LoginUser loginUser, String tCntr, String billsType);
 
+    /**
+     * 入库确认
+     *
+     * @param warehouseBills
+     * @param warehousebillsitems
+     * @param tEnclosure
+     * @param warehousebillsfeesCr
+     * @param warehousebillsfeesDr
+     * @param loginUser
+     * @param tCntr
+     * @param billsType
+     * @return
+     */
     AjaxResult addCredit(String warehouseBills, String warehousebillsitems, String tEnclosure, String warehousebillsfeesCr,
                          String warehousebillsfeesDr, LoginUser loginUser, String tCntr, String billsType);
 

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

@@ -514,7 +514,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (StringUtils.isNotEmpty(warehousebillsitems.getfLocalcntrno())) {
             tWhgenleg.setfLocalcntrno(warehousebillsitems.getfLocalcntrno());
         }
-        if (WarehouseTypeEnum.HQZY.getType().equals(warehouseBills.getfBilltype())) {
+        if (WarehouseTypeEnum.HQZY.getType().equals(warehouseBills.getfBilltype()) || WarehouseTypeEnum.CKDB.getType().equals(warehouseBills.getfBilltype())) {
             // 仓储计费日期
             tWhgenleg.setfChargedate(warehousebillsitems.getfBsdate());
         } else {
@@ -3324,6 +3324,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
         int i = 1;
         for (TWarehousebillsitems item : warehousebillsitemsList) {
+            // 如果业务时间超出当前时间则不允许
+            if (item.getfBsdate().after(new Date())) {
+                throw new WarehouseException("业务日期不得超出当前日期");
+            }
             // 查询是否可以修改
             TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(item.getfId());
             if (tWarehousebillsitems.getfBillstatus() == 40) {
@@ -3364,11 +3368,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     }
                 }
                 if (StringUtils.isNotNull(tWhgenle)) {
-                    int i1 = updateTWhgenlegData(item, tWhgenle.getfId(), billsType);
-                    if (i1 <= 0) {
-                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return AjaxResult.error("更新库存总账失败");
-                    }
+                    updateTWhgenlegData(item, tWhgenle.getfId(), billsType);
                 } else {
                     if (instalTWhgenleg(tWarehouseBills, item, loginUser.getUser()) <= 0) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -3601,6 +3601,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         List<TFees> feesList = new ArrayList<>();
         List<TWarehousebillsfees> warehousebillsfees = new ArrayList<>();
         for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
+            // 如果业务时间超出当前时间则不允许
+            if (wbItem.getfBsdate().after(new Date())) {
+                throw new WarehouseException("业务日期不得超出当前日期");
+            }
             // 查询是否可以修改
             TWarehousebillsitems tWarehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(wbItem.getfId());
             if (tWarehousebillsitems.getfBillstatus() == 40) {
@@ -3630,6 +3634,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + i + "行库存为空");
                 } else { // 非空修改库存总账
+                    //校验计费日期是等于库存总帐计费日，如果不相等则报错
+                    checkWhgenleg(tWarehouseBills, tWhgenle);
                     //  库存 <  出库件数
                     if (tWhgenle.getfQtyblc() < wbItem.getfQty()) {
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -3644,35 +3650,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     if (StringUtils.isNull(tWarehouseBills.getfCorpid())) {
                         return AjaxResult.error("库存明细第" + i + "行请检查客户信息，操作终止");
                     }
-                    /*long fCorpid = tWarehouseBills.getfCorpid();
-                    TGoods tGoods = tGoodsMapper.selectTGoodsById(wbItem.getfGoodsid());
-                    long fGoodsid = tGoods.getfTypeid();
-                    long fBillingway = wbItem.getfBillingway();
-                    long fQty = wbItem.getfQty();
-                    // 计算仓储费明细
-                    Map<String, Object> objectMap = tWarehouseAgreementService.getCarryingCost(fCorpid, fGoodsid, dateDay, fBillingway, fQty , 0L);
-                    if (StringUtils.isNull(objectMap)) {
-                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return AjaxResult.error("库存明细第" + i + "行没有维护出库明细的仓储协议，操作终止");
-                    }
-                    Long feeId = (Long) objectMap.get("feeId");
-                    BigDecimal amt = (BigDecimal) objectMap.get("amt");
-                    TFees tFees = tFeesMapper.selectTFeesById(feeId);
-                    if (StringUtils.isNotNull(tFees)) {
-                        feesList.add(tFees);
-                    }
-                    TWarehousebillsfees fees = new TWarehousebillsfees();
-                    fees.setfPid(fPid);
-                    fees.setfFeeid(feeId);
-                    fees.setfCorpid(tWarehouseBills.getfCorpid());
-                    fees.setfFeeUnitid(fBillingway);
-                    fees.setfQty(new BigDecimal(1));
-                    fees.setfUnitprice(amt);
-                    fees.setfAmount(amt);
-                    fees.setfExrate(new BigDecimal(1));
-                    fees.setfCurrency("RMB");
-                    fees.setRemark(dateDay + "天" + tFees.getfName());
-                    warehousebillsfees.add(fees);*/
                 }
                 wbItem.setfBillstatus(40L);
             } else if (WarehouseTypeEnum.CKDB.getType().equals(billsType) || WarehouseTypeEnum.HWTG.getType().equals(billsType)) { // 调拨查询
@@ -3680,6 +3657,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + i + "行库存为空");
                 } else { // 非空修改库存总账
+                    //校验计费日期是等于库存总帐计费日，如果不相等则报错
+                    checkWhgenleg(tWarehouseBills, tWhgenle);
                     if (tWhgenle.getfQtyblc() < wbItem.getfQty()) {  //  1、  库存 <  调拨件数  提示库存不足
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("库存明细第" + i + "行库存不足");
@@ -3708,6 +3687,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("库存明细第" + i + "行库存为空");
                 } else { // 非空修改库存总账
+                    //校验计费日期是等于库存总帐计费日，如果不相等则报错
+                    checkWhgenleg(tWarehouseBills, tWhgenle);
                     if (tWhgenle.getfQtyblc() < wbItem.getfQty()) {  //  1、  库存 <  调拨件数  提示库存不足
                         TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                         return AjaxResult.error("库存明细第" + i + "行库存不足");
@@ -3820,6 +3801,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success("成功", map);
     }
 
+    /**
+     * 校验计费日期是等于库存总帐计费日，如果不相等则报错
+     *
+     * @param wbItem
+     * @param tWhgenle
+     */
+    private void checkWhgenleg(TWarehouseBills wbItem, TWhgenleg tWhgenle) {
+        // 如果仓储费计费日期超出 库存总帐的计费日期不相等则报异常
+        if (wbItem.getfChargedate().before(tWhgenle.getfChargedate())) {
+            throw new WarehouseException("仓储费计费日期与库存总帐计费日期不相符");
+        }
+    }
 
     /**
      * 打印作业单
@@ -4034,7 +4027,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 storageFeesDto.setStartTime(fBsdate);
                 storageFeesDto.setEndTime((Date) item.get("fOriginalbilldate"));
             } else {
-                storageFeesDto.setStartTime((Date) item.get("fOriginalbilldate"));
+                storageFeesDto.setStartTime((Date) item.get("fChargedate"));
+//                storageFeesDto.setStartTime((Date) item.get("fOriginalbilldate"));
                 storageFeesDto.setEndTime(warehouseBills.getfBillingDeadline());
                 fInventoryDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fOriginalbilldate"));
                 fBillingDays = DateUtils.getDateDay(warehouseBills.getfBillingDeadline(), (Date) item.get("fChargedate"));
@@ -4088,12 +4082,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             fees.setfProductName(item.get("fGoodsids").toString());
             if (WarehouseTypeEnum.SJCK.getType().equals(fBilltype) ||
                     WarehouseTypeEnum.HQZY.getType().equals(fBilltype)) {
-                fees.setfChargedate((Date) item.get("fOriginalbilldate"));
                 fees.setfBillingDeadline(fBsdate);
             } else {
-                fees.setfChargedate((Date) item.get("fChargedate"));
                 fees.setfBillingDeadline(warehouseBills.getfBillingDeadline());
             }
+            fees.setfChargedate((Date) item.get("fChargedate"));
             fees.setfTaxrate(new BigDecimal(taxRate.get(0).getDictValue()));
             fees.setfOriginalbilldate((Date) item.get("fOriginalbilldate"));
 
@@ -4598,7 +4591,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         JSONArray warehouseJSON = JSONArray.parseArray(warehouseItems);
         List<TWarehousebillsfees> itemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsfees.class);
         for (TWarehousebillsfees item : itemsList) {
-            item.setfId(null);
             item.setSrcBillNo(tWarehousebills.getfBillno());
             item.setfPid(fPid);
             item.setfBillstatus(tWarehousebills.getfBillstatus());
@@ -4608,7 +4600,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray feesJSON = JSON.parseArray(warehouseFees);
             List<TWarehousebillsfees> warehousebillsfeesList = JSON.parseArray(feesJSON.toJSONString(), TWarehousebillsfees.class);
             for (TWarehousebillsfees fees : warehousebillsfeesList) {
-                fees.setfId(null);
                 fees.setfPid(fPid);
                 fees.setfDc("D");
                 fees.setfBilltype(WarehouseTypeEnum.JSCCF.getType());
@@ -4998,10 +4989,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                     TWhgenleg whgenleg = new TWhgenleg();
                     whgenleg.setfId(wareItem.getSrcId());
                     whgenleg.setfChargedate(wareItem.getfChargedate());
-                    int i = tWhgenlegMapper.updateTWhgenleg(whgenleg);
-                    if (i <= 0) {
-                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                        return AjaxResult.error("更新库存费用状态失败，请联系管理员");
+                    tWhgenlegMapper.updateTWhgenleg(whgenleg);
+                    // 如果计算之前信息
+                    if (!wareItem.getfBillingDeadline().after(tWarehousebills.getUpdateTime())) {
+                        // 查询时间区间内的仓储业务明细信息
+                        List<String> timeList = new ArrayList<>();
+                        timeList.add(DateUtils.dateToString(DateUtils.dateConversionMin(wareItem.getfBillingDeadline())));
+                        timeList.add(DateUtils.dateToString(DateUtils.dateConversionMax(tWarehousebills.getUpdateTime())));
+                        tWarehousebills.setItemBsDateList(timeList);
+                        List<TWarehousebillsitems> warehousebillsitemsList = tWarehousebillsitemsMapper.selectListByCorpId(tWarehousebills);
+                        // 过滤出出库、货转，更新对应仓储费计费日期
+                        List<TWarehousebillsitems> itemList = warehousebillsitemsList.stream().filter(li ->
+                                li.getfBilltype().equals(WarehouseTypeEnum.SJCK.getType()) ||
+                                        li.getfBilltype().equals(WarehouseTypeEnum.HQZY.getType())).collect(toList());
+                        if (CollectionUtils.isNotEmpty(itemList)) {
+                            itemList.forEach(li -> {
+                                li.setfChargedate(wareItem.getfChargedate());
+                                li.setUpdateTime(new Date());
+                                tWarehousebillsitemsMapper.updateTWarehousebillsitems(li);
+                            });
+                        }
                     }
                 } else {
                     TWarehousebillsitems billsItem = new TWarehousebillsitems();
@@ -7004,10 +7011,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TWarehouse tWarehouse = tWarehouseList.stream().filter(li -> Objects.equals(li.getfId(), infoVO.getfWarehouseid())).findFirst()
                 .orElseThrow(() -> new WarehouseException("仓库不存在"));
         infoVO.setWarehouseName(tWarehouse.getfName());
-        // 调入仓库
-        TWarehouse inWarehouse = tWarehouseList.stream().filter(li -> Objects.equals(li.getfId(), infoVO.getfInwarehouseid())).findFirst()
-                .orElseThrow(() -> new WarehouseException("仓库不存在"));
-        infoVO.setInWarehouseName(inWarehouse.getfName());
+        if (StringUtils.isNotNull(infoVO.getfInwarehouseid())) {
+            // 调入仓库
+            TWarehouse inWarehouse = tWarehouseList.stream().filter(li -> Objects.equals(li.getfId(), infoVO.getfInwarehouseid())).findFirst()
+                    .orElseThrow(() -> new WarehouseException("仓库不存在"));
+            infoVO.setInWarehouseName(inWarehouse.getfName());
+        }
     }
 
 

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

@@ -322,6 +322,7 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
         auditItems.setActId(WarehouseActIdEnum.FEE_CHANGES.getActId().longValue());
         auditItems.setIffinalItem("F");
         auditItems.setBillNo(tWarehousebillsModify.getfBillno());
+        auditItems.setRefno1(tWarehousebillsModify.getfCorpid().toString());
         auditItems.setRefno2(WarehouseTypeEnum.FYBG_NO.getType());
         auditItems.setRefno3(tWarehousebillsModify.getfBillno());
         auditItems.setSendUserId(loginUser.getUser().getUserId());

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

@@ -757,7 +757,7 @@
             <if test="map.tWareHouseFees.fBillstatus != null">and w.f_billstatus = #{map.tWareHouseFees.fBillstatus}
             </if>
             and w.f_review_date IS NOT NULL
-            and (w.f_amount - w.f_stlamount) &gt; 0
+            and abs(w.f_amount - w.f_stlamount) &gt; 0
             GROUP BY w.f_id
         </where>
     </select>
@@ -1292,7 +1292,7 @@
                 and w.create_by = #{map.tWareHouseFees.createBy}
             </if>
             and w.f_review_date IS NOT NULL
-            and (w.f_amount - w.f_accamount) &gt; 0
+            and abs(w.f_amount - w.f_accamount) &gt; 0
             GROUP BY w.f_id
         </where>
     </select>

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

@@ -394,7 +394,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
+        ORDER BY bill.f_id DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectWarehouseBusinessList1" parameterType="TWarehousebills" resultType="Map">
@@ -553,7 +553,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
+        ORDER BY bill.f_id DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">

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

@@ -871,7 +871,7 @@
             and item.f_bsdate BETWEEN #{bills.itemBsDateList[0]} and #{bills.itemBsDateList[1]}
             and IF(item.f_billtype = "HQZY",  item.f_billstatus = 6, item.f_billstatus = 40)
         <if test="bills.fGoodsid != null and bills.fGoodsid != ''">and item.f_goodsid = #{bills.fGoodsid}</if>
-        <if test="bills.fMblno != null and bills.fMblno != ''">and item.f_mblno = #{bills.fMblno}</if>
+        <if test="bills.fMblno != null and bills.fMblno != ''">and item.f_mblno like concat('%',#{bills.fMblno},'%')</if>
     </select>
 
     <update id="updateItemStorageFeeDeadlineByPId">