From e7b25b1c1d8d3310aa5deae5f72a3e0cc36c6fc2 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 19 四月 2021 15:18:01 +0800
Subject: [PATCH] 代码提交

---
 src/BLL/Demo.BillView/Demo.BillView.csproj          |    1 
 src/BLL/Demo.BillView/PRD/PODemandPlanListFilter.cs |    6 ++-
 src/BLL/Demo.BillView/PRD/Pro_TlPush.cs             |    2 
 src/BLL/Demo.BillView/PRD/Pro_DayPlanSelectMenu.cs  |   69 ++++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/src/BLL/Demo.BillView/Demo.BillView.csproj b/src/BLL/Demo.BillView/Demo.BillView.csproj
index f5c44dd..3917ad2 100644
--- a/src/BLL/Demo.BillView/Demo.BillView.csproj
+++ b/src/BLL/Demo.BillView/Demo.BillView.csproj
@@ -219,6 +219,7 @@
     <Compile Include="PRD\ProTardinessDetails.cs" />
     <Compile Include="PRD\ProCompleteAnalysisMateriel.cs" />
     <Compile Include="PRD\ProCompleteAnalysisDetails.cs" />
+    <Compile Include="PRD\Pro_DayPlanSelectMenu.cs" />
     <Compile Include="PRD\Pro_TlPushAudit.cs" />
     <Compile Include="PRD\Pro_MaterialRequisitionAuditDayPlan.cs" />
     <Compile Include="PRD\Pro_MaterialRequisitionAudit.cs" />
diff --git a/src/BLL/Demo.BillView/PRD/PODemandPlanListFilter.cs b/src/BLL/Demo.BillView/PRD/PODemandPlanListFilter.cs
index 91bfb29..65f6425 100644
--- a/src/BLL/Demo.BillView/PRD/PODemandPlanListFilter.cs
+++ b/src/BLL/Demo.BillView/PRD/PODemandPlanListFilter.cs
@@ -21,6 +21,7 @@
 using Kingdee.BOS.Core.Metadata;
 using Kingdee.K3.MFG.ServiceHelper;
 using Kingdee.BOS;
+using ZD.Cloud.Logger;
 
 namespace Demo.BillView.PRD
 {
@@ -37,19 +38,20 @@
             {
                 int FSupplierId = GetSupplierId();
                 if (FSupplierId > 0)
-                    e.FilterString = " FSUPPLIERID IN (102629)";
+                    e.FilterString = $" FSUPPLIERID IN ({FSupplierId})";
             }
             else
             {
                 int FSupplierId = GetSupplierId();
                 if (FSupplierId > 0)
-                    e.FilterString += " AND FSUPPLIERID IN (102629)";
+                    e.FilterString += $" AND FSUPPLIERID IN (FSupplierId)";
             }
         }
         public int GetSupplierId()
         {
             long userId = this.Context.UserId;
             string sql = $"/*dialect*/ select FSupplierId from T_SEC_user a join T_SCP_USERDATA b on a.FUSERID = b.FUSERID where FUSERTYPE = 2 and a.FUSERID ={userId}";
+            LogHelper.Info(sql);
             int FSupplierId = DBServiceHelper.ExecuteScalar<int>(Context, sql, 0);
             return FSupplierId;
         }
diff --git a/src/BLL/Demo.BillView/PRD/Pro_DayPlanSelectMenu.cs b/src/BLL/Demo.BillView/PRD/Pro_DayPlanSelectMenu.cs
new file mode 100644
index 0000000..70b6052
--- /dev/null
+++ b/src/BLL/Demo.BillView/PRD/Pro_DayPlanSelectMenu.cs
@@ -0,0 +1,69 @@
+锘縰sing Kingdee.BOS;
+using Kingdee.BOS.Core.Bill.PlugIn;
+using Kingdee.BOS.Core.DynamicForm;
+using Kingdee.BOS.Core.DynamicForm.PlugIn.Args;
+using Kingdee.BOS.Core.List;
+using Kingdee.BOS.Util;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Demo.BillView.PRD
+{
+    [Description("[鏃ヨ鍒掓眹鎶ュ崟] 閫夊崟"), HotUpdate]
+    public class Pro_DayPlanSelectMenu : AbstractBillPlugIn
+    {
+        public override void BarItemClick(BarItemClickEventArgs e)
+        {
+            base.BarItemClick(e);
+            try
+            {
+                if (e.BarItemKey.ToUpper() == "TBDAYPLANMENU")
+                {
+                    // 鎵撳紑鍗曟嵁鍒楄〃鐣岄潰锛氫互鎵撳紑鐗╂枡F8鏌ヨ鍒楄〃涓轰緥
+                    // using Kingdee.BOS.Core.List;
+                    string pageId = Guid.NewGuid().ToString();
+                    ListShowParameter showParameter = new ListShowParameter();
+                    showParameter.FormId = "Paez_Sc_WorkBillAutoSortBill";
+                    showParameter.PageId = pageId;
+                    showParameter.UseOrgId = this.Context.CurrentOrganizationInfo.ID;
+                    showParameter.IsLookUp = true;
+                    this.View.ShowForm(showParameter);
+
+                    this.View.ShowForm(showParameter, delegate (FormResult result)
+                    {
+                        object returnData = result.ReturnData;
+                        if (returnData is ListSelectedRowCollection)
+                        {
+                            ListSelectedRowCollection listSelectedRowCollection = returnData as ListSelectedRowCollection;
+                            if (listSelectedRowCollection != null)
+                            {
+                                int Fseq = 0;
+                                foreach (var listSelectedRow in listSelectedRowCollection)
+                                {
+                                    this.View.Model.SetValue("FMATERIALID", listSelectedRow.DataRow["FHMaterID_Id"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FQty", listSelectedRow.DataRow["FHQTY"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FSCZY", listSelectedRow.DataRow["FHSourceID_Id"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FProOrderNo", listSelectedRow.DataRow["FSCOrderNo"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FSRCBILLENTRYSEQ", listSelectedRow.DataRow["FSRCBILLENTRYSEQ"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FDayPlanFnumber", listSelectedRow.DataRow["FBillNo"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FDayPlanFID", listSelectedRow.DataRow["FID"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FDayPlanEntryID", listSelectedRow.DataRow["t1_FENTRYID"].ToString(), Fseq);
+                                    this.View.Model.SetValue("FDayPlanEntrySeq", listSelectedRow.DataRow["t1_FSEQ"].ToString(), Fseq);
+                                    Fseq++;
+                                }
+                            }
+                        }
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                this.View.ShowErrMessage(ex.Message.ToString());
+            }
+        }
+    }
+}
diff --git a/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs b/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs
index 6d72db2..b327d7a 100644
--- a/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs
+++ b/src/BLL/Demo.BillView/PRD/Pro_TlPush.cs
@@ -138,7 +138,7 @@
                             ["IsDeleteEntry"] = "false",
                             ["SubSystemId"] = "",
                             ["IsVerifyBaseDataField"] = "false",
-                            ["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+                           // ["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
                             ["Model"] = model
                         };
 

--
Gitblit v1.9.1