From 2cc45561a1426d76afd2b3b189df6c0d02146d4a Mon Sep 17 00:00:00 2001
From: robin <robin333999@gmail.com>
Date: Tue, 19 Jun 2018 16:06:14 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A5=E5=BD=95?=
 =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=8D=95=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3QingDaoWanFu.Web/PluginClass.cs          |  1 +
 B3QingDaoWanFu/B3QingDaoWanFu.csproj       |  1 +
 B3QingDaoWanFu/Tasks/CreatGatheringTask.cs | 71 ++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 B3QingDaoWanFu/Tasks/CreatGatheringTask.cs

diff --git a/B3QingDaoWanFu.Web/PluginClass.cs b/B3QingDaoWanFu.Web/PluginClass.cs
index 0a3c512..6e23eab 100644
--- a/B3QingDaoWanFu.Web/PluginClass.cs
+++ b/B3QingDaoWanFu.Web/PluginClass.cs
@@ -37,6 +37,7 @@ namespace BWP.B3QingDaoWanFu
       GlobalFlags.On(B3SaleConsts.Flags.EnableABCPay);
 
       TimerConfig.Register(() => "* * * * *", new QueryTrustPayTask());
+      TimerConfig.Register(() => "*/5 * * * *", new QueryNoGatheringTrustPayTask());
     }
   }
 }
diff --git a/B3QingDaoWanFu/B3QingDaoWanFu.csproj b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
index 372f1c5..c36f554 100644
--- a/B3QingDaoWanFu/B3QingDaoWanFu.csproj
+++ b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
@@ -169,6 +169,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Rpc\TrustPayRpc.cs" />
     <Compile Include="Rpc\GatheringRpc.cs" />
+    <Compile Include="Tasks\CreatGatheringTask.cs" />
     <Compile Include="Tasks\RecheckTrustPayTask.cs" />
     <Compile Include="Tasks\SyncSaleOutStoreInfoToMES.cs" />
     <Compile Include="TypeIOCs\GoodsBLTypeIoc.cs" />
diff --git a/B3QingDaoWanFu/Tasks/CreatGatheringTask.cs b/B3QingDaoWanFu/Tasks/CreatGatheringTask.cs
new file mode 100644
index 0000000..287d78a
--- /dev/null
+++ b/B3QingDaoWanFu/Tasks/CreatGatheringTask.cs
@@ -0,0 +1,71 @@
+using System;
+using BWP.B3Frameworks;
+using BWP.B3Frameworks.Utils;
+using BWP.B3QingDaoWanFu.BL;
+using BWP.B3QingDaoWanFu.BO;
+using BWP.B3QingDaoWanFu.BO.NamedValueTemplate;
+using BWP.B3QingDaoWanFu.Utils;
+using Forks.EnterpriseServices.BusinessInterfaces;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using TSingSoft.WebPluginFramework;
+using TSingSoft.WebPluginFramework.QueueTasks;
+using TSingSoft.WebPluginFramework.TimerTasks;
+
+namespace BWP.B3QingDaoWanFu.Tasks {
+  [Serializable]
+  public class QueryNoGatheringTrustPayTask : ITimerTask {
+    public void Execute() {
+      var query = new DQueryDom(new JoinAlias(typeof(TrustPay)));
+      query.Where.Conditions.Add(DQCondition.EQ("PayState", 付款状态.付款成功));
+      query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field("Gathering_ID")));
+      query.Columns.Add(DQSelectColumn.Field("ID"));
+      var list = query.EExecuteList<long>();
+
+      foreach (var id in list) {
+        QueueTaskService.Add(new CreatGatheringTask(id));
+      }
+    }
+    public string Name {
+      get { return "查询未创建收款单的农行付款"; }
+    }
+  }
+
+  [Serializable]
+  public class CreatGatheringTask : ITimerTask {
+    private readonly long _trustPayID;
+
+    public CreatGatheringTask() {
+
+    }
+
+    public CreatGatheringTask(long id) {
+      _trustPayID = id;
+    }
+
+    public void Execute() {
+
+      using (var session = Dmo.NewSession()) {
+        var config = new WanFuOnlineConfig();
+        var bl = BIFactory.Create<ITrustPayBL>(session);
+
+        long gatheringID;
+        var trustPay = InnerBLUtil.GetSingleDmo<TrustPay>(session, "ID", _trustPayID, "AccountCustomer_ID", "PayState", "Gathering_ID", "Money", "Domain_ID");
+        using (new SpecialDomainUserBLScope(config.DomainUserForTrustPay.Value)) {
+          bl.CreateGathering(trustPay, out gatheringID);
+        }
+        trustPay.Gathering_ID = gatheringID;
+        InnerBLUtil.UpdateEntityProperties(session, trustPay, "Gathering_ID");
+        session.Commit();
+      }
+
+    }
+
+    public string Name {
+      get {
+        return string.Format(string.Format("付款单No.{0}补录收款单", _trustPayID));
+      }
+    }
+
+  }
+}
\ No newline at end of file

