Explorar o código

根据提单号查询仓库与客户信息

caifc %!s(int64=3) %!d(string=hai) anos
pai
achega
e35a25d439

+ 13 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseGoodsTransferController.java

@@ -234,6 +234,19 @@ public class TWarehouseGoodsTransferController extends BaseController {
     }
 
     /**
+     * 货转根据提单号查询可用客户、仓库信息
+     */
+    @DataScope(deptAlias = "d", userAlias = "u")
+    @GetMapping(value = "/corpOrWarehouseByMblno")
+    public AjaxResult corpOrWarehouseByMblno(@RequestParam("mblno") String fMblno) {
+        // 判断是否传入值
+        if (StringUtils.isEmpty(fMblno)) {
+            return AjaxResult.error("未找到提单号");
+        }
+        return itWarehouseBillsService.corpOrWarehouseByMblno(fMblno);
+    }
+
+    /**
      * 根据id更新费用审核状态
      *
      * @param id

+ 31 - 0
ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/vo/WarehouseBillsVO.java

@@ -0,0 +1,31 @@
+package com.ruoyi.warehouseBusiness.domain.vo;
+
+import com.ruoyi.basicData.domain.TCorps;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ *
+ *
+ * @author  caifc
+ * @date 2021-11-10 9:28
+*/
+@Data
+public class WarehouseBillsVO extends TWarehouseBills {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     *  客户集合
+     */
+    private List<TCorps> corpsList;
+
+    /**
+     *  仓库集合
+     */
+    private List<TWarehouse> warehouseList;
+
+}

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

@@ -680,4 +680,12 @@ public interface ITWarehouseBillsService {
      * @return
      */
     AjaxResult appQueryInit(Long id, String typeEnum);
+
+    /**
+     * 货转根据提单号查询可用客户、仓库信息
+     *
+     * @param fMblno 提单号
+     * @return
+     */
+    AjaxResult corpOrWarehouseByMblno(String fMblno);
 }

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

@@ -49,9 +49,7 @@ import com.ruoyi.warehouseBusiness.domain.dto.CalculateStorageFeesDTO;
 import com.ruoyi.warehouseBusiness.domain.enums.FeesTypeEnum;
 import com.ruoyi.warehouseBusiness.domain.enums.WarehouseActIdEnum;
 import com.ruoyi.warehouseBusiness.domain.enums.WarehouseTypeEnum;
-import com.ruoyi.warehouseBusiness.domain.vo.AppWarehouseInfoVO;
-import com.ruoyi.warehouseBusiness.domain.vo.CalculateStorageFeesInfoVO;
-import com.ruoyi.warehouseBusiness.domain.vo.StorageFeeCalculationResultVO;
+import com.ruoyi.warehouseBusiness.domain.vo.*;
 import com.ruoyi.warehouseBusiness.excel.*;
 import com.ruoyi.warehouseBusiness.mapper.*;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
@@ -7111,6 +7109,38 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
+     * 货转根据提单号查询可用客户、仓库信息
+     *
+     * @param fMblno 提单号
+     * @return
+     */
+    @Override
+    public AjaxResult corpOrWarehouseByMblno(String fMblno) {
+        WarehouseBillsVO billsVO = new WarehouseBillsVO();
+        // 查询符合条件的库存总帐
+        TWhgenleg tWhgenleg = new TWhgenleg();
+        tWhgenleg.setfMblno(fMblno);
+        List<TWhgenleg> tWhgenlegs = tWhgenlegMapper.selectTWhgenlegList(tWhgenleg);
+        if (CollectionUtils.isNotEmpty(tWhgenlegs)) {
+            // 查询仓库信息
+            List<Long> warehouseIds = tWhgenlegs.stream().filter(leg -> Objects.nonNull(leg.getfWarehouseid())).map(TWhgenleg::getfWarehouseid)
+                    .distinct().collect(toList());
+            if (CollectionUtils.isNotEmpty(warehouseIds)) {
+                List<TWarehouse> warehouseList = tWarehouseMapper.selectByIds(warehouseIds);
+                billsVO.setWarehouseList(warehouseList);
+            }
+            // 查询客户
+            List<Long> corpIds = tWhgenlegs.stream().filter(leg -> Objects.nonNull(leg.getfCorpid())).map(TWhgenleg::getfCorpid)
+                    .distinct().collect(toList());
+            if (CollectionUtils.isNotEmpty(corpIds)) {
+                List<TCorps> corpsList = tCorpsMapper.selectByIds(corpIds);
+                billsVO.setCorpsList(corpsList);
+            }
+        }
+        return AjaxResult.success(billsVO);
+    }
+
+    /**
      * 如果是入库
      *
      * @param infoVO

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

@@ -108,6 +108,7 @@
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
             <if test="fMarks != null  and fMarks != ''">and f_marks = #{fMarks}</if>
             <if test="fOriginalbilldate != null ">and f_originalbilldate = #{fOriginalbilldate}</if>
+            <if test="fMblno != null and fMblno != ''">and f_mblno like concat('%',#{fMblno},'%')</if>
         </where>
         ${params.dataScope}
     </select>