添加库存总账库内箱号查询条件

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

@@ -18,7 +18,6 @@ import com.ruoyi.warehouseBusiness.excel.OutStock;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -59,6 +58,14 @@ public class TWarehouseOutStockController extends BaseController {
     }
 
     /**
+     * 计算出库仓储费
+     */
+    @GetMapping("/calculateOutStockFee/{fId}")
+    public AjaxResult calculateOutStockFee(@PathVariable("fId") Long fId) {
+        return itWarehouseBillsService.calculateOutStockFee(fId);
+    }
+
+    /**
      * 出库提交
      */
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:outStock:add')")

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

@@ -441,4 +441,11 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult importLibraryInformation(MultipartFile file);
+
+    /**
+     * 计算出库仓储费
+     * @param fId
+     * @return
+     */
+    public AjaxResult calculateOutStockFee(Long fId);
 }

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

@@ -3585,6 +3585,23 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
+     * 计算出库仓储费
+     *  待完成！！！！！！！！！
+     * @param fId
+     * @return
+     */
+    @Override
+    public AjaxResult calculateOutStockFee(Long fId) {
+        TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(fId);
+        if (StringUtils.isNull(tWarehouseBills)) {
+            return AjaxResult.error("未找到出库信息，请确认是否存在出库");
+        }
+
+
+        return null;
+    }
+
+    /**
      * 仓储费计算提交以及暂存
      *
      * @param warehouseBills

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -644,6 +644,9 @@
             <if test="fLocation != null and fLocation ==1 ">
                 and leg.f_warehouse_locationid = #{fWarehouseLocationid}
             </if>
+            <if test="fLocalcntrno != null  and fLocalcntrno != '' ">
+                and leg.f_localcntrno  LIKE  concat('%', #{fLocalcntrno}, '%')
+            </if>
             <if test="fLocation != null  and fLocation ==0 ">
                 and ware.ancestors  LIKE  concat('%', #{fWarehouseLocationid}, '%')
             </if>

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

@@ -131,7 +131,7 @@
     </select>
 
     <select id="selectGoodsTransferitemsList" parameterType="TWarehousebillsitems" resultType="Map">
-        select DISTINCT
+        SELECT DISTINCT
             item.f_id AS fId,
             item.f_pid AS fPid,
             item.f_srcid AS fSrcid,
@@ -160,6 +160,7 @@
             item.f_originalbilldate AS fOriginalbilldate,
             item.f_plannetweight AS fPlannetweight,
             item.f_transfer_warehouselocid AS fTransferWarehouselocid,
+            w.f_storekeeper fStorekeeper,
             item.f_qty AS fQty,
             item.f_volumn AS fVolumn,
             item.f_driver_name AS fDriverName,
@@ -188,7 +189,8 @@
             item.f_warehouse_information AS fWarehouseInformation,
             item.f_orgwarehouse_information AS fOrgwarehouseInformation
         FROM
-            t_warehousebillsitems item
+            t_warehousebills w
+            LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
             LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
             LEFT JOIN t_warehouse_area area ON area.f_id = item.f_warehouselocid
             LEFT JOIN t_warehouse ware ON ware.f_id = area.f_warehouseid
@@ -531,7 +533,7 @@
                 END AS fBillstatus,
             g.f_name AS fGoodsid,
             items.f_driver_tel AS fDriverTel,
-            dict.dict_label AS fBusinessType ,
+            dict.dict_label AS fBusinessType,
             items.f_marks AS fMarks,
             items.f_warehouse_information AS fWarehouseInformation,
             items.f_qty AS fQty,