Merge remote-tracking branch 'origin/dev' into dev

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

@@ -72,7 +72,7 @@ public class BulkWareHouseController extends BaseController {
 
         List<InventoryQueryResponse> list = foreignHttpService.inventoryQueries(inventoryQueryRequest);
 
-        sendRequest(Collections.singletonList(list),response);
+        sendRequest(list,response);
 
     }
 
@@ -106,7 +106,7 @@ public class BulkWareHouseController extends BaseController {
             list.add(registerResponse);
         }
 
-        sendRequest(Collections.singletonList(list),response);
+        sendRequest(list,response);
 
     }
 
@@ -140,7 +140,7 @@ public class BulkWareHouseController extends BaseController {
             list.add(verifyResponse);
         }
 
-        sendRequest(Collections.singletonList(list),response);
+        sendRequest(list,response);
 
     }
 
@@ -221,7 +221,7 @@ public class BulkWareHouseController extends BaseController {
             list.add(transferResponse);
         }
 
-        sendRequest(Collections.singletonList(list),response);
+        sendRequest(list,response);
 
     }
 
@@ -256,11 +256,11 @@ public class BulkWareHouseController extends BaseController {
             list.add(cancelResponse);
         }
 
-        sendRequest(Collections.singletonList(list),response);
+        sendRequest(list,response);
 
     }
 
-    public void sendRequest(List<Object> list, HttpServletResponse response) throws NoSuchAlgorithmException, InvalidKeySpecException, InvalidKeyException, SignatureException {
+    public void sendRequest(List<?> list, HttpServletResponse response) throws NoSuchAlgorithmException, InvalidKeySpecException, InvalidKeyException, SignatureException {
         String responseBizContext;
         try {
             responseBizContext = new ObjectMapper().writeValueAsString(list);

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

@@ -1,15 +1,17 @@
 package com.ruoyi.warehouseBusiness.response;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+@Getter
+@Setter
 public class InventoryQueryResponse implements Serializable {
 
-
-    // TODO  待补充
-
     /**
-     * 仓库编号
+     * 仓库标识符
      */
     private String warehouseSerialNumber;
 
@@ -18,13 +20,24 @@ public class InventoryQueryResponse implements Serializable {
      */
     private String originalWarehousingDate;
 
-
+    /**
+     * 品名
+     */
     private String cargoName;
 
+    /**
+     * 型号
+     */
     private String cargoModel;
 
+    /**
+     * 规格
+     */
     private String cargoSpec;
 
+    /**
+     * 数量
+     */
     private BigDecimal cargoQuantity;
 
     /**
@@ -37,18 +50,95 @@ public class InventoryQueryResponse implements Serializable {
      */
     private BigDecimal grossWeight;
 
-
+    /**
+     * 仓库地址
+     */
     private String warehouseAddress;
+
+    /**
+     * 原存货人名称
+     */
     private String sourceOwnerName;
+
+    /**
+     * 原存货人识别号
+     */
     private String sourceOwnerSocialIdentifier;
+
+    /**
+     * 现存货人名称
+     */
     private String currentOwnerName;
+
+    /**
+     * 现存货人识别号
+     */
     private String currentOwnerSocialIdentifier;
 
+    /**
+     * 仓租起始日期 yyy-MM-dd
+     */
     private String rentBeginDate;
 
+    // TODO  以下为新增字段
+    /**
+     * 仓储费率
+     */
+    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

@@ -701,21 +701,31 @@
 
     <select id="inventoryQueries" resultType="com.ruoyi.warehouseBusiness.response.InventoryQueryResponse">
         SELECT
-            TW.f_originalbillno as warehouse_serial_number,
-            TW.f_originalbilldate as original_warehousing_date,
+            TW.f_originalbillno as warehouseSerialNumber,
+            TW.f_originalbilldate as originalWarehousingDate,
             TW.f_mblno as bl_no,
-            TG.f_name AS cargo_name,
-            TW.f_marks AS cargo_model,
-            TG.f_specs AS cargo_spec,
-            TW.f_qtyblc AS cargo_quantity,
-            TW.f_netweightblc AS net_weight,
-            TW.f_grossweightblc AS gross_weight,
-            TWH.f_addr AS warehouse_address,
-            TC.f_name AS source_owner_name,
-            TC.uscc AS source_owner_social_identifier,
-            TC.f_name AS current_owner_name,
-            TC.uscc AS current_owner_social_identifier,
-            TW.f_originalbilldate AS rent_begin_date
+            TG.f_name AS cargoName,
+            TW.f_marks AS cargoModel,
+            TG.f_specs AS cargoSpec,
+            TW.f_qtyblc AS cargoQuantity,
+            TW.f_netweightblc AS netWeight,
+            TW.f_grossweightblc AS grossWeight,
+            TWH.f_addr AS warehouseAddress,
+            TC.f_name AS sourceOwnerName,
+            TC.uscc AS sourceOwnerSocialIdentifier,
+            TC.f_name AS currentOwnerName,
+            TC.uscc AS currentOwnerSocialIdentifier,
+            TW.f_originalbilldate AS rentBeginDate,
+            '' AS storageRate,
+            TW.f_marks AS mark,
+            TW.f_qtyblc AS number,
+            '' AS manufacturer,
+            '' AS trademark,
+            '' AS grade,
+            TG.f_packagespecs AS packing,
+            '' AS country,
+            '' AS process,
+            TWH.f_warehouse_information 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