RFID版本的面料入库汇总详情

hx-service/storage/src/main/java/com/fjhx/applet/mapper/FabricStatisticsMapper.xml

@@ -38,15 +38,16 @@
     </select>
 
     <select id="selectFabricWTypeDetails" resultType="java.util.Map">
-        SELECT sh.`Name`                  houseName,
-               Count(1)                   count,
-               sum(sd.Quantity)           quantity,
-               sum(sd.Quantity * m.Price) amount
-        FROM stock_detail sd
-                 LEFT JOIN material m ON sd.MaterialCode = m.`Code`
-                 LEFT JOIN stock_house sh ON sd.StockHouseId = sh.ID
-        WHERE m.TechnologyType = '3'
-        GROUP BY sh.`Name`;
+        SELECT sh.`Name`                                                 houseName,
+               IF(m.Purpose is null and m.Purpose = '', "其他", m.Purpose) rurpose,
+               Count(1)                     AS                           count,
+               sum(swd.ChangeNum)           AS                           changeNum,
+               sum(swd.ChangeNum * m.Price) AS                           amount
+        FROM stock_waterdetial swd
+                 LEFT JOIN material m ON swd.MaterialCode = m.`Code`
+                 LEFT JOIN stock_water sw ON swd.waterId = sw.ID
+                 LEFT JOIN stock_house sh ON sw.StockHouseId = sh.ID
+            ${ew.customSqlSegment}
     </select>
 
     <select id="getInOutBill" resultType="java.util.Map">