Merge branch 'YanShi' of http://8.130.121.29:3000/yuyubo/YunTongJackYunTask into YanShi

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

@@ -56,6 +56,17 @@ namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
         /// </summary>
 
         public decimal FInvoiceAmount { get; set; }
+
+        /// <summary>
+        /// 订单价税合计(本位币)
+        /// </summary>
+
+        public decimal FBILLALLAMOUNT_LC { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string FCreateDate { get; set; }
     }
 
     public class SalOrderDetailResp

Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs

@@ -29,14 +29,17 @@ namespace MyCode.Project.Repositories
 
             string sql = $@" 
  SELECT * ,(QTY-FStockOutQty) AS FRemainOutQty,OutboundPercentage=CONVERT(DECIMAL(18,2),(CASE WHEN QTY !=0 THEN FStockOutQty/QTY*1.00 ELSE 0 END)) 
- FROM (
- SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID,FRceiveAmount,FInvoiceAmount2 AS FInvoiceAmount
- ,(SELECT SUM(FStockOutQty) FROM T_SAL_ORDERENTRY_R g WHERE g.FID=a.FID) AS FStockOutQty
-  ,(SELECT SUM(g.FQTY) FROM T_SAL_ORDERENTRY g WHERE g.FID=a.FID) AS QTY
- FROM T_SAL_ORDER  A WITH(NOLOCK)
- LEFT JOIN T_BD_CUSTOMER Cccc  WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID  
- LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 
- WHERE a.FDOCUMENTSTATUS='C') a ";
+FROM (
+SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID,FRceiveAmount,FInvoiceAmount2 AS FInvoiceAmount
+,(SELECT SUM(FStockOutQty) FROM T_SAL_ORDERENTRY_R g WHERE g.FID=a.FID) AS FStockOutQty
+ ,(SELECT SUM(g.FQTY) FROM T_SAL_ORDERENTRY g WHERE g.FID=a.FID) AS QTY
+ ,fin.FBILLALLAMOUNT_LC, CONVERT(NVARCHAR(23),A.FCreateDate,23) AS FCreateDate
+FROM T_SAL_ORDER  A WITH(NOLOCK)
+LEFT JOIN dbo.T_SAL_ORDERFIN fin ON a.fid=a.FID
+LEFT JOIN T_BD_CUSTOMER Cccc  WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID  
+LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 
+WHERE a.FDOCUMENTSTATUS='C'
+) a ";
 
            
             var list = this.SelectListPage<SalOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");