添加查询条件

src/main/resources/mapper/material/SeekByTransMapper.xml

@@ -42,6 +42,9 @@
             <if test = "list.transType != null and list.transType != ''">
                 AND a.transType = #{list.transType}
             </if>
+            <if test = "list.transNo != null and list.transNo != ''">
+                AND a.transNo = #{list.transNo}
+            </if>
         </where>
     </select>
 
@@ -72,20 +75,8 @@
         DAY,
         GETDATE(),
         a.expiredDate
-        ) AS daysUntilExpired,
+        ) AS daysUntilExpired
 
-        (
-        SELECT
-        COUNT (*)
-        FROM
-        InventoryStock_Roll
-        WHERE
-        Site = a.Site
-        AND WarehouseID = a.WarehouseID
-        AND partNo = a.partNo
-        AND BatchNo = a.BatchNo
-        AND LocationID = a.LocationID
-        ) AS num
         FROM
         InventoryStock AS a
         LEFT JOIN part AS b ON a.Site = b.Site
@@ -153,6 +144,9 @@
             <if test = "list.rollNo != null and list.rollNo != ''">
                 AND b.rollNo = #{list.rollNo}
             </if>
+            <if test = "list.transNo != null and list.transNo != ''">
+                AND a.transNo = #{list.transNo}
+            </if>
         </where>
     </select>
 
@@ -177,34 +171,16 @@
         a.warehouseID,
         b.part_desc,
         a.expiredDate,
-        c.RollNo,
+        a.RollNo,
         DATEDIFF(
         DAY,
         GETDATE(),
         a.expiredDate
-        ) AS daysUntilExpired,
-
-        (
-        SELECT
-        COUNT (*)
-        FROM
-        InventoryStock_Roll
-        WHERE
-        Site = a.Site
-        AND WarehouseID = a.WarehouseID
-        AND partNo = a.partNo
-        AND BatchNo = a.BatchNo
-        AND LocationID = a.LocationID
-        ) AS num
+        ) AS daysUntilExpired
         FROM
-        InventoryStock AS a
+        InventoryStock_Roll AS a
         LEFT JOIN part AS b ON a.Site = b.Site
         AND a.PartNo = b.part_no
-        LEFT JOIN InventoryStock_Roll AS c ON a.Site = c.Site
-        AND a.PartNo = c.partNo
-        AND a.BatchNo=c.BatchNo
-        AND a.LocationID=c.LocationID
-        AND a.WarehouseID=c.WarehouseID
         <where>
             <if test = "list.partNo != null and list.partNo != ''">
                 AND a.partNo = #{list.partNo}
@@ -216,7 +192,10 @@
                 AND b.part_desc = #{list.partDesc}
             </if>
             <if test = "list.RollNo != null and list.RollNo != ''">
-                AND c.RollNo = #{list.rollNo}
+                AND a.RollNo = #{list.rollNo}
+            </if>
+            <if test = "list.qtyOnHand != null ">
+                AND a.QtyOnHand > #{list.qtyOnHand}
             </if>
         </where>
     </select>