From 760db271bbbe4f64b100548749fc0e0cdaee3fb7 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Fri, 22 Jun 2018 11:44:52 +0800
Subject: [PATCH 2/5] .

---
 B3QingDaoWanFu.Web/PluginClass.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/B3QingDaoWanFu.Web/PluginClass.cs b/B3QingDaoWanFu.Web/PluginClass.cs
index 6e23eab..c6ed155 100644
--- a/B3QingDaoWanFu.Web/PluginClass.cs
+++ b/B3QingDaoWanFu.Web/PluginClass.cs
@@ -13,6 +13,7 @@ using TSingSoft.WebPluginFramework;
 using TSingSoft.WebPluginFramework.Pages;
 using TSingSoft.WebPluginFramework.TimerTasks;
 using BWP.Web.Pages.B3ButcherManage.Bills.WeighBill_;
+using BWP.B3ProduceUnitedInfos;
 
 namespace BWP.B3QingDaoWanFu
 {
@@ -35,6 +36,7 @@ namespace BWP.B3QingDaoWanFu
       GlobalFlags.On(B3SaleConsts.Flags.CustAcceptAnalyseHasFactoryPrice);
       GlobalFlags.On(B3ButcherManageConsts.GlobalFlags.棰勪粯娆惧崟涓嶅叧鑱旇繃纾呭崟);
       GlobalFlags.On(B3SaleConsts.Flags.EnableABCPay);
+      GlobalFlags.On(B3ProduceUnitedInfosConsts.GlobalFlags.Car_UseDriver);
 
       TimerConfig.Register(() => "* * * * *", new QueryTrustPayTask());
       TimerConfig.Register(() => "*/5 * * * *", new QueryNoGatheringTrustPayTask());

From c2a5067095b2a8b222b94a368866f3cb1c86ab2a Mon Sep 17 00:00:00 2001
From: robin <robin333999@gmail.com>
Date: Wed, 27 Jun 2018 11:54:37 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3QingDaoWanFu/BO/TrustPay_/TrustPay.cs     |  3 +++
 B3QingDaoWanFu/Tasks/CreatGatheringTask.cs  |  1 +
 B3QingDaoWanFu/Tasks/RecheckTrustPayTask.cs | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/B3QingDaoWanFu/BO/TrustPay_/TrustPay.cs b/B3QingDaoWanFu/BO/TrustPay_/TrustPay.cs
index 56d1386..2990eeb 100644
--- a/B3QingDaoWanFu/BO/TrustPay_/TrustPay.cs
+++ b/B3QingDaoWanFu/BO/TrustPay_/TrustPay.cs
@@ -59,6 +59,9 @@ namespace BWP.B3QingDaoWanFu.BO {
     [DbColumn(DefaultValue = 0)]
     public bool ReChecked { get; set; }
 
+    [DbColumn(DefaultValue = 0)]
+    public int ReCheckCount { get; set; }
+
     [ReferenceTo(typeof(Customer), "Name")]
     [Join("AccountCustomer_ID", "ID")]
     [LogicName("缁撹处瀹㈡埛")]
diff --git a/B3QingDaoWanFu/Tasks/CreatGatheringTask.cs b/B3QingDaoWanFu/Tasks/CreatGatheringTask.cs
index 287d78a..ab0195c 100644
--- a/B3QingDaoWanFu/Tasks/CreatGatheringTask.cs
+++ b/B3QingDaoWanFu/Tasks/CreatGatheringTask.cs
@@ -19,6 +19,7 @@ namespace BWP.B3QingDaoWanFu.Tasks {
       var query = new DQueryDom(new JoinAlias(typeof(TrustPay)));
       query.Where.Conditions.Add(DQCondition.EQ("PayState", 付款状态.付款成功));
       query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field("Gathering_ID")));
+      query.Where.Conditions.Add(DQCondition.GreaterThan("CreateTime", BLContext.Now.AddDays(-1)));
       query.Columns.Add(DQSelectColumn.Field("ID"));
       var list = query.EExecuteList<long>();
 
diff --git a/B3QingDaoWanFu/Tasks/RecheckTrustPayTask.cs b/B3QingDaoWanFu/Tasks/RecheckTrustPayTask.cs
index 36ed40f..7fee310 100644
--- a/B3QingDaoWanFu/Tasks/RecheckTrustPayTask.cs
+++ b/B3QingDaoWanFu/Tasks/RecheckTrustPayTask.cs
@@ -22,8 +22,11 @@ namespace BWP.B3QingDaoWanFu.Tasks {
       var query = new DQueryDom(new JoinAlias(typeof(TrustPay)));
       query.Where.Conditions.Add(DQCondition.GreaterThanOrEqual("PayState", 浠樻鐘舵��.璇锋眰鏀粯));
       query.Where.Conditions.Add(DQCondition.LessThanOrEqual("ReCheckTime", BLContext.Now));
+      query.Where.Conditions.Add(DQCondition.GreaterThan("CreateTime", BLContext.Now.AddHours(-5)));
       query.Where.Conditions.Add(DQCondition.EQ("ReChecked", false));
+      query.Where.Conditions.Add(DQCondition.LessThan("ReCheckCount", 6));
       query.Where.Conditions.Add(DQCondition.IsNull(DQExpression.Field("Gathering_ID")));
+
       query.Columns.Add(DQSelectColumn.Field("ID"));
       var list = query.EExecuteList<long>();
       foreach (var id in list) {
@@ -60,10 +63,11 @@ namespace BWP.B3QingDaoWanFu.Tasks {
         if (trustPay == null || trustPay.AccountCustomer_ID == null)
           return;
         trustPay.ID = _trustPayID;
+        trustPay.ReCheckCount++;
         if (trustPay.Gathering_ID > 0) {
           if (!trustPay.ReChecked) {
             trustPay.ReChecked = true;
-            InnerBLUtil.UpdateEntityProperties(session, trustPay, "ReChecked");
+            InnerBLUtil.UpdateEntityProperties(session, trustPay, "ReChecked", "ReCheckCount");
             session.Commit();
           }
           return;
@@ -85,7 +89,7 @@ namespace BWP.B3QingDaoWanFu.Tasks {
             var config = new WanFuOnlineConfig();
             using (new SpecialDomainUserBLScope(config.DomainUserForTrustPay.Value)) {
               bl.CreateGathering(trustPay, out gatheringID);
-            } 
+            }
             if (gatheringID > 0) {
               trustPay.Gathering_ID = gatheringID;
             }
@@ -98,7 +102,8 @@ namespace BWP.B3QingDaoWanFu.Tasks {
 
       using (var session = Dmo.NewSession()) {
         trustPay.ReChecked = trustPay.Gathering_ID > 0;
-        InnerBLUtil.UpdateEntityProperties(session, trustPay, "Gathering_ID", "PayState", "ReChecked");
+
+        InnerBLUtil.UpdateEntityProperties(session, trustPay, "Gathering_ID", "PayState", "ReChecked", "ReCheckCount");
         session.Commit();
       }
       if (!string.IsNullOrEmpty(msg))
@@ -118,12 +123,12 @@ namespace BWP.B3QingDaoWanFu.Tasks {
 
       if (res.Status == "01" || res.Status == "02" || res.Status == "03") {
         trustPay.ReCheckTime = BLContext.Now.AddMinutes(5);
-        InnerBLUtil.UpdateEntityProperties(session, trustPay, "ReCheckTime");
+        InnerBLUtil.UpdateEntityProperties(session, trustPay, "ReCheckTime", "ReCheckCount");
         session.Commit();
         return false;
       }
       trustPay.ReChecked = true;
-      InnerBLUtil.UpdateEntityProperties(session, trustPay, "ReChecked");
+      InnerBLUtil.UpdateEntityProperties(session, trustPay, "ReChecked", "ReCheckCount");
       session.Commit();
       return false;
     }

From ad8f75961d8901fd4ecb1a09a0b2f74ba55d9360 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Fri, 6 Jul 2018 11:31:16 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.140472?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E5=BC=A0=E5=8D=95=E6=8D=AE=E3=80=90?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=87=BA=E5=8E=82=E8=AE=B0=E5=BD=95=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj  |  16 +++
 .../OutFactoryRecord_/OutFactoryRecordEdit.cs | 100 +++++++++++++++
 .../OutFactoryRecordImport.cs                 | 114 ++++++++++++++++++
 .../OutFactoryRecord_/OutFactoryRecordList.cs |  36 ++++++
 .../OutFactoryRecordList.xml                  |  58 +++++++++
 B3QingDaoWanFu/B3QingDaoWanFu.csproj          |   3 +
 .../OutFactoryRecordBL/OutFactoryRecordBL.cs  |  20 +++
 .../Bill/OutFactoryRecord/OutFactoryRecord.cs |  29 +++++
 .../OutFactoryRecord_Detail.cs                |  54 +++++++++
 B3QingDaoWanFu/Utils/B3QingDaoWanFuConsts.cs  |   1 +
 .../Template/浜у搧鍑哄巶璁板綍妯℃澘.xlsx    | Bin 0 -> 8862 bytes
 .../config/plugins/B3QingDaoWanFu.plugin      |  19 ++-
 12 files changed, 449 insertions(+), 1 deletion(-)
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordEdit.cs
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.cs
 create mode 100644 B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.xml
 create mode 100644 B3QingDaoWanFu/BL/Bill/OutFactoryRecordBL/OutFactoryRecordBL.cs
 create mode 100644 B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord.cs
 create mode 100644 B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord_Detail.cs
 create mode 100644 WebFolder/Template/浜у搧鍑哄巶璁板綍妯℃澘.xlsx

diff --git a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
index a0cc46a..de5cc0d 100644
--- a/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
+++ b/B3QingDaoWanFu.Web/B3QingDaoWanFu.Web.csproj
@@ -90,6 +90,10 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="BWPTrustPayClient, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
+    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\tsref\Debug\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
     <Reference Include="Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>D:\BwpB3Project\tsref\Debug\Forks.EnterpriseServices.dll</HintPath>
@@ -164,6 +168,15 @@
     <Compile Include="Pages\B3QingDaoWanFu\Bills\CostRecord_\CostRecordPrint.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3QingDaoWanFu\Bills\OutFactoryRecord_\OutFactoryRecordEdit.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\B3QingDaoWanFu\Bills\OutFactoryRecord_\OutFactoryRecordImport.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\B3QingDaoWanFu\Bills\OutFactoryRecord_\OutFactoryRecordList.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3QingDaoWanFu\CustomerDeviceSet_\CustomerDeviceSetEdit.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -272,6 +285,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3QingDaoWanFu\Reports\PayAnalyse.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\B3QingDaoWanFu\Bills\OutFactoryRecord_\OutFactoryRecordList.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordEdit.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordEdit.cs
new file mode 100644
index 0000000..cd1bc6c
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordEdit.cs
@@ -0,0 +1,100 @@
+锘縰sing BWP.B3QingDaoWanFu.BL;
+using BWP.B3QingDaoWanFu.BO;
+using BWP.Web.CustomPageLayout;
+using BWP.Web.Layout;
+using BWP.Web.WebControls;
+using Forks.EnterpriseServices.DataForm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using TSingSoft.WebControls2;
+using TSingSoft.WebPluginFramework;
+
+namespace BWP.Web.Pages.B3QingDaoWanFu.Bills.OutFactoryRecord_
+{
+  partial class OutFactoryRecordEdit : DepartmentWorkFlowBillEditPage<OutFactoryRecord, IOutFactoryRecordBL>
+  {
+    protected override void BuildBody(Control control)
+    {
+      base.BuildBody(control);
+      AddDetail(control.EAdd(new TitlePanel("璁板綍鏄庣粏", "璁板綍鏄庣粏")));
+    }
+
+    protected override void BuildBasePropertiesEditor(TitlePanel titlePanel, PageLayoutSection pageLayoutSection)
+    {
+      var layoutManager = new LayoutManager("", mDFInfo, mDFContainer);
+      var config = new AutoLayoutConfig();
+      layoutManager.Config = config;
+      config.Add("AccountingUnit_ID");
+      config.Add("Department_ID");
+      config.Add("Date");
+
+      pageLayoutSection.SetRequired("AccountingUnit_ID", "Department_ID");
+      pageLayoutSection.ApplyLayout(layoutManager, config, mPageLayoutManager, mDFInfo);
+
+      titlePanel.Controls.Add(layoutManager.CreateLayout());
+    }
+
+
+    private DFEditGrid _detailGrid;
+
+    private void AddDetail(TitlePanel titlePanel)
+    {
+      var vPanel = new VLayoutPanel();
+      titlePanel.Controls.Add(vPanel);
+      if (CanSave)
+      {
+        var hPanel = vPanel.Add(new HLayoutPanel(), new VLayoutOption(HorizontalAlign.Left));
+        var oFileDialog = hPanel.Add(new FileUpload());
+        oFileDialog.Controls.Clear();
+        var btn = hPanel.Add(new TSButton("瀵煎叆鏄庣粏", delegate
+        {
+          if (string.IsNullOrEmpty(oFileDialog.FileName))
+            throw new Exception("璇烽�夋嫨瑕佸鍏ョ殑Excel鏂囦欢");
+          Import(oFileDialog.PostedFile.InputStream);
+          AspUtil.Alert(this, "瀵煎叆鎴愬姛锛�");
+        }));
+        btn.OnClientClick = "if(__DFContainer.getValue('Date')=='') {alert('璇烽�夋嫨灞犲鏃ユ湡');return false;}";
+        var link = hPanel.Add(new HyperLink());
+        link.Text = "妯℃澘涓嬭浇";
+        link.NavigateUrl = WpfPageUrl.ToGlobal(AspUtil.AddTimeStampToUrl("~/Template/浜у搧鍑哄巶璁板綍妯℃澘.xlsx"));
+        link.Target = "_blank";
+      }
+      var detailEditor = new DFCollectionEditor<OutFactoryRecord_Detail>(() => Dmo.Details);
+      detailEditor.AllowDeletionFunc = () => CanSave;
+      detailEditor.CanDeleteFunc = (detail) => CanSave;
+      detailEditor.IsEditableFunc = (field, detail) => false;
+
+      _detailGrid = vPanel.Add(new DFEditGrid(detailEditor) { Width = Unit.Percentage(100) });
+
+      _detailGrid.Columns.Add(new DFEditGridColumn("OutDate"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("CustomerName"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("GoodsName"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("Number"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("SaleUnit"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("AnimalTest"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("MeatTest"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("PigSource"));
+      _detailGrid.Columns.Add(new DFEditGridColumn("TestMan"));
+
+      var section2 = mPageLayoutManager.AddSection("detailColumns1", "璁板綍鏄庣粏");
+      section2.ApplyLayout(_detailGrid, mPageLayoutManager, DFInfo.Get(typeof(OutFactoryRecord_Detail)));
+      titlePanel.SetPageLayoutSetting(mPageLayoutManager, section2.Name);
+    }
+
+    public override void GetFromUI()
+    {
+      base.GetFromUI();
+      _detailGrid.GetFromUI();
+    }
+
+    public override void AppToUI()
+    {
+      base.AppToUI();
+      _detailGrid.DataBind();
+    }
+  }
+}
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs
new file mode 100644
index 0000000..6988dd6
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs
@@ -0,0 +1,114 @@
+锘縰sing BWP.B3ButcherManage.BO;
+using BWP.B3QingDaoWanFu.BO;
+using BWP.B3UnitedInfos.DataExchange;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.EnterpriseServices.SqlDoms;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using TSingSoft.WebPluginFramework;
+
+namespace BWP.Web.Pages.B3QingDaoWanFu.Bills.OutFactoryRecord_
+{
+  partial class OutFactoryRecordEdit
+  {
+    void Import(Stream fileStream)
+    {
+      GetFromUI();
+      var supplier = GetButcherSupplier();
+      var man = new ExcelImportManager();
+      var outDateColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "鍑哄巶鏃ユ湡",
+        Required = false,
+        Nullable = true
+      });
+
+      var customerColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "涓氫富淇℃伅",
+        Required = false,
+        Nullable = true
+      });
+      var goodsNameColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "閿�鍞搧绉�",
+        Required = false,
+        Nullable = true
+      });
+
+      var numberColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "鏁伴噺",
+        Required = false,
+        Nullable = true
+      });
+
+      var saleUnitColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "閿�鍞競鍦�",
+        Required = false,
+        Nullable = true
+      });
+
+      var animalTestColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "鍔ㄦ璇佸彿",
+        Required = false,
+        Nullable = true
+      });
+
+      var meatTestColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "鑲夎川妫�楠岃瘉鍙�",
+        Required = false,
+        Nullable = true
+      });
+
+      var testManColumn = man.Add(new ExecelImportColumn()
+      {
+        Name = "妫�楠屼汉鍛�",
+        Required = false,
+        Nullable = true
+      });
+
+      var details = new List<OutFactoryRecord_Detail>();
+      foreach (var row in man.Parse(fileStream))
+      {
+        var detail = new OutFactoryRecord_Detail();
+        detail.OutDate = outDateColumn.GetNullableValue<DateTime>(row);
+        detail.CustomerName = customerColumn.GetStringValue(row);
+        detail.GoodsName = customerColumn.GetStringValue(row);
+        detail.Number = numberColumn.GetNullableValue<decimal>(row);
+        detail.SaleUnit = saleUnitColumn.GetStringValue(row);
+        detail.AnimalTest = animalTestColumn.GetStringValue(row);
+        detail.MeatTest = meatTestColumn.GetStringValue(row);
+        detail.TestMan = testManColumn.GetStringValue(row);
+        detail.PigSource = supplier;
+
+        details.Add(detail);
+      }
+
+      foreach (var detail in details)
+        Dmo.Details.Add(detail);
+      _detailGrid.DataBind();
+    }
+
+    string GetButcherSupplier()
+    {
+      var order = new JoinAlias(typeof(ButcherOrder));
+      var orderDetail = new JoinAlias(typeof(ButcherOrder_Detail));
+      var weight = new JoinAlias(typeof(WeighBill));
+      var query = new DQueryDom(order);
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(orderDetail), DQCondition.EQ(order, "ID", orderDetail, "ButcherOrder_ID"));
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(weight), DQCondition.EQ(orderDetail, "WeighBill_ID", weight, "ID"));
+      query.Where.Conditions.Add(DQCondition.EQ("Date", Dmo.Date));
+      query.Columns.Add(DQSelectColumn.Field("Supplier_Name", weight));
+      query.Range = SelectRange.Top(5);
+      return string.Join(",", query.EExecuteList<string>()) + ",鈥︹��";
+    }
+  }
+}
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.cs
new file mode 100644
index 0000000..f95c506
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.cs
@@ -0,0 +1,36 @@
+锘縰sing BWP.B3QingDaoWanFu.BL;
+using BWP.B3QingDaoWanFu.BO;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TSingSoft.WebControls2;
+
+namespace BWP.Web.Pages.B3QingDaoWanFu.Bills.OutFactoryRecord_
+{
+  class OutFactoryRecordList : DomainBillListPage<OutFactoryRecord, IOutFactoryRecordBL>
+  {
+    protected override void AddQueryControls(VLayoutPanel vPanel)
+    {
+      vPanel.Add(CreateDefaultBillQueryControls((panel, config) =>
+      {
+        config.AddAfter("Date", "BillState");
+        config.AddAfter("AccountingUnit_ID", "Date");
+        config.AddAfter("Department_ID", "AccountingUnit_ID");
+        config.Remvoe("Remark");
+      }));
+    }
+
+    protected override void AddDFBrowseGridColumn(DFBrowseGrid grid, string field)
+    {
+      base.AddDFBrowseGridColumn(grid, field);
+      if (field == "BillState")
+      {
+        AddDFBrowseGridColumn(grid, "Date");
+        AddDFBrowseGridColumn(grid, "AccountingUnit_Name");
+        AddDFBrowseGridColumn(grid, "Department_Name");
+        AddDFBrowseGridColumn(grid, "CheckUser_Name");
+      }
+    }
+  }
+}
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.xml b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.xml
new file mode 100644
index 0000000..837cdca
--- /dev/null
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.xml
@@ -0,0 +1,58 @@
+锘�<?xml version="1.0" encoding="utf-8" ?>
+<Select xmlns="urn:XDQuery">
+  <Columns>
+    <Field name="ID"/>
+  </Columns>
+  <From>
+    <DmoClass class="BWP.B3QingDaoWanFu.BO.OutFactoryRecord, B3QingDaoWanFu"/>
+  </From>
+  <Where>
+    <And>
+      <EQ>
+        <Field name="ID"/>
+        <QBE paramName="ID"/>
+      </EQ>
+
+      <EQ>
+        <Field name="AccountingUnit_ID"/>
+        <QBE paramName="AccountingUnit_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="Department_ID"/>
+        <QBE paramName="Department_ID"/>
+      </EQ>
+      <EQ>
+        <Field name="IsLocked"/>
+        <QBE paramName="IsLocked"/>
+      </EQ>
+      <Contains>
+        <Field name="CreateUser_Name"/>
+        <QBE paramName="CreateUser_Name"/>
+      </Contains>
+      <Contains>
+        <Field name="CheckUser_Name"/>
+        <QBE paramName="CheckUser_Name"/>
+      </Contains>
+      <GreaterThanOrEqual>
+        <Field name="CreateTime"/>
+        <QBE paramName="MinCreateTime" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="CreateTime"/>
+        <QBE paramName="MaxCreateTime"/>
+      </LessThanOrEqual>
+      <GreaterThanOrEqual>
+        <Field name="Date"/>
+        <QBE paramName="MinDate" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="Date"/>
+        <QBE paramName="MaxDate"/>
+      </LessThanOrEqual>
+      <EQ>
+        <Field name="BillState"/>
+        <QBE paramName ="BillState"/>
+      </EQ>
+    </And>
+  </Where>
+</Select>
diff --git a/B3QingDaoWanFu/B3QingDaoWanFu.csproj b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
index c36f554..c26c4b1 100644
--- a/B3QingDaoWanFu/B3QingDaoWanFu.csproj
+++ b/B3QingDaoWanFu/B3QingDaoWanFu.csproj
@@ -154,11 +154,14 @@
     <Compile Include="BLActions\SaleOrderBLAction.cs" />
     <Compile Include="BLActions\SaleOutStoreBLActions.cs" />
     <Compile Include="BL\Bill\CostRecordBL\CostRecordBL.cs" />
