From 59bbd1fb0a68709490f2102e4d7483ed3e0cb9ac Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Thu, 5 Jul 2018 15:15:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E5=89=B2=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81=E5=85=A5=E5=BA=93=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3ClientService.Web.csproj                |   9 +
 .../BaseInfos/Store_/StoreEdit.cs             |  24 +++
 .../BaseInfos/Store_/StoreList.cs             |  13 ++
 .../BaseInfos/Store_/StoreList.xml            |  43 +++++
 B3ClientService/B3ClientService.csproj        |   2 +
 B3ClientService/BL/BaseInfo/StoreBL.cs        |  20 ++
 B3ClientService/BO/BaseInfo/Store.cs          |  16 +-
 .../BO/Bill/SegmentProductionInfo.cs          |   7 +
 B3ClientService/OfflinRpc/BaseInfoRpc.cs      |   6 +
 .../OfflinRpc/SegmentInStoreRpc.cs            | 175 ++++++++++++++++++
 .../OfflinRpc/SegmentProductionRpc.cs         |   2 -
 .../config/plugins/B3ClientService.plugin     |  11 ++
 12 files changed, 322 insertions(+), 6 deletions(-)
 create mode 100644 B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreEdit.cs
 create mode 100644 B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.cs
 create mode 100644 B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.xml
 create mode 100644 B3ClientService/BL/BaseInfo/StoreBL.cs
 create mode 100644 B3ClientService/OfflinRpc/SegmentInStoreRpc.cs

diff --git a/B3ClientService.Web/B3ClientService.Web.csproj b/B3ClientService.Web/B3ClientService.Web.csproj
index adaf9d7..6c272ce 100644
--- a/B3ClientService.Web/B3ClientService.Web.csproj
+++ b/B3ClientService.Web/B3ClientService.Web.csproj
@@ -83,6 +83,12 @@
     <Compile Include="Pages\B3ClientService\BaseInfos\ClientGoodsSet_\ClientGoodsSetList.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="Pages\B3ClientService\BaseInfos\Store_\StoreEdit.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Pages\B3ClientService\BaseInfos\Store_\StoreList.cs">
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
     <Compile Include="Pages\B3ClientService\BaseInfos\WorkUnit_\WorkUnitEdit.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -201,6 +207,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3ClientService\Bills\CarcassInventory_\CarcassInventoryList.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\B3ClientService\BaseInfos\Store_\StoreList.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/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreEdit.cs b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreEdit.cs
