0

Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs

@@ -41,5 +41,13 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
         /// 下单时间
         /// </summary>
         public DateTime FCreateDate { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialNames { get; set; }
+        /// <summary>
+        /// 生产车间
+        /// </summary>
+        public string Department { get; set; }
     }
 }

Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs

@@ -79,26 +79,64 @@ SELECT
 FROM
     (
         SELECT
-            t1.FID Fid,
+    t1.FID Fid,
-            t1.FBILLNO FBillNo,
+    t1.FBILLNO FBillNo,
-            t1.FDATE FDate,
+    t1.FDATE FDate,
-            t1.FCREATEDATE FCreateDate,
+    t1.FCREATEDATE FCreateDate,
-            SUM(t1e.FQTY) Qty,
+    SUM(t1e.FQTY) Qty,
-            SUM(
+    SUM(
-                t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY
+        t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY
-            ) InStockQty
+    ) InStockQty,
-        FROM
+    ISNULL (
-            T_PRD_MO t1
+        stuff (
-            LEFT JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID
+            (
-            LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID
+                select distinct
-        WHERE
+                    ';' + tm_l.FNAME
-            1 = 1
+                from
-            AND t1.FDOCUMENTSTATUS = 'C'
+                    T_PRD_MOENTRY tt
-        GROUP BY
+                    INNER JOIN T_BD_MATERIAL tm ON tt.FMATERIALID = tm.FMATERIALID
-            t1.FID,
+                    LEFT JOIN T_BD_MATERIAL_L tm_l ON tm.FMATERIALID = tm_l.FMATERIALID
-            t1.FBILLNO,
+                    AND tm_l.FLOCALEID = 2052
-            t1.FDATE,
+                where
-            t1.FCREATEDATE
+                    tt.FID = t1.FID for xml path ('')
+            ),
+            1,
+            1,
+            ''
+        ),
+        ''
+    ) MaterialNames,
+    ISNULL (
+        stuff (
+            (
+                select distinct
+                    ';' + tm_l.FNAME
+                from
+                    T_PRD_MOENTRY tt
+                    INNER JOIN T_BD_DEPARTMENT tm ON tt.FWORKSHOPID = tm.FDEPTID
+                    LEFT JOIN T_BD_DEPARTMENT_L tm_l ON tm.FDEPTID = tm_l.FDEPTID
+                    AND tm_l.FLOCALEID = 2052
+                where
+                    tt.FID = t1.FID for xml path ('')
+            ),
+            1,
+            1,
+            ''
+        ),
+        ''
+    ) Department
+FROM
+    T_PRD_MO t1
+    LEFT JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID
+    LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID
+WHERE
+    1 = 1
+    AND t1.FDOCUMENTSTATUS = 'C'
+GROUP BY
+    t1.FID,
+    t1.FBILLNO,
+    t1.FDATE,
+    t1.FCREATEDATE
     ) t1Temp
 
 ";