+    <Compile Include="BL\Bill\OutFactoryRecordBL\OutFactoryRecordBL.cs" />
     <Compile Include="BL\TrustPayBL.cs" />
     <Compile Include="BL\CustomerDeviceSetBL.cs" />
     <Compile Include="BL\ExportBL\GoodsExportBL.cs" />
     <Compile Include="BO\Bill\CostRecord\CostRecord.cs" />
     <Compile Include="BO\Bill\CostRecord\CostRecord_Detail.cs" />
+    <Compile Include="BO\Bill\OutFactoryRecord\OutFactoryRecord.cs" />
+    <Compile Include="BO\Bill\OutFactoryRecord\OutFactoryRecord_Detail.cs" />
     <Compile Include="BO\TrustPay_\TrustPay.cs" />
     <Compile Include="BO\CustomerDeviceSet.cs" />
     <Compile Include="BO\SaleOutStoreBarCodeToMESLog.cs" />
diff --git a/B3QingDaoWanFu/BL/Bill/OutFactoryRecordBL/OutFactoryRecordBL.cs b/B3QingDaoWanFu/BL/Bill/OutFactoryRecordBL/OutFactoryRecordBL.cs
new file mode 100644
index 0000000..5b0829f
--- /dev/null
+++ b/B3QingDaoWanFu/BL/Bill/OutFactoryRecordBL/OutFactoryRecordBL.cs
@@ -0,0 +1,20 @@
+锘縰sing BWP.B3Frameworks.BL;
+using BWP.B3QingDaoWanFu.BO;
+using Forks.EnterpriseServices;
+using Forks.EnterpriseServices.BusinessInterfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BWP.B3QingDaoWanFu.BL
+{
+  [LogicName("浜у搧鍑哄巶璁板綍")]
+  [BusinessInterface(typeof(OutFactoryRecordBL))]
+  public interface IOutFactoryRecordBL : IDepartmentWorkFlowBillBL<OutFactoryRecord>
+  { }
+
+  public class OutFactoryRecordBL : DepartmentWorkFlowBillBL<OutFactoryRecord>, IOutFactoryRecordBL
+  {
+  }
+}
diff --git a/B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord.cs b/B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord.cs
new file mode 100644
index 0000000..6ca29fe
--- /dev/null
+++ b/B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord.cs
@@ -0,0 +1,29 @@
+锘縰sing BWP.B3Frameworks;
+using BWP.B3Frameworks.BO;
+using Forks.EnterpriseServices;
+using Forks.EnterpriseServices.DataForm;
+using Forks.EnterpriseServices.DomainObjects2;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BWP.B3QingDaoWanFu.BO
+{
+  [Serializable, DFClass, LogicName("浜у搧鍑哄巶璁板綍")]
+  [DmoTypeID(B3FrameworksConsts.DmoTypeIDBases.B3QingDaoWanFu, B3QingDaoWanFuConsts.DmoTypeIDOffsets.OutFactoryRecord)]
+  [DFCPrompt("閮ㄩ棬", Property = "Department_ID")]
+  [DFCPrompt("閮ㄩ棬", Property = "Department_Name")]
+  public class OutFactoryRecord : DepartmentWorkFlowBill
+  {
+    private DateTime? date = DateTime.Today;
+    [LogicName("灞犲鏃ユ湡")]
+    [DFNotEmpty]
+    public DateTime? Date { get { return date; } set { date = value; } }
+
+    private readonly OutFactoryRecord_DetailCollection mDetails = new OutFactoryRecord_DetailCollection();
+    [OneToMany(typeof(OutFactoryRecord_Detail), "ID")]
+    [Join("ID", "OutFactoryRecord_ID")]
+    public OutFactoryRecord_DetailCollection Details { get { return mDetails; } }
+  }
+}
diff --git a/B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord_Detail.cs b/B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord_Detail.cs
new file mode 100644
index 0000000..ef53fea
--- /dev/null
+++ b/B3QingDaoWanFu/BO/Bill/OutFactoryRecord/OutFactoryRecord_Detail.cs
@@ -0,0 +1,54 @@
+锘縰sing BWP.B3Frameworks.BO;
+using Forks.EnterpriseServices;
+using Forks.EnterpriseServices.DataForm;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.Utils;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace BWP.B3QingDaoWanFu.BO
+{
+  [Serializable, DFClass, LogicName("浜у搧鍑哄巶璁板綍_鏄庣粏")]
+  public class OutFactoryRecord_Detail : Base
+  {
+    public long OutFactoryRecord_ID { get; set; }
+
+    [LogicName("鍑哄巶鏃ユ湡")]
+    public DateTime? OutDate { get; set; }
+
+    [LogicName("璐揣涓氫富濮撳悕鍙婅仈绯绘柟寮�")]
+    [DbColumn(DbType = SqlDbType.NVarChar, Length = 200)]
+    public string CustomerName { get; set; }
+
+    [LogicName("閿�鍞搧绉�")]
+    public string GoodsName { get; set; }
+
+    [LogicName("鏁伴噺锛堝ご鏁版垨鍏枻锛�")]
+    public Money<decimal>? Number { get; set; }
+
+    [LogicName("閿�鍞競鍦烘垨鍗曚綅")]
+    [DbColumn(DbType = SqlDbType.NVarChar, Length = 200)]
+    public string SaleUnit { get; set; }
+
+    [LogicName("鍔ㄧ墿妫�鐤悎鏍艰瘉缂栧彿")]
+    public string AnimalTest { get; set; }
+
+    [LogicName("鑲夊搧鍝佽川妫�楠屽悎鏍艰瘉缂栧彿")]
+    public string MeatTest { get; set; }
+
+    [LogicName("鐢熺尓鏉ユ簮锛堢敓鐚揣涓诲鍚嶏級")]
+    [DbColumn(DbType = SqlDbType.NVarChar, Length = 200)]
+    public string PigSource { get; set; }
+
+    [LogicName("妫�楠屼汉鍛�")]
+    public string TestMan { get; set; }
+  }
+
+  [Serializable]
+  public class OutFactoryRecord_DetailCollection : DmoCollection<OutFactoryRecord_Detail>
+  { 
+  }
+}
diff --git a/B3QingDaoWanFu/Utils/B3QingDaoWanFuConsts.cs b/B3QingDaoWanFu/Utils/B3QingDaoWanFuConsts.cs
index c637e07..0ab899f 100644
--- a/B3QingDaoWanFu/Utils/B3QingDaoWanFuConsts.cs
+++ b/B3QingDaoWanFu/Utils/B3QingDaoWanFuConsts.cs
@@ -10,6 +10,7 @@ namespace BWP.B3QingDaoWanFu
     internal static class DmoTypeIDOffsets
     {
       public const byte GoodsExport = 1;
+      public const byte OutFactoryRecord = 3;
     }
   }
 }
