Browse Source

修改。

master
yibo 7 years ago
parent
commit
bcd780173b
9 changed files with 114 additions and 3 deletions
  1. +4
    -0
      B3ClientService.Web/B3ClientService.Web.csproj
  2. +3
    -1
      B3ClientService.Web/PluginClass.cs
  3. +1
    -0
      B3ClientService/B3ClientService.csproj
  4. +3
    -0
      B3ClientService/BO/Bill/CarcassFullInfo.cs
  5. +0
    -2
      B3ClientService/OfflinRpc/CarcassInStoreRpc.cs
  6. +99
    -0
      B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs
  7. +2
    -0
      B3ClientService/OfflinRpc/ExtensionObj.cs
  8. +1
    -0
      WebFolder/config/ioc/B3ClientServiceMenu.txt
  9. +1
    -0
      WebFolder/config/plugins/B3ClientService.plugin

+ 4
- 0
B3ClientService.Web/B3ClientService.Web.csproj View File

@ -39,6 +39,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\BwpB3Project\tsref\Debug\B3Frameworks.Web.dll</HintPath>
</Reference>
<Reference Include="B3System, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a04fa581c0f74d43, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\tsref\Debug\B3System.dll</HintPath>
</Reference>
<Reference Include="Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\BwpB3Project\tsref\Debug\Forks.EnterpriseServices.dll</HintPath>


+ 3
- 1
B3ClientService.Web/PluginClass.cs View File

@ -1,4 +1,5 @@
using BWP.Web.Utils;
using BWP.B3System;
using BWP.Web.Utils;
using System;
using System.Collections.Generic;
using System.Linq;
@ -13,6 +14,7 @@ namespace BWP.B3ClientService
public void OnInit()
{
B3ClientServiceChoiceBoxDataProvider.Register();
SubSystem.RegisterSubSystem(new SubSystem("B3ClientService", "MES系统"));
}
}
}

+ 1
- 0
B3ClientService/B3ClientService.csproj View File

@ -149,6 +149,7 @@
<Compile Include="NamedValueTemplate.cs" />
<Compile Include="OfflinRpc\BaseInfoRpc.cs" />
<Compile Include="OfflinRpc\CarcassInStoreRpc.cs" />
<Compile Include="OfflinRpc\CarcassTakeOutRpc.cs" />
<Compile Include="OfflinRpc\ExtensionObj.cs" />
<Compile Include="OfflinRpc\GradeAndWeightBL.cs" />
<Compile Include="OfflinRpc\LoginRpc.cs" />


+ 3
- 0
B3ClientService/BO/Bill/CarcassFullInfo.cs View File

@ -81,6 +81,9 @@ namespace BWP.B3ClientService.BO
[LogicName("领用人员")]
public long? PickWorker_ID { get; set; }
[LogicName("领用工作单元")]
public long? PickWorkUnit_ID { get; set; }
[LogicName("领用时间")]
public DateTime? PickTime { get; set; }


+ 0
- 2
B3ClientService/OfflinRpc/CarcassInStoreRpc.cs View File

@ -212,8 +212,6 @@ namespace BWP.B3ClientService.Rpcs
class CarcassInStoreObj
{
public long ID { get; set; }
public int RowVersion { get; set; }
public string BarCode { get; set; }
public long? InStoreWorker_ID { get; set; }
public long? WorkUnit_ID { get; set; }


+ 99
- 0
B3ClientService/OfflinRpc/CarcassTakeOutRpc.cs View File

@ -0,0 +1,99 @@
using BWP.B3ClientService.BO;
using BWP.B3ClientService.NamedValueTemplate;
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.OfflinRpc
{
[Rpc]
public static class CarcassTakeOutRpc
{
[Rpc(RpcFlags.SkipAuth)]
public static int UploadCarcassInfo(string json)
{
var list = JsonConvert.DeserializeObject<List<CarcassTakeOutObj>>(json);
using (var session = Dmo.NewSession())
{
foreach (var item in list)
{
var id = GetID(item.BarCode, session);
if (id.HasValue)
Update(id.Value, item, session);
else
Insert(item, session);
}
session.Commit();
}
return 1;
}
static long? GetID(string code, IDmoSession session)
{
var query = new DQueryDom(new JoinAlias(typeof(CarcassFullInfo)));
query.Columns.Add(DQSelectColumn.Field("ID"));
query.Where.Conditions.Add(DQCondition.EQ("BarCode", code));
return query.EExecuteScalar<long?>(session);
}
static void Update(long id, CarcassTakeOutObj obj, IDmoSession session)
{
var update = new DQUpdateDom(typeof(CarcassFullInfo));
update.Columns.Add(new DQUpdateColumn("PickWorker_ID", obj.TakeOutWorker_ID));
update.Columns.Add(new DQUpdateColumn("PickWorkUnit_ID", obj.WorkUnit_ID));
update.Columns.Add(new DQUpdateColumn("PickGroupID", obj.GroupID));
update.Columns.Add(new DQUpdateColumn("PickWeight", obj.Weight));
update.Columns.Add(new DQUpdateColumn("PickTime", obj.Time));
update.Columns.Add(new DQUpdateColumn("PickType", .));
update.Where.Conditions.Add(DQCondition.EQ("ID", id));
session.ExecuteNonQuery(update);
}
static void Insert(CarcassTakeOutObj obj, IDmoSession session)
{
var entity = new CarcassFullInfo();
entity.BarCode = obj.BarCode;
entity.PickWorker_ID = obj.TakeOutWorker_ID;
entity.PickWorkUnit_ID = obj.WorkUnit_ID;
entity.PickWeight = obj.Weight;
entity.PickGroupID = obj.GroupID;
entity.PickTime = obj.Time;
entity.PickType = .;
session.Insert(entity);
}
[Rpc(RpcFlags.SkipAuth)]
public static string GetBeforeInfo(List<string> codeList)
{
var main = new JoinAlias(typeof(CarcassFullInfo));
var goods = new JoinAlias(typeof(Goods));
var query = new DQueryDom(main);
query.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(main, "InStoreGoods_ID", goods, "ID"));
query.Columns.Add(DQSelectColumn.Field("BarCode"));
query.Columns.Add(DQSelectColumn.Field("InStoreWeight"));
query.Columns.Add(DQSelectColumn.Field("InStoreGoods_ID"));
query.Columns.Add(DQSelectColumn.Field("Name", goods));
query.Where.Conditions.Add(DQCondition.And(DQCondition.IsNotNull(DQExpression.Field("InStoreWeight")), DQCondition.InList(DQExpression.Field("BarCode"), codeList.Select(x => DQExpression.Value(x)).ToArray())));
var result = query.EExecuteList<string, decimal, long, string>();
var back = result.Select(x => new ExtensionObj { StringExt1 = x.Item1, DecimalExt1 = x.Item2, LongExt1 = x.Item3, StringExt2 = x.Item4 });
return JsonConvert.SerializeObject(back);
}
}
class CarcassTakeOutObj
{
public string BarCode { get; set; }
public long? TakeOutWorker_ID { get; set; }
public long? WorkUnit_ID { get; set; }
public decimal? Weight { get; set; }
public DateTime? Time { get; set; }
public long? GroupID { get; set; }
}
}

+ 2
- 0
B3ClientService/OfflinRpc/ExtensionObj.cs View File

@ -14,5 +14,7 @@ namespace BWP.B3ClientService.BO
public decimal? DecimalExt1 { get; set; }
public string StringExt1 { get; set; }
public string StringExt2 { get; set; }
}
}

+ 1
- 0
WebFolder/config/ioc/B3ClientServiceMenu.txt View File

@ -0,0 +1 @@
DisplayName=MES系统菜单

+ 1
- 0
WebFolder/config/plugins/B3ClientService.plugin View File

@ -8,6 +8,7 @@
<File name="B3ClientService.Web.dll" type="web"/>
</Assemblies>
<ContentFiles>
<File name="config/ioc/B3ClientServiceMenu.txt"/>
</ContentFiles>
<Profiles>
</Profiles>


Loading…
Cancel
Save