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

Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs

@@ -24,11 +24,18 @@ namespace MyCode.Project.Repositories
           
             SearchCondition where = new SearchCondition();
 
-                 where.AddSqlCondition("a.FDOCUMENTSTATUS='C' ", true);
+                 where.AddSqlCondition(" 1=1 ", true);
 
-            string sql = $@" SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID  FROM T_SAL_ORDER  A WITH(NOLOCK)
+            string sql = $@" 
-     LEFT JOIN T_BD_CUSTOMER Cccc  WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID  
+ SELECT * ,(FQTY-FStockOutQty) AS FRemainOutQty,OutboundPercentage=CONVERT(DECIMAL(18,2),(CASE WHEN FQTY !=0 THEN FStockOutQty/FQTY*1.00 ELSE 0 END)) 
-     LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 ";
+ FROM (
+ SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID
+ ,(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 FQTY
+ 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 ";
 
            
             var list = this.SelectListPage<SalOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");

Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs

@@ -28,21 +28,7 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers
 
         }
         #endregion
-
+      
-        #region Test(测试方法)
-        /// <summary>
-        /// 测试方法
-        /// </summary>
-        [AllowAnonymous]
-        [HttpGet]
-        public string Test()
-        {
-
-            return "test";
-
-        }
-        #endregion
-
 
         /// <summary>
         /// 销售订单列表