diff --git a/WebFolder/Template/浜у搧鍑哄巶璁板綍妯℃澘.xlsx b/WebFolder/Template/浜у搧鍑哄巶璁板綍妯℃澘.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..73ee6eaee3b92f9f2322f53f1bb17d603b8137f8
GIT binary patch
literal 8862
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
Goc$jYX9rsV

literal 0
HcmV?d00001

diff --git a/WebFolder/config/plugins/B3QingDaoWanFu.plugin b/WebFolder/config/plugins/B3QingDaoWanFu.plugin
index 9908bd9..ed44383 100644
--- a/WebFolder/config/plugins/B3QingDaoWanFu.plugin
+++ b/WebFolder/config/plugins/B3QingDaoWanFu.plugin
@@ -16,6 +16,7 @@
   <ContentFiles>
     <Folder name="config/billreports"/>
     <File name="Web.Config" overwrite="true"/>
+    <Folder name="Template" overwrite="true"/>
   </ContentFiles>
   <DbResources></DbResources>
 
@@ -50,6 +51,21 @@
       <Function index="11" name="鎾ら攢瀹屾瘯"/>
       <Function index="12" name="鎵撳嵃"/>
     </FunctionGroup>
+    <FunctionGroup name="浜у搧鍑哄巶璁板綍" roleSchemas="employee">
+      <Function index="0" name="璁块棶" />
+      <Function index="1" name="鏂板缓" />
+      <Function index="2" name="缂栬緫" />
+      <Function index="3" name="鍒犻櫎" />
+      <Function index="4" name="瀹℃牳" />
+      <Function index="5" name="鎾ら攢" />
+      <Function index="6" name="閿佸畾" />
+      <Function index="7" name="瑙ｉ攣" />
+      <Function index="8" name="绠＄悊" />
+      <Function index="9" name="浣滃簾" />
+      <Function index="10" name="瀹屾瘯"/>
+      <Function index="11" name="鎾ら攢瀹屾瘯"/>
+      <Function index="12" name="鎵撳嵃"/>
+    </FunctionGroup>
     <FunctionGroup name="鍐滆浠樻" roleSchemas="employee">
       <Function index="0" name="璁块棶" />
       <Function index="1" name="鏂板缓" />
