wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入库申请代码调整，WmsInstockD line_status改为string类型

Browse Source
This commit is contained in:
张涛
2023-06-20 20:18:25 +08:00
parent ed75869276
commit 99d89cc12d
6 changed files with 258 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAInStockService.cs
View File

@@ -78,9 +78,9 @@ namespace Tnb.WarehouseMgr
var endLocations = await _wareHouseService.InStockStrategy(inStockStrategyInput);
WmsPointH sPoint = null;
WmsPointH ePoint = null;
if (input.data.ContainsKey(nameof(WmsPointH.location_id)))
if (input.data.ContainsKey(nameof(WmsHandleH.startlocation_id)))
{
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsPointH.location_id)].ToString());
sPoint = await _db.Queryable<WmsPointH>().FirstAsync(it => it.location_id == input.data[nameof(WmsHandleH.startlocation_id)].ToString());
}
if (endLocations?.Count > 0)
{
@@ -149,7 +149,7 @@ namespace Tnb.WarehouseMgr
var requireCodeField = "require_code";
var preTaskUpInput = new GenPreTaskUpInput();
preTaskUpInput.RquireId = input.data["ReturnIdentity"].ToString();
preTaskUpInput.RquireId = input.data[nameof(WmsHandleH.require_id)].ToString();
preTaskUpInput.CarryId = input.data[nameof(WmsCarryD.carry_id)]?.ToString()!;
preTaskUpInput.CarryStartLocationId = points.FirstOrDefault().location_id;
preTaskUpInput.CarryStartLocationCode = points.FirstOrDefault().location_code;
@@ -200,7 +200,22 @@ namespace Tnb.WarehouseMgr
var instockDetails = await _db.Queryable<WmsInstockD>()
.Where(b => b.bill_id == input.data[requireIdField].ToString())
.ToListAsync();
//var instockProps = typeof(WmsInstockD).GetProperties().Select(p => p.Name).ToList();
//var instockCodeProps = typeof(WmsInstockCode).GetProperties().Select(p => p.Name).ToList();
//var ssss = instockCodeProps.Intersect(instockProps).ToList();
//var instockTypes = typeof(WmsInstockD).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList();
//var instockCodeTypes = typeof(WmsInstockCode).GetProperties().Where(p => ssss.Contains(p.Name)).Select(p => p.PropertyType.Name).ToList();
//var dddf = instockTypes.Except(instockCodeTypes).ToList();
//var ddd = instockDetails[0].Adapt<WmsInstockCode>();
//org_id,bill_id,line_status,material_id,material_code,code_batch,unit_id,unit_code,source_id,
// source_code,source_type,source_line,source_detail_id,remark,extras,time_stamp,create_id,
// create_time,modify_id,modify_time,mo_code,mo_line,mo_bom_detail_id,id
var items = instockDetails.Adapt<List<WmsInstockCode>>();
items.ForEach(it => it.org_id = _userManager.User.OrganizeId);
List<WmsInstockCode> instockCOdes = new();
jArr = JArray.Parse(input.data["tablefield115"].ToString()!);
if (jArr?.Children().Count() > 0)