xiaochen 2 anni fa
parent
commit
34a2581792

+ 5 - 1
src/main/java/com/tld/model/Inventory.java

@@ -137,9 +137,13 @@ public class Inventory implements Serializable {
      */
     private String companyName;
     /**
-     * 计量单位
+     * 计量单位   groupBy
      */
     private String unitOfMeasurement;
+    /**
+     * 分组   groupBy
+     */
+    private String groupBy;
     /**
      * 物料类别
      */

+ 6 - 4
src/main/resources/mapper/QueryListMappeer.xml

@@ -146,10 +146,11 @@
             </if>
         </trim>
         GROUP BY
-        a.storage_location_code,
+/*        a.storage_location_code,
         a.material_id,
         a.wbs,
-        a.account_sleeve
+        a.account_sleeve*/
+        ${groupBy}
     </select>
     <!-- 查询库位信息 -->
     <select id="getQueryInventory" resultType="java.util.Map">
@@ -240,10 +241,11 @@
             </if>
         </trim>
         GROUP BY
-        a.storage_location_code,
+        /*a.storage_location_code,
         a.material_id,
         a.wbs,
-        a.account_sleeve
+        a.account_sleeve*/
+        ${groupBy}
     </select>
     <!-- 查询接入信息 -->
     <select id="getAccess" resultType="com.tld.model.Access">