@@ -64,7 +80,8 @@
     <Menu  id="0005"  name="/B3闈掑矝涓囩/鎶ヨ〃/浠樻娓呭崟瀵煎嚭" roles="B3QingDaoWanFu.鎶ヨ〃.浠樻娓呭崟瀵煎嚭" url="B3QingDaoWanFu/Reports/PayInfoExport.aspx"/>
     <Menu  id="0006"  name="/B3闈掑矝涓囩/涓氬姟鍗曟嵁/璐圭敤褰曞叆" roles="B3QingDaoWanFu.璐圭敤褰曞叆.璁块棶" url="B3QingDaoWanFu/Bills/CostRecord_/CostRecordList.aspx"/>
     <Menu  id="0007"  name="/B3闈掑矝涓囩/鎶ヨ〃/涓囩閿�鍞嚭搴撳垎鏋�" roles="B3QingDaoWanFu.鎶ヨ〃.閿�鍞嚭搴撳垎鏋�" url="B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.aspx"/>
-    <Menu  id="0008"  name="/B3闈掑矝涓囩/鍐滆浠樻" roles="B3QingDaoWanFu.鍐滆浠樻.璁块棶" url="B3QingDaoWanFu/TrustPay_/TrustPayList.aspx"/>    
+    <Menu  id="0008"  name="/B3闈掑矝涓囩/鍐滆浠樻" roles="B3QingDaoWanFu.鍐滆浠樻.璁块棶" url="B3QingDaoWanFu/TrustPay_/TrustPayList.aspx"/>
+    <Menu  id="0009"  name="/B3闈掑矝涓囩/涓氬姟鍗曟嵁/浜у搧鍑哄巶璁板綍" roles="B3QingDaoWanFu.浜у搧鍑哄巶璁板綍.璁块棶" url="B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordList.aspx"/>
   
   </Menus>
   <Features>

From 611eeb987d8fd958239e3f7aa83158e547a5eca1 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Sat, 7 Jul 2018 08:54:14 +0800
Subject: [PATCH 5/5] bug

---
 .../Bills/OutFactoryRecord_/OutFactoryRecordImport.cs    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs
index 6988dd6..3c42508 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Bills/OutFactoryRecord_/OutFactoryRecordImport.cs
@@ -81,7 +81,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Bills.OutFactoryRecord_
         var detail = new OutFactoryRecord_Detail();
         detail.OutDate = outDateColumn.GetNullableValue<DateTime>(row);
         detail.CustomerName = customerColumn.GetStringValue(row);
-        detail.GoodsName = customerColumn.GetStringValue(row);
+        detail.GoodsName = goodsNameColumn.GetStringValue(row);
         detail.Number = numberColumn.GetNullableValue<decimal>(row);
         detail.SaleUnit = saleUnitColumn.GetStringValue(row);
         detail.AnimalTest = animalTestColumn.GetStringValue(row);
@@ -108,7 +108,12 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Bills.OutFactoryRecord_
       query.Where.Conditions.Add(DQCondition.EQ("Date", Dmo.Date));
       query.Columns.Add(DQSelectColumn.Field("Supplier_Name", weight));
       query.Range = SelectRange.Top(5);
-      return string.Join(",", query.EExecuteList<string>()) + ",鈥︹��";
+      var result = query.EExecuteList<string>();
+      var name = string.Join(",", result);
+      if (result.Count > 5)
+        return name + ",鈥︹��";
+      else
+        return name;
     }
   }
 }