new file mode 100644
index 0000000..672372d
--- /dev/null
+++ b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreEdit.cs
@@ -0,0 +1,24 @@
+using BWP.B3ClientService.BL;
+using BWP.B3ClientService.BO;
+using BWP.Web.Layout;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BWP.Web.Pages.B3ClientService.BaseInfos.Store_
+{
+  class StoreEdit : BaseInfoEditPage<Store, IStoreBL>
+  {
+    protected override void BuildBody(System.Web.UI.Control parent)
+    {
+      var layoutManager = new LayoutManager("main", mDFInfo, mDFContainer);
+      var config = new AutoLayoutConfig() { Cols = 8 };
+      config.Add("Name");
+      config.Add("Code");
+      config.Add("Remark");
+      layoutManager.Config = config;
+      parent.Controls.Add(layoutManager.CreateLayout());
+    }
+  }
+}
diff --git a/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.cs b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.cs
new file mode 100644
index 0000000..061db0e
--- /dev/null
+++ b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.cs
@@ -0,0 +1,13 @@
+using BWP.B3ClientService.BL;
+using BWP.B3ClientService.BO;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BWP.Web.Pages.B3ClientService.BaseInfos.Store_
+{
+  class StoreList : BaseInfoListPage<Store, IStoreBL>
+  {
+  }
+}
diff --git a/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.xml b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.xml
new file mode 100644
index 0000000..f6f48d1
--- /dev/null
+++ b/B3ClientService.Web/Pages/B3ClientService/BaseInfos/Store_/StoreList.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Select xmlns="urn:XDQuery">
+  <Columns>
+    <Field name="ID"/>
+  </Columns>
+  <From>
+    <DmoClass class="BWP.B3ClientService.BO.Store, B3ClientService"/>
+  </From>
+  <Where>
+    <And>
+      <EQ>
+        <Field name="ID"/>
+        <QBE paramName="ID"/>
+      </EQ>
+      <Contains>
+        <Field name="Code"/>
+        <QBE paramName="Code"/>
+      </Contains>
+      <Or>
+        <Contains>
+          <Field name="Name"/>
+          <QBE paramName="Name"/>
+        </Contains>
+        <Contains>
+          <Field name="Spell"/>
+          <QBE paramName="Name"/>
+        </Contains>
+      </Or>
+      <EQ>
+        <Field name="Stopped"/>
+        <QBE paramName="Stopped"/>
+      </EQ>
+      <EQ>
+        <Field name="IsLocked"/>
+        <QBE paramName="IsLocked"/>
+      </EQ>
+      <Contains>
+        <Field name="Remark"/>
+        <QBE paramName="Remark"/>
+      </Contains>
+    </And>
+  </Where>
+</Select>
diff --git a/B3ClientService/B3ClientService.csproj b/B3ClientService/B3ClientService.csproj
index d5fa8c3..077664d 100644
--- a/B3ClientService/B3ClientService.csproj
+++ b/B3ClientService/B3ClientService.csproj
@@ -109,6 +109,7 @@
     <Compile Include="BL\BaseInfo\ClientGoodsSetBL.cs" />
     <Compile Include="BL\BaseInfo\GoodsBL.cs" />
     <Compile Include="BL\BaseInfo\ProductBatchBL.cs" />
+    <Compile Include="BL\BaseInfo\StoreBL.cs" />
     <Compile Include="BL\BaseInfo\WorkerBL.cs" />
     <Compile Include="BL\BaseInfo\WorkUnitBL.cs" />
     <Compile Include="BL\Bill\CarcassInventoryBL.cs" />
@@ -208,6 +209,7 @@
     <Compile Include="OfflinRpc\GradeAndWeightBL.cs" />
     <Compile Include="OfflinRpc\LoginRpc.cs" />
     <Compile Include="OfflinRpc\SectionStoreDetailRpc.cs" />
+    <Compile Include="OfflinRpc\SegmentInStoreRpc.cs" />
     <Compile Include="OfflinRpc\SegmentProductionRpc.cs" />
     <Compile Include="OfflinRpc\MiniProgramRpc.cs" />
     <Compile Include="Rpcs\BillRpc\BaseInfoRpc.cs" />
diff --git a/B3ClientService/BL/BaseInfo/StoreBL.cs b/B3ClientService/BL/BaseInfo/StoreBL.cs
new file mode 100644
index 0000000..bddc7c0
--- /dev/null
+++ b/B3ClientService/BL/BaseInfo/StoreBL.cs
@@ -0,0 +1,20 @@
+using BWP.B3ClientService.BO;
+using BWP.B3Frameworks.BL;
+using Forks.EnterpriseServices;
+using Forks.EnterpriseServices.BusinessInterfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BWP.B3ClientService.BL
+{
+  [LogicName("仓库")]
+  [BusinessInterface(typeof(StoreBL))]
+  public interface IStoreBL : IBaseInfoBL<Store>
+  { }
+
+  public class StoreBL : BaseInfoBL<Store>, IStoreBL
+  {
+  }
+}
diff --git a/B3ClientService/BO/BaseInfo/Store.cs b/B3ClientService/BO/BaseInfo/Store.cs
index a23f24a..ad59858 100644
--- a/B3ClientService/BO/BaseInfo/Store.cs
+++ b/B3ClientService/BO/BaseInfo/Store.cs
@@ -1,13 +1,21 @@
-using System;
+using Forks.EnterpriseServices;
+using Forks.EnterpriseServices.DataForm;
+using Forks.EnterpriseServices.DomainObjects2;
+using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Text;
 
 namespace BWP.B3ClientService.BO
 {
-  [Serializable]
-  public class Store: BaseInfo
+  [DFClass, Serializable]
+  [LogicName("存货")]
+  public class Store:  B3Frameworks.BO.BaseInfo, B3Frameworks.BO.IWithCodeBaseInfo
   {
-
+    [LogicName("编码")]
+    [DFNotEmpty]
+    [DbColumn(DbType = SqlDbType.NVarChar, AllowNull = false, Unique = true)]
+    public string Code { get; set; }
   }
 }
diff --git a/B3ClientService/BO/Bill/SegmentProductionInfo.cs b/B3ClientService/BO/Bill/SegmentProductionInfo.cs
index 764487d..57be59b 100644
--- a/B3ClientService/BO/Bill/SegmentProductionInfo.cs
+++ b/B3ClientService/BO/Bill/SegmentProductionInfo.cs
@@ -54,9 +54,16 @@ namespace BWP.B3ClientService.BO
     [LogicName("入库时间")]
     [DbColumn(DbType = SqlDbType.DateTime)]
     public DateTime? InStoreTime { get; set; }
+
+    [LogicName("仓库")]
+    public long? Store_ID { get; set; }
     #endregion
 
     #region 领用信息
     #endregion
+
+    public bool IsDelete { get; set; }
+
+    public bool IsSync { get; set; }
   }
 }
diff --git a/B3ClientService/OfflinRpc/BaseInfoRpc.cs b/B3ClientService/OfflinRpc/BaseInfoRpc.cs
index 59d84d7..77b2415 100644
--- a/B3ClientService/OfflinRpc/BaseInfoRpc.cs
+++ b/B3ClientService/OfflinRpc/BaseInfoRpc.cs
@@ -131,6 +131,12 @@ namespace BWP.B3ClientService.Rpcs
       return JsonConvert.SerializeObject(list);
     }
 
+    [Rpc(RpcFlags.SkipAuth)]
+    public static string SyncStore()
+    {
+      return GetBaseInfoJosn<Store>();
+    }
+
     class MinBaseInfo
     {
       public long ID { get; set; }
diff --git a/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs b/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs
new file mode 100644
index 0000000..49e704e
--- /dev/null
+++ b/B3ClientService/OfflinRpc/SegmentInStoreRpc.cs
@@ -0,0 +1,175 @@
+using BWP.B3ClientService.BO;
+using Forks.EnterpriseServices.DomainObjects2;
+using Forks.EnterpriseServices.DomainObjects2.DQuery;
+using Forks.EnterpriseServices.JsonRpc;
+using Forks.EnterpriseServices.SqlDoms;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TSingSoft.WebPluginFramework;
+
+namespace BWP.B3ClientService.Rpcs
+{
+  [Rpc]
+  public static class SegmentInStoreRpc
+  {
+    [Rpc(RpcFlags.SkipAuth)]
+    public static string GetSegmentProductInfo(string barCode)
+    {
+      var main = new JoinAlias(typeof(SegmentProductionInfo));
+      var goods = new JoinAlias(typeof(Goods));
+      var query = new DQueryDom(main);
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(main, "Goods_ID", goods, "ID"));
+      query.Where.Conditions.Add(DQCondition.EQ("BarCode", barCode));
+      query.Columns.Add(DQSelectColumn.Field("Code", goods));
+      query.Columns.Add(DQSelectColumn.Field("Name", goods));
+      query.Columns.Add(DQSelectColumn.Field("Spec", goods));
+      query.Columns.Add(DQSelectColumn.Field("ProductTime"));
+      query.Columns.Add(DQSelectColumn.Field("Weight"));
+      using (var session = Dmo.NewSession())
+      {
+        using (var reader = session.ExecuteReader(query))
+        {
+          if (reader.Read())
+          {
+            var entity = new SegmentProductObj();
+            entity.Goods_Code = (string)reader[0];
+            entity.Goods_Name = (string)reader[1];
+            entity.Goods_Spec = (string)reader[2];
+            entity.ProductTime = (DateTime?)reader[3];
+            entity.Weight = (decimal?)reader[4];
+
+            return JsonConvert.SerializeObject(entity);
+          }
+        }
+      }
+      return string.Empty;
+    }
+
+    [Rpc(RpcFlags.SkipAuth)]
+    public static int UploadSegmentInStoreInfo(string json)
+    {
+      var list = JsonConvert.DeserializeObject<List<SegmentInStoreObj>>(json);
+      using (var session = Dmo.NewSession())
+      {
+        /*  BarCode  InStoreTime  Store_ID State */
+        foreach (var item in list)
+        {
+          var id = Exist(session, item.BarCode);
+          if (id == null)
+          {
+            if (item.Delete)
+              continue;
+            var entity = new SegmentProductionInfo();
+            entity.BarCode = item.BarCode;
+            if (item.State == 2)
+            {
+              entity.InStoreTime = item.InStoreTime;
+              entity.Store_ID = item.Store_ID;
+              entity.IsDelete = true;
+            }
+            else
+            {
+              entity.InStoreTime = item.InStoreTime;
+              entity.Store_ID = item.Store_ID;
+            }
+            session.Insert(entity);
+          }
+          else
+            Update(session, id.Value, item);
+        }
+        session.Commit();
+      }
+      return 1;
+    }
+
+    static long? Exist(IDmoSession session, string barCode)
+    {
+      var query = new DQueryDom(new JoinAlias(typeof(SegmentProductionInfo)));
+      query.Columns.Add(DQSelectColumn.Field("ID"));
+      query.Where.Conditions.Add(DQCondition.EQ("BarCode", barCode));
+      return query.EExecuteScalar<long?>(session);
+    }
+
+    private static void Update(IDmoSession session, long id, SegmentInStoreObj entity)
+    {
+      var update = new DQUpdateDom(typeof(SegmentProductionInfo));
+      if (entity.Delete || entity.State == 2)
+      {
+        update.Columns.Add(new DQUpdateColumn("InStoreTime", DQExpression.NULL));
+        update.Columns.Add(new DQUpdateColumn("Store_ID", DQExpression.NULL));
+        if (entity.State == 2)
+          update.Columns.Add(new DQUpdateColumn("IsDelete", true));
+      }
+      else
+      {
+        update.Columns.Add(new DQUpdateColumn("InStoreTime", entity.InStoreTime));
+        update.Columns.Add(new DQUpdateColumn("Store_ID", entity.Store_ID));
+      }
+      update.Columns.Add(new DQUpdateColumn("IsSync", false));
+      update.Where.Conditions.Add(DQCondition.EQ("ID", id));
+      session.ExecuteNonQuery(update);
+    }
+
+    [Rpc(RpcFlags.SkipAuth)]
+    public static string GetUnInStoreList()
+    {
+      var main = new JoinAlias(typeof(SegmentProductionInfo));
+      var goods = new JoinAlias(typeof(Goods));
+      var query = new DQueryDom(main);
+      query.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(main, "Goods_ID", goods, "ID"));
+      query.Where.Conditions.Add(DQCondition.And(DQCondition.IsNull(DQExpression.Field("InStoreTime")), DQCondition.EQ("IsDelete", false)));
+      query.Columns.Add(DQSelectColumn.Field("BarCode"));
+      query.Columns.Add(DQSelectColumn.Field("Code", goods));
+      query.Columns.Add(DQSelectColumn.Field("Name", goods));
+      query.Columns.Add(DQSelectColumn.Field("Spec", goods));
+      query.Columns.Add(DQSelectColumn.Field("ProductTime"));
+      query.Columns.Add(DQSelectColumn.Field("Weight"));
+      query.OrderBy.Expressions.Add(DQOrderByExpression.Create("ID"));
+      var list = new List<SegmentProductObj>();
+      using (var session = Dmo.NewSession())
+      {
+        using (var reader = session.ExecuteReader(query))
+        {
+          while (reader.Read())
+          {
+            var obj = new SegmentProductObj();
+            obj.BarCode = (string)reader[0];
+            obj.Goods_Code = (string)reader[1];
+            obj.Goods_Name = (string)reader[2];
+            obj.Goods_Spec = (string)reader[3];
+            obj.ProductTime = (DateTime?)reader[4];
+            obj.Weight = (decimal?)reader[5];
+            list.Add(obj);
+          }
+        }
+      }
+      return JsonConvert.SerializeObject(list);
+    }
+  }
+
+  class SegmentInStoreObj
+  {
+    public string BarCode { get; set; }
+
+    public DateTime InStoreTime { get; set; }
+
+    public long? Store_ID { get; set; }
+
+    public int State { get; set; }
+
+    public bool Delete { get; set; }
+  }
+
+  class SegmentProductObj
+  {
+    public string BarCode { get; set; }
+    public string Goods_Name { get; set; }
+    public string Goods_Code { get; set; }
+    public string Goods_Spec { get; set; }
+    public decimal? Weight { get; set; }
+    public DateTime? ProductTime { get; set; }
+  }
+}
diff --git a/B3ClientService/OfflinRpc/SegmentProductionRpc.cs b/B3ClientService/OfflinRpc/SegmentProductionRpc.cs
index 2d0cbc9..eb2fc58 100644
--- a/B3ClientService/OfflinRpc/SegmentProductionRpc.cs
+++ b/B3ClientService/OfflinRpc/SegmentProductionRpc.cs
@@ -33,8 +33,6 @@ namespace BWP.B3ClientService.Rpcs
             entity.BarCode = item.BarCode;
             foreach (var f in ProductInfoFields)
               dmoType.GetProperty(f).SetValue(entity, MinDmoType.GetProperty(f).GetValue(item, null), null);
-            //还没做入库客户端，先这么搞
-            entity.InStoreTime = entity.ProductTime;
             session.Insert(entity);
           }
           else
diff --git a/WebFolder/config/plugins/B3ClientService.plugin b/WebFolder/config/plugins/B3ClientService.plugin
index 07d813c..22ea92e 100644
--- a/WebFolder/config/plugins/B3ClientService.plugin
+++ b/WebFolder/config/plugins/B3ClientService.plugin
@@ -90,6 +90,16 @@
       <Function index="6" name="锁定" />
       <Function index="7" name="解锁" />
     </FunctionGroup>
+    <FunctionGroup name="仓库" roleSchemas="default">
+      <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="解锁" />
+    </FunctionGroup>
     <FunctionGroup name="客户端存货配置" roleSchemas="default">
       <Function index="0" name="访问" />
       <Function index="1" name="新建" />
@@ -128,6 +138,7 @@
     <Menu id="0011" name="MES系统/基础信息/生产批次" roles="B3ClientService.生产批次.访问" url="B3ClientService/BaseInfos/ProductBatch_/ProductBatchList.aspx"/>
     <Menu id="0012" name="MES系统/系统管理/存货配置" roles="B3ClientService.客户端存货配置.访问" url="B3ClientService/BaseInfos/ClientGoodsSet_/ClientGoodsSetList.aspx"/>
     <Menu id="0013" name="MES系统/系统管理/条段配置" roles="B3ClientService.系统管理.条段配置" url="B3ClientService/Bills/SectionConfigPage.aspx"/>
+    <Menu id="0014" name="MES系统/基础信息/仓库" roles="B3ClientService.仓库.访问" url="B3ClientService/BaseInfos/Store_/StoreList.aspx"/>
 
     <Menu id="0020" name="MES系统/业务单据/盘点单" roles="B3ClientService.盘点单.访问" url="B3ClientService/Bills/CarcassInventory_/CarcassInventoryList.aspx"/>