Merge branch 'master' of http://8.130.121.29:3000/Develop/GZ_KD_Parino

GZ_KD_Parino/Sal_Order/Save.cs

@@ -51,10 +51,11 @@ namespace GZ_KD_Parino.Sal_Order
             foreach (var rows in e.SelectedRows)
             {
                 var Billobj = rows.DataEntity;
-                //更新纸质合同号
+                // 更新纸质合同号
                 var result = SqlManage.UpdateFlexNumber(this.Context, Convert.ToString(Billobj["Id"]));
-                //获取商机名称
+                // 获取商机名称
                 var F_BON = Billobj["F_BON"] as DynamicObject;
+                // 
                 //获取销售组织
                 var SalZZFid = Billobj["SaleOrgId_Id"].ToString();
 

GZ_KD_Parino/Services/SaleOrderService.cs

@@ -28,23 +28,41 @@ namespace GZ_KD_Parino.Services
         /// <returns></returns>
         public DynamicObject GetHistoryOrder(string orgId, string custId, string bonId, string materialId, DateTime createDate)
         {
-            var sql = $@"/*dialect*/SELECT
+            var sql = $@"/*dialect*/WITH
+    SJname AS (
+        SELECT
+            t1_l.FNAME
+        FROM
+            T_BAS_PREBDTHREE t1
+            INNER JOIN T_BAS_PREBDTHREE_L t1_l ON t1.FID = t1_l.FID
+            AND t1_l.FLocaleID = 2052
+        WHERE
+            t1.FID = '{bonId}'
+    )
+SELECT
     TOP 1 t1e_f.*
 FROM
     T_SAL_ORDER t1
     INNER JOIN T_SAL_ORDERENTRY t1e ON t1.FID = t1e.FID
     INNER JOIN T_SAL_ORDERENTRY_F t1e_f ON t1e.FENTRYID = t1e_f.FENTRYID
+    INNER JOIN T_BAS_PREBDONE_L t2_L ON t1.F_PROJECTNAME = t2_L.FID
+    AND t2_L.FLocaleID = 2052
 WHERE
     1 = 1
     AND t1.FDOCUMENTSTATUS = 'C' -- 已审核
     AND t1.FCANCELSTATUS = 'A' -- 未作废
+    AND t2_L.FNAME IN (
+        SELECT
+            FNAME
+        FROM
+            SJname
+    )
     AND t1.FAPPROVEDATE < '{createDate.ToString("yyyy-MM-dd HH:mm:ss")}'
     AND t1.FSALEORGID = '{orgId}'
     AND t1.FCUSTID = '{custId}'
-    AND t1.F_BON = '{bonId}'
     AND t1e.FMATERIALID = '{materialId}'
 ORDER BY
-    t1.FCREATEDATE DESC
+    t1.FDATE DESC
 ";
             var result = DBServiceHelper.ExecuteDynamicObject(this.ctx, sql);
             if (result.Count == 0)