chenjingyong
/
DSWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

初始化和入库执行视图

Browse Source
temp
ddlucky 2 years ago
parent a50fe8760d
commit a488ddb1ac
6 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File

11
Vue.Net/VOL.Entity/DomainModels/WMS/VW_OP_WMS_IMPORT.cs
Unescape Escape View File

@ -125,7 +125,7 @@ namespace VOL.Entity.DomainModels
/// <summary>
///操作
/// </summary>
[Display(Name ="操作")]
[Display(Name ="库管")]
[MaxLength(150)]
[Column(TypeName="varchar(150)")]
public string OPNAME { get; set; }
@ -232,5 +232,14 @@ namespace VOL.Entity.DomainModels
[MaxLength(50)]
[Column(TypeName = "varchar(50)")]
public string KINDPKGS { get; set; }
/// <summary>
///操作
/// </summary>
[Display(Name = "操作")]
[MaxLength(150)]
[Column(TypeName = "varchar(150)")]
public string SALENAME { get; set; }
}
}

2
Vue.Net/VOL.Entity/DomainModels/WMSINDO/OP_WMS_IN_DO.cs
Unescape Escape View File

@ -261,5 +261,7 @@ namespace VOL.Entity.DomainModels
[Editable(true)]
[Column(TypeName = "varchar(50)")]
public string WMSWORKTYPE { get; set; }
}
}

9
Vue.Net/VOL.Entity/DomainModels/WMSINDO/VW_OP_WMS_IN_DO.cs
Unescape Escape View File

@ -360,6 +360,15 @@ namespace VOL.Entity.DomainModels
[Column(TypeName = "varchar(50)")]
public string WMSWORKTYPE { get; set; }
/// <summary>
///主键ID
/// </summary>
[Key]
[Display(Name = "SALE")]
[Column(TypeName = "uniqueidentifier")]
public Guid? SALE { get; set; }
public decimal NETWEIGHT_TON { get { return NETWEIGHT / 1000; } }
public decimal KGS_TON { get { return KGS / 1000; } }
}

8
Vue.Net/VOL.WMS/Services/WMS/Partial/VW_OP_WMS_IMPORTService.cs
Unescape Escape View File

@ -256,7 +256,7 @@ namespace VOL.WMS.Services
public override WebResponseContent Import(List<IFormFile> files)
{
DownLoadTemplateColumns = x => new { x.CUSTOMERNAME,x.GOODSOWNER,x.GOODSNAME,x.MBLNO,x.CNTRNO,x.CUSTOMNO,x.PKGS,x.KGS,x.CBM,x.NETWEIGHT,x.STORAGEUNIT,x.STORAGEUNITCOUNT,x.RULEUNIT,x.RULEUNITCOUNT,x.INDATE,x.OPNAME,x.ACCBOOKNO,x.STORAGENAME,x.AREANAME,x.GOODSMODEL,x.GOODSHSCODE,x.COUNTRY,x.RULEAMOUNT,x.REMARK,x.KINDPKGS,x.PALLET };
DownLoadTemplateColumns = x => new { x.CUSTOMERNAME,x.GOODSOWNER,x.GOODSNAME,x.MBLNO,x.CNTRNO,x.CUSTOMNO,x.PKGS,x.KGS,x.CBM,x.NETWEIGHT,x.STORAGEUNIT,x.STORAGEUNITCOUNT,x.RULEUNIT,x.RULEUNITCOUNT,x.INDATE,x.OPNAME,x.ACCBOOKNO,x.STORAGENAME,x.AREANAME,x.GOODSMODEL,x.GOODSHSCODE,x.COUNTRY,x.RULEAMOUNT,x.REMARK,x.KINDPKGS,x.PALLET,x.SALENAME };
var WmsImportList = base.GetListByExcel(files,out WebResponseContent _webResponseContent);
@ -378,7 +378,7 @@ namespace VOL.WMS.Services
}
var 入库计划 = get入库计划(goods, 仓库List);
var 入库计划 = get入库计划(goods, 仓库List, 库管List);
var 入库计划明细 = get入库计划明细(入库计划, goods);
入库计划明细List.Add(入库计划明细);
@ -546,7 +546,7 @@ namespace VOL.WMS.Services
return result;
}
private OP_WMS_IN_PLAN get入库计划( VW_OP_WMS_IMPORT detail, List<OP_WMS_STOREHOUSE> 仓库List)
private OP_WMS_IN_PLAN get入库计划( VW_OP_WMS_IMPORT detail, List<OP_WMS_STOREHOUSE> 仓库List, List<Sys_DictionaryList> userlist)
{
var result = new OP_WMS_IN_PLAN();
@ -591,6 +591,8 @@ namespace VOL.WMS.Services
result.REMARK = detail.REMARK;
result.SALE = getuserid(detail.SALENAME, userlist);
return result;
}

34
Vue.Net/VOL.WMS/Services/WMSINDO/Partial/VW_OP_WMS_IN_DOService.cs
Unescape Escape View File

@ -54,19 +54,33 @@ namespace VOL.WMS.Services
{
//如果该用户被限制于本公司 则必须
if (UserContext.Current.UserInfo.LimitInCompany)
{
//IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();
//if (UserContext.Current.UserInfo.LimitInCompany)
//{
// //IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();
queryable = queryable.Where(x => x.CORPID == UserContext.Current.UserInfo.CompanyId);
}
// queryable = queryable.Where(x => x.CORPID == UserContext.Current.UserInfo.CompanyId);
//}
//如果该用户角色受仓库权限限制 ，则必须
if (UserContext.Current.UserInfo.LimitBySTORAGE)
{
//IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();
////如果该用户角色受仓库权限限制 ，则必须
//if (UserContext.Current.UserInfo.LimitBySTORAGE)
//{
// //IQueryable<string> userQuery = RoleContext.GetCurrentAllChildUser();
queryable = queryable.Where(x => UserContext.Current.UserInfo.STOREHOUSEList.Contains(x.STOREHOUSE) || (x.STOREHOUSE == "" || x.STOREHOUSE == null));
// queryable = queryable.Where(x => UserContext.Current.UserInfo.STOREHOUSEList.Contains(x.STOREHOUSE) || (x.STOREHOUSE == "" || x.STOREHOUSE == null));
//}
var list = queryable.DataFilter();
if (list[0] != null && list[0].Count > 0)
{
queryable = queryable.Where(list[0].AsExpression<VW_OP_WMS_IN_DO>(Query.Condition.AndAlso));
}
if (list[1] != null && list[1].Count > 0)
{
queryable = queryable.Where(list[1].AsExpression<VW_OP_WMS_IN_DO>(Query.Condition.OrElse));
}
if (list[2] != null && list[2].Count > 0)
{
queryable = queryable.Where(list[2].AsExpression<VW_OP_WMS_IN_DO>(Query.Condition.OrElse));
}
return queryable;

4
Vue.Net/VOL.WebApi/appsettings.json
Unescape Escape View File

@ -19,7 +19,7 @@
//"DbConnectionString": "Data Source=192.168.2.151,11433;Initial Catalog=DSWMS;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=47.105.53.126,12356;Initial Catalog=DSWMS_Dev;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//虚拟机1开发库
//"DbConnectionString": "Data Source=60.209.125.238,52314;Initial Catalog=shippingweb1;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
"DbConnectionString": "Data Source=60.209.125.238,52314;Initial Catalog=shippingweb1;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=60.209.125.238,26600;Initial Catalog=ShippingWeb_DJZ;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//销售演示库
//"DbConnectionString": "Data Source=60.209.125.238,52314;Initial Catalog=ShippingWeb1;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
@ -63,7 +63,7 @@
//"DbConnectionString": "Data Source=36.112.133.3,53076;Initial Catalog=ShippingWeb_JLWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//金港
"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_JGZHWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//"DbConnectionString": "Data Source=47.104.253.169,62356;Initial Catalog=ShippingWeb_JGZHWL;Persist Security Info=True;User ID=sa;Password=Ds20040201;Connect Timeout=500;",
//mysql连接字符串(升级EFCore3.1到时已将mysql连接字符串修改,2019-12-20)

Write Preview
Loading…
Cancel
Save