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

wms_temp_code codeqty改为barcode_qty

Browse Source
This commit is contained in:
alex
2023-06-21 16:17:51 +08:00
parent 3817c5ada4
commit 4efafd2f34
3 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs
View File

@@ -42,7 +42,7 @@ public partial class WmsTempCode : BaseEntity<string>
/// <summary> /// <summary>
/// 条码数量 /// 条码数量
/// </summary> /// </summary>
public decimal? codeqty { get; set; } public decimal? barcode_qty { get; set; }
/// <summary> /// <summary>
/// 单位ID /// 单位ID

17
WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
View File

@@ -96,12 +96,12 @@ namespace Tnb.WarehouseMgr
{ {
if (index < codeNum) if (index < codeNum)
{ {
barCode.codeqty = minPacking; barCode.barcode_qty = minPacking;
} }
else else
{ {
if (mod > 0) barCode.codeqty = mod; if (mod > 0) barCode.barcode_qty = mod;
else barCode.codeqty = minPacking; else barCode.barcode_qty = minPacking;
} }
} }
wmsTempCodes.Add(barCode); wmsTempCodes.Add(barCode);
@@ -144,7 +144,7 @@ namespace Tnb.WarehouseMgr
var code = $"{detail.material_code}{detail.code_batch}{no.ToString().PadLeft(4, '0')}"; var code = $"{detail.material_code}{detail.code_batch}{no.ToString().PadLeft(4, '0')}";
barCode.barcode = code; barCode.barcode = code;
barCode.code_batch = detail.code_batch; barCode.code_batch = detail.code_batch;
barCode.codeqty = detail.pr_qty!.Value; barCode.barcode_qty = detail.pr_qty!.Value;
barCode.unit_id = detail.unit_id; barCode.unit_id = detail.unit_id;
barCode.is_lock = 0; barCode.is_lock = 0;
barCode.is_end = "0"; barCode.is_end = "0";
@@ -155,14 +155,5 @@ namespace Tnb.WarehouseMgr
return barCode; return barCode;
} }
/// <summary>
/// 扫码入库
/// </summary>
/// <returns></returns>
[HttpPost]
public async Task SacnBarCodeInStock()
{
}
} }
} }

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

@@ -21,6 +21,7 @@ using Newtonsoft.Json.Linq;
using NPOI.OpenXmlFormats.Vml; using NPOI.OpenXmlFormats.Vml;
using SqlSugar; using SqlSugar;
using Tnb.BasicData.Entities; using Tnb.BasicData.Entities;
using Tnb.Common.Utils;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Attributes; using Tnb.WarehouseMgr.Entities.Attributes;
using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Consts;
@@ -63,7 +64,13 @@ namespace Tnb.WarehouseMgr
OverideFuncs.CreateAsync = ScanCodeInStock; OverideFuncs.CreateAsync = ScanCodeInStock;
} }
private async Task<dynamic> ScanCodeInStock(VisualDevModelDataCrInput input) /// <summary>
/// 扫码入库功能
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
public async Task<dynamic> ScanCodeInStock(VisualDevModelDataCrInput input)
{ {
try try
{ {
@@ -138,6 +145,7 @@ namespace Tnb.WarehouseMgr
ptc.barcode = jo.Value<string>(nameof(WmsPretaskCode.barcode)); ptc.barcode = jo.Value<string>(nameof(WmsPretaskCode.barcode));
ptc.codeqty = jo.Value<int>(nameof(WmsPretaskCode.codeqty)); ptc.codeqty = jo.Value<int>(nameof(WmsPretaskCode.codeqty));
ptc.unit_id = jo.Value<string>(nameof(WmsPretaskCode.unit_id)); ptc.unit_id = jo.Value<string>(nameof(WmsPretaskCode.unit_id));
ptc.code_batch = jo.Value<string>(nameof(WmsPretaskCode.code_batch));
pretaskCodes.Add(ptc); pretaskCodes.Add(ptc);
} }
} }
@@ -191,27 +199,17 @@ namespace Tnb.WarehouseMgr
} }
//生成载具条码记录 //生成载具条码记录
var carryCodes = preTaskUpInput.PreTaskHandleCodes.Adapt<List<WmsCarryCode>>(); var carryCodes = preTaskUpInput.PreTaskHandleCodes.Adapt<List<WmsCarryCode>>();
carryCodes.ForEach(x => carryCodes.ForEach(x =>
{ {
x.id = SnowflakeIdHelper.NextId(); x.id = SnowflakeIdHelper.NextId();
x.is_out = 0; x.is_out = 0;
x.carry_id = input.data[nameof(WmsCarryCode.carry_id)]?.ToString();
}); });
//生成入库申请条码 //生成入库申请条码
var instockDetails = await _db.Queryable<WmsInstockD>() var instockDetails = await _db.Queryable<WmsInstockD>()
.Where(b => b.bill_id == input.data[requireIdField].ToString()) .Where(b => b.bill_id == input.data[requireIdField].ToString())
.ToListAsync(); .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>>(); var items = instockDetails.Adapt<List<WmsInstockCode>>();
@@ -228,11 +226,12 @@ namespace Tnb.WarehouseMgr
var b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch); var b = items.Find(x => x.material_code == materialCode && x.code_batch == codeBatch);
if (b != null) if (b != null)
{ {
b.id = SnowflakeIdHelper.NextId(); var c = DeepCopyHelper<WmsInstockCode>.DeepCopy(b);
b.bill_d_id = instockDetails.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!; c.id = SnowflakeIdHelper.NextId();
b.barcode = jo.Value<string>(nameof(WmsInstockCode.barcode))!; c.bill_d_id = instockDetails.Find(x => x.material_code == materialCode && x.code_batch == codeBatch)?.id!;
b.barcode_qty = jo.Value<int>(nameof(WmsInstockCode.barcode_qty)); c.barcode = jo.Value<string>(nameof(WmsInstockCode.barcode))!;
instockCOdes.Add(b); c.barcode_qty = jo.Value<int>(nameof(WmsInstockCode.barcode_qty));
instockCOdes.Add(c);
} }
} }
} }
@@ -240,7 +239,7 @@ namespace Tnb.WarehouseMgr
await _db.Insertable(carryCodes).ExecuteCommandAsync(); await _db.Insertable(carryCodes).ExecuteCommandAsync();
await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync(); await _db.Insertable(instockCOdes).CallEntityMethod(it => it.Create(orgId)).ExecuteCommandAsync();
await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput, await _wareHouseService.GenInStockTaskHandleAfter(preTaskUpInput,
it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, status = (int)EnumCarryStatus.占用, location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode }, it => new WmsCarryH { carry_code = input.data[nameof(WmsCarryH.carry_code)].ToString()!, is_lock = 1, carry_status = ((int)EnumCarryStatus.占用).ToString(), location_id = preTaskUpInput.CarryStartLocationId, location_code = preTaskUpInput.CarryStartLocationCode },
it => new BasLocation { is_lock = 1, is_use = "1" }); it => new BasLocation { is_lock = 1, is_use = "1" });
if (instockCOdes?.Count > 0) if (instockCOdes?.Count > 0)
{ {