对外文档接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/plugin/BulkWareHouseController.java

@@ -29,6 +29,7 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.text.ParseException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 大宗仓库接⼝
@@ -76,44 +77,70 @@ public class BulkWareHouseController extends BaseController {
     /**
      * 获取仓库详细信息
      */
-    @PostMapping("/inventory/queriesV2")
-    public void queries(HttpServletRequest request, HttpServletResponse response) throws InvalidKeySpecException, SignatureException, NoSuchAlgorithmException, InvalidKeyException {
+    @PostMapping("/inventory/query")
+    public void queries(HttpServletRequest request, HttpServletResponse response) throws InvalidKeySpecException, SignatureException, NoSuchAlgorithmException, InvalidKeyException, IOException {
 
-        String bizContentStr = (String) request.getAttribute("bizContentStr");
 
-        JSONObject jsonObject = JSONObject.parseObject(bizContentStr);
+//        String bizContentStr = (String) request.getAttribute("bizContentStr");
+        String test = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+
+        JSONObject jsonObject = JSONObject.parseObject(test);
         String ownerName = jsonObject.getString("currentOwnerName");//现存货人名称
         String identifier = jsonObject.getString("currentOwnerSocialIdentifier");//现存货人识别号
 
-        JSONArray jsonArray = jsonObject.getJSONArray("warehouseSerialNumbers");//仓库编号
+        JSONArray jsonArray = jsonObject.getJSONArray("warehouseCodes");//仓库编号
 
         JSONArray jsonArrayBlNos = jsonObject.getJSONArray("blNos");//提单号
 
-        List<String> numbersList = new ArrayList<>();
-        for (int i = 0; i < jsonArray.size(); i++) {
-            String numbers = jsonArray.getString(i);
-            numbersList.add(numbers);
-            System.out.println(numbers);
+        // 现存货人名称不允许为空
+        if (ownerName == null || "".equals(ownerName)) {
+            sendRequest(null, response);
+            return;
         }
 
-        List<String> blNosList = new ArrayList<>();
-        for (int i = 0; i < jsonArrayBlNos.size(); i++) {
-            String numbers = jsonArrayBlNos.getString(i);
-            blNosList.add(numbers);
-            System.out.println(numbers);
+        // 现存货人识别号不允许为空
+        if (identifier == null || "".equals(identifier)) {
+            sendRequest(null, response);
+            return;
+        }
+
+        // 仓库编号和提单号只允许一个为空
+        if (!(jsonArray != null && jsonArray.size() > 0) && !(jsonArrayBlNos != null && jsonArrayBlNos.size() > 0)) {
+            sendRequest(null, response);
+            return;
+        }
+
+        List<String> numbersList = null;
+        if (jsonArray != null && jsonArray.size() > 0) {
+            numbersList = new ArrayList<>();
+            for (int i = 0; i < jsonArray.size(); i++) {
+                String numbers = jsonArray.getString(i);
+                numbersList.add(numbers);
+                System.out.println(numbers);
+            }
         }
 
-        if (numbersList.size() > 0 && blNosList.size() > 0) {
-            numbersList = null;
+        List<String> blNosList = null;
+        if (jsonArrayBlNos != null && jsonArrayBlNos.size() > 0) {
+            blNosList = new ArrayList<>();
+            for (int i = 0; i < jsonArrayBlNos.size(); i++) {
+                String numbers = jsonArrayBlNos.getString(i);
+                blNosList.add(numbers);
+                System.out.println(numbers);
+            }
         }
 
+//        if (numbersList.size() > 0 && blNosList.size() > 0) {
+//            numbersList = null;
+//        }
+
         InventoryQueryRequest inventoryQueryRequest = new InventoryQueryRequest();
         inventoryQueryRequest.setCurrentOwnerName(ownerName);
         inventoryQueryRequest.setCurrentOwnerSocialIdentifier(identifier);
         inventoryQueryRequest.setWarehouseSerialNumbers(numbersList);
         inventoryQueryRequest.setBlNosList(blNosList);
 
-        List<InventoryQueryResponse> list = foreignHttpService.inventoryQueriesV2(inventoryQueryRequest);
+        List<InventoryQueryTwoResponse> list = foreignHttpService.inventoryQueriesV2(inventoryQueryRequest);
 
         sendRequest(list, response);
 

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/ForeignHttpService.java

@@ -6,6 +6,7 @@ import com.ruoyi.ccb.domain.*;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.request.InventoryQueryRequest;
 import com.ruoyi.warehouseBusiness.response.InventoryQueryResponse;
+import com.ruoyi.warehouseBusiness.response.InventoryQueryTwoResponse;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -102,7 +103,7 @@ public interface ForeignHttpService {
 /**
      * 获取仓库详细信息
      */
-    List<InventoryQueryResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest);
+    List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest);
 
     /**
      * 仓单注册指令

ruoyi-plugin/src/main/java/com/ruoyi/ccb/service/impl/ForeignHttpServiceImpl.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.request.InventoryQueryRequest;
 import com.ruoyi.warehouseBusiness.response.InventoryQueryResponse;
+import com.ruoyi.warehouseBusiness.response.InventoryQueryTwoResponse;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections4.CollectionUtils;
@@ -389,7 +390,7 @@ public class ForeignHttpServiceImpl implements ForeignHttpService{
      * 获取仓库详细信息
      */
     @Override
-    public List<InventoryQueryResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest) {
+    public List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest) {
         return itWarehouseService.inventoryQueriesV2(inventoryQueryRequest);
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TWarehouseMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.basicData.mapper;
 
 import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.warehouseBusiness.response.InventoryQueryResponse;
+import com.ruoyi.warehouseBusiness.response.InventoryQueryTwoResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -288,7 +289,7 @@ public interface TWarehouseMapper {
  /**
      *  获取仓库详细信息
      */
-    List<InventoryQueryResponse> inventoryQueriesV2(@Param("ownerName")String ownerName, @Param("identifier") String identifier, @Param("numbersList") List<String > numbersList);
+    List<InventoryQueryTwoResponse> inventoryQueriesV2(@Param("ownerName")String ownerName, @Param("identifier") String identifier, @Param("numbersList") List<String > numbersList, @Param("blNosList") List<String> blNosList);
 
     /**
      * 仓单注册指令

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITWarehouseService.java

@@ -12,6 +12,7 @@ import com.ruoyi.warehouseBusiness.domain.dto.WarehouseSubmitDTO;
 import com.ruoyi.warehouseBusiness.domain.vo.WarehouseInfoVO;
 import com.ruoyi.warehouseBusiness.request.InventoryQueryRequest;
 import com.ruoyi.warehouseBusiness.response.InventoryQueryResponse;
+import com.ruoyi.warehouseBusiness.response.InventoryQueryTwoResponse;
 
 import java.util.List;
 import java.util.Map;
@@ -289,7 +290,7 @@ public interface ITWarehouseService {
 /**
      *  获取仓库详细信息
      */
-    List<InventoryQueryResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest);
+    List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest);
 
     /**
      * 仓单注册指令

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TWarehouseServiceImpl.java

@@ -32,6 +32,7 @@ import com.ruoyi.warehouseBusiness.mapper.TAnnexMapper;
 import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
 import com.ruoyi.warehouseBusiness.request.InventoryQueryRequest;
 import com.ruoyi.warehouseBusiness.response.InventoryQueryResponse;
+import com.ruoyi.warehouseBusiness.response.InventoryQueryTwoResponse;
 import com.ruoyi.warehouseBusiness.service.impl.BillnoSerialServiceImpl;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -666,10 +667,18 @@ public class TWarehouseServiceImpl implements ITWarehouseService {
      * 获取仓库详细信息
      */
     @Override
-    public List<InventoryQueryResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest) {
-        return tWarehouseMapper.inventoryQueriesV2(inventoryQueryRequest.getCurrentOwnerName(),
-                inventoryQueryRequest.getCurrentOwnerSocialIdentifier(),
-                inventoryQueryRequest.getWarehouseSerialNumbers());
+    public List<InventoryQueryTwoResponse> inventoryQueriesV2(InventoryQueryRequest inventoryQueryRequest) {
+
+        String currentOwnerName = inventoryQueryRequest.getCurrentOwnerName();
+
+        String currentOwnerSocialIdentifier = inventoryQueryRequest.getCurrentOwnerSocialIdentifier();
+
+        List<String> warehouseSerialNumbers = inventoryQueryRequest.getWarehouseSerialNumbers();
+
+        List<String> blNosList = inventoryQueryRequest.getBlNosList();
+
+
+        return tWarehouseMapper.inventoryQueriesV2(currentOwnerName, currentOwnerSocialIdentifier, warehouseSerialNumbers, blNosList);
     }
 
     /**

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/response/InventoryQueryTwoResponse.java

@@ -0,0 +1,149 @@
+package com.ruoyi.warehouseBusiness.response;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class InventoryQueryTwoResponse {
+
+    /**
+     * 仓库编号
+     */
+    private String warehouseCode;
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+    /**
+     * 原始进仓日期 yyyy-MM-dd
+     */
+    private String originalWarehousingDate;
+
+    /**
+     * 提单号
+     */
+    private String blNo;
+
+    /**
+     * 品名
+     */
+    private String cargoName;
+
+    /**
+     * 型号
+     */
+    private String cargoModel;
+
+    /**
+     * 规格
+     */
+    private String cargoSpec;
+
+    /**
+     * 数量
+     */
+    private BigDecimal cargoQuantity;
+
+    /**
+     * 净重  吨
+     */
+    private BigDecimal netWeight;
+
+    /**
+     * 毛重  吨
+     */
+    private BigDecimal grossWeight;
+
+    /**
+     * 仓库地址
+     */
+    private String warehouseAddress;
+
+    /**
+     * 原存货人名称
+     */
+    private String sourceOwnerName;
+
+    /**
+     * 原存货人识别号
+     */
+    private String sourceOwnerSocialIdentifier;
+
+    /**
+     * 现存货人名称
+     */
+    private String currentOwnerName;
+
+    /**
+     * 现存货人识别号
+     */
+    private String currentOwnerSocialIdentifier;
+
+    /**
+     * 仓租起始日期 yyy-MM-dd
+     */
+    private String rentBeginDate;
+
+    /**
+     * 仓储费率
+     */
+    private String storageRate;
+
+    /**
+     * 标记
+     */
+    private String mark;
+
+    /**
+     * 损耗标准 /
+     */
+    private String lossStd = "/";
+
+    /**
+     * 质量 /
+     */
+    private String quality = "/";
+
+    /**
+     * 件数
+     */
+    private String number;
+
+    /**
+     * 生产厂家
+     */
+    private String manufacturer;
+
+    /**
+     * 商标
+     */
+    private String trademark;
+
+    /**
+     * 品级
+     */
+    private String grade;
+
+    /**
+     * 包装  否
+     */
+    private String packing;
+
+    /**
+     * 国别
+     */
+    private String country;
+
+    /**
+     * 工艺
+     */
+    private String process;
+
+    /**
+     * 货位/库区
+     */
+    private String location;
+}

ruoyi-warehouse/src/main/resources/mapper/basicData/TWarehouseMapper.xml

@@ -818,9 +818,10 @@
         TW.f_mblno
     </select>
 
-    <select id="inventoryQueriesV2" resultType="com.ruoyi.warehouseBusiness.response.InventoryQueryResponse">
+    <select id="inventoryQueriesV2" resultType="com.ruoyi.warehouseBusiness.response.InventoryQueryTwoResponse">
         SELECT
-        TWH.f_no AS warehouseSerialNumber,
+        TWH.f_no AS warehouseCode,
+        TWH.f_name AS warehouseName,
         TW.f_mblno AS blNo,
         TW.f_originalbilldate AS originalWarehousingDate,
         TW.f_originalbilldate AS rentBeginDate,
@@ -831,49 +832,25 @@
         TWH.f_addr AS warehouseAddress,
         TG.f_name AS cargoName,
         TW.f_marks AS cargoModel,
-        TW.f_marks AS cargoSpec,
+        TG.f_specs AS cargoSpec,
         IFNULL( ROUND( SUM( TW.f_netweightblc ) / 1000, 2 ), 0 ) AS netWeight,
         IFNULL( ROUND( SUM( TW.f_grossweightblc ) / 1000, 2 ), 0 ) AS grossWeight,
-        SUM( TW.f_qtyblc ) AS cargoQuantity
-        --             '' AS storageRate,
-        --             TW.f_marks AS mark,
-        --             SUM( TW.f_qtyblc ) AS number,
-        --             (CASE
-        --             TWBI.f_business_type
-        --             WHEN '3' THEN
-        --             TWBI.f_marks ELSE ''
-        --             END) AS manufacturer,
-        --             '' AS trademark,
-        --             '' AS grade,
-        --             TG.f_packagespecs AS packing,
-        --             '' AS country,
-        --             '' AS process,
-        --             TWBI.f_warehouse_information AS location
+        SUM( TW.f_qtyblc ) AS cargoQuantity,
+                    '' AS storageRate,
+                    TW.f_marks AS mark,
+                    SUM( TW.f_qtyblc ) AS number,
+                    '' AS manufacturer,
+                    '' AS trademark,
+                    '' AS grade,
+                    TG.f_packagespecs AS packing,
+                    '' AS country,
+                    '' AS process,
+                    '' AS location
         FROM t_whgenleg TW
         LEFT JOIN t_goods TG ON TG.f_id = TW.f_goodsid
         LEFT JOIN t_warehouse TWH ON TW.f_warehouseid = TWH.f_id
         LEFT JOIN t_corps TC ON TC.f_id = TW.f_corpid
-        <!--LEFT JOIN (
-        SELECT DISTINCT
-        TWB.f_ifpledge,
-        TWB.f_mblno,
-        bi.f_business_type,
-        bi.f_marks,
-        bi.f_warehouse_information,
-        bi.f_warehouselocid
-        FROM
-        t_warehousebills TWB
-        LEFT JOIN t_warehousebillsitems bi ON bi.f_pid = TWB.f_id
-        WHERE
-        TWB.del_flag = '0'
-        <if test="numbersList != null and numbersList != ''">
-            and TWB.f_mblno IN
-            <foreach item="number" collection="numbersList" open="(" separator="," close=")">
-                #{number}
-            </foreach>
-        </if>
-        ) TWBI ON TWBI.f_mblno = TW.f_mblno
-        AND TWBI.f_warehouselocid = TW.f_warehouseid-->
+
         <where>
             TW.del_flag = '0'
             and TW.f_netweightblc != 0