物资-领用和退回流程调整并抄送仓管

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/mapper/xml/PsiCollectDetailedMapper.xml

@@ -19,7 +19,7 @@
                c.spec,
         su.name AS recipientAgent, su.id AS recipientAgentId, so.name AS recipientOffice,
         d.id AS collectTypeId, d.name AS collectType,
-        a.current_inventory AS surplusNumber,
+               wd.current_inventory AS surplusNumber,
         a.is_return
              FROM psi_management_collect_detailed a
              LEFT JOIN sys_user su
@@ -43,6 +43,17 @@
                     e.goods_name
                 ) b ON a.goods_name = b.goods_name
 
+             LEFT JOIN (
+                 SELECT
+                     sum( current_inventory ) AS current_inventory,
+                     trade_name
+                 FROM
+                     psi_management_warehouse_detailed e
+                 WHERE  e.del_flag = 0
+                 GROUP BY
+                     e.trade_name
+             ) wd ON a.goods_name = wd.trade_name
+
              LEFT JOIN psi_management_warehouse_detailed c on a.goods_name = c.trade_name and a.collect_type = c.ware_house_type
              LEFT JOIN psi_management_warehouse_basics bas ON c.basic_id = bas.id
 
@@ -72,7 +83,8 @@
             a.not_surplus_stock,
             a.returned_num,
             pmwd.warn_num,
-            pmwd.warn_flag
+            pmwd.warn_flag,
+            a.remarks as detailRemarks
         from psi_management_collect_detailed_record a
             LEFT JOIN sys_user su  ON a.recipient_agent = su.id
             LEFT JOIN sys_office so ON su.office_id = so.id