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

转库单同步调整 库存报表调整

Browse Source
This commit is contained in:
马健
2024-07-18 12:31:05 +08:00
parent 7f7f21c271
commit 5666f0262e
5 changed files with 114 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryStockReportH.cs
View File

@@ -9,7 +9,7 @@ namespace Tnb.WarehouseMgr.Entities;
/// </summary> /// </summary>
public partial class WmsCarryStockReport public partial class WmsCarryStockReport
{ {
public int 序号 { get; set; } public int index { get; set; }
///// <summary> ///// <summary>
///// 所属组织 ///// 所属组织
///// </summary> ///// </summary>
@@ -23,22 +23,22 @@ public partial class WmsCarryStockReport
/// <summary> /// <summary>
/// 载具编码 /// 载具编码
/// </summary> /// </summary>
public string? 载具编码 { get; set; } public string? carry_code { get; set; }
/// <summary> /// <summary>
/// 载具名称 /// 载具名称
/// </summary> /// </summary>
public string? 载具名称 { get; set; } public string? carry_name { get; set; }
/// <summary> /// <summary>
/// 子载具编码 /// 子载具编码
/// </summary> /// </summary>
public string? 子载具编码 { get; set; } public string? membercarry_code { get; set; }
/// <summary> /// <summary>
/// 子载具名称 /// 子载具名称
/// </summary> /// </summary>
public string? 子载具名称 { get; set; } public string? membercarry_name { get; set; }
/// <summary> /// <summary>
/// 物料ID /// 物料ID
@@ -48,77 +48,77 @@ public partial class WmsCarryStockReport
/// <summary> /// <summary>
/// 物料编码 /// 物料编码
/// </summary> /// </summary>
public string? 物料编码 { get; set; } public string? material_code { get; set; }
/// <summary> /// <summary>
/// 物料名称 /// 物料名称
/// </summary> /// </summary>
public string? 物料名称 { get; set; } public string? material_name { get; set; }
/// <summary> /// <summary>
/// 仓库名称 /// 仓库名称
/// </summary> /// </summary>
public string? 仓库名称 { get; set; } public string? warehouse_name { get; set; }
/// <summary> /// <summary>
/// 库位编码 /// 库位编码
/// </summary> /// </summary>
public string? 库位编码 { get; set; } public string? location_code { get; set; }
/// <summary> /// <summary>
/// 库位名称 /// 库位名称
/// </summary> /// </summary>
public string? 库位名称 { get; set; } public string? location_name { get; set; }
/// <summary> /// <summary>
/// 载具状态 /// 载具状态
/// </summary> /// </summary>
public string? 载具状态 { get; set; } public string? carry_status { get; set; }
/// <summary> /// <summary>
/// 库位状态 /// 库位状态
/// </summary> /// </summary>
public string? 库位状态 { get; set; } public string? location_status { get; set; }
/// <summary> /// <summary>
/// 载具类型 /// 载具类型
/// </summary> /// </summary>
public string? 载具类型 { get; set; } public string? carry_type { get; set; }
/// <summary> /// <summary>
/// 入库时间 /// 入库时间
/// </summary> /// </summary>
public string? 入库时间 { get; set; } public string? instock_time { get; set; }
/// <summary> /// <summary>
/// 条码 /// 条码
/// </summary> /// </summary>
public string? 条码 { get; set; } public string? barcode { get; set; }
/// <summary> /// <summary>
/// 批次 /// 批次
/// </summary> /// </summary>
public string? 批次 { get; set; } public string? code_batch { get; set; }
/// <summary> /// <summary>
/// 数量 /// 数量
/// </summary> /// </summary>
public decimal? 数量 { get; set; } public decimal? qty { get; set; }
/// <summary> /// <summary>
/// 单位 /// 单位
/// </summary> /// </summary>
public string? 单位 { get; set; } public string? unit { get; set; }
/// <summary> /// <summary>
/// 操作用户 /// 操作用户
/// </summary> /// </summary>
public string? 操作用户 { get; set; } public string? creator { get; set; }
/// <summary> /// <summary>
/// 绑定时间 /// 绑定时间
/// </summary> /// </summary>
public string? 绑定时间 { get; set; } public string? bind_time { get; set; }
} }
@@ -127,7 +127,7 @@ public partial class WmsCarryStockReport
/// </summary> /// </summary>
public partial class WmsCarryStockReportH public partial class WmsCarryStockReportH
{ {
public int 序号 { get; set; } public int index { get; set; }
///// <summary> ///// <summary>
///// 所属组织 ///// 所属组织
///// </summary> ///// </summary>
@@ -141,47 +141,47 @@ public partial class WmsCarryStockReportH
/// <summary> /// <summary>
/// 载具编码 /// 载具编码
/// </summary> /// </summary>
public string? 载具编码 { get; set; } public string? carry_code { get; set; }
/// <summary> /// <summary>
/// 载具名称 /// 载具名称
/// </summary> /// </summary>
public string? 载具名称 { get; set; } public string? carry_name { get; set; }
/// <summary> /// <summary>
/// 仓库名称 /// 仓库名称
/// </summary> /// </summary>
public string? 仓库名称 { get; set; } public string? warehouse_name { get; set; }
/// <summary> /// <summary>
/// 库位编码 /// 库位编码
/// </summary> /// </summary>
public string? 库位编码 { get; set; } public string? location_code { get; set; }
/// <summary> /// <summary>
/// 库位名称 /// 库位名称
/// </summary> /// </summary>
public string? 库位名称 { get; set; } public string? location_name { get; set; }
/// <summary> /// <summary>
/// 载具状态 /// 载具状态
/// </summary> /// </summary>
public string? 载具状态 { get; set; } public string? carry_status { get; set; }
/// <summary> /// <summary>
/// 库位状态 /// 库位状态
/// </summary> /// </summary>
public string? 库位状态 { get; set; } public string? location_status { get; set; }
/// <summary> /// <summary>
/// 载具类型 /// 载具类型
/// </summary> /// </summary>
public string? 载具类型 { get; set; } public string? carry_type { get; set; }
/// <summary> /// <summary>
/// 入库时间 /// 入库时间
/// </summary> /// </summary>
public string? 入库时间 { get; set; } public string? instock_time { get; set; }
public List<WmsCarryStockReportCode> Details { get; set; } public List<WmsCarryStockReportCode> Details { get; set; }
} }
@@ -192,7 +192,7 @@ public partial class WmsCarryStockReportH
/// </summary> /// </summary>
public partial class WmsCarryStockReportCode public partial class WmsCarryStockReportCode
{ {
public int 序号 { get; set; } public int index { get; set; }
///// <summary> ///// <summary>
///// 载具ID ///// 载具ID
///// </summary> ///// </summary>
@@ -201,12 +201,12 @@ public partial class WmsCarryStockReportCode
/// <summary> /// <summary>
/// 载具编码 /// 载具编码
/// </summary> /// </summary>
public string? 载具编码 { get; set; } public string? carry_code { get; set; }
/// <summary> /// <summary>
/// 载具名称 /// 载具名称
/// </summary> /// </summary>
public string? 载具名称 { get; set; } public string? carry_name { get; set; }
///// <summary> ///// <summary>
///// 物料ID ///// 物料ID
@@ -216,32 +216,32 @@ public partial class WmsCarryStockReportCode
/// <summary> /// <summary>
/// 物料编号 /// 物料编号
/// </summary> /// </summary>
public string? 物料编号 { get; set; } public string? material_code { get; set; }
/// <summary> /// <summary>
/// 物料名称 /// 物料名称
/// </summary> /// </summary>
public string? 物料名称 { get; set; } public string? material_name { get; set; }
/// <summary> /// <summary>
/// 条码编号 /// 条码编号
/// </summary> /// </summary>
public string? 条码 { get; set; } public string? barcode { get; set; }
/// <summary> /// <summary>
/// 批次 /// 批次
/// </summary> /// </summary>
public string? 批次 { get; set; } public string? code_batch { get; set; }
/// <summary> /// <summary>
/// 条码数量 /// 条码数量
/// </summary> /// </summary>
public decimal? 数量 { get; set; } public decimal? qty { get; set; }
/// <summary> /// <summary>
/// 单位 /// 单位
/// </summary> /// </summary>
public string? 单位 { get; set; } public string? unit { get; set; }
///// <summary> ///// <summary>
///// 操作用户 ///// 操作用户
@@ -251,7 +251,7 @@ public partial class WmsCarryStockReportCode
/// <summary> /// <summary>
/// 绑定时间 /// 绑定时间
/// </summary> /// </summary>
public string? 绑定时间 { get; set; } public string? bind_time { get; set; }
} }

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

@@ -4,6 +4,7 @@ using JNPF.Common.Enums;
using JNPF.DependencyInjection; using JNPF.DependencyInjection;
using JNPF.DynamicApiController; using JNPF.DynamicApiController;
using JNPF.FriendlyException; using JNPF.FriendlyException;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System; using JNPF.Systems.Interfaces.System;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Forms; using Microsoft.AspNetCore.Components.Forms;
@@ -13,6 +14,7 @@ using Newtonsoft.Json;
using NPOI.SS.Formula.Functions; using NPOI.SS.Formula.Functions;
using SqlSugar; using SqlSugar;
using Tnb.BasicData.Entities; using Tnb.BasicData.Entities;
using Tnb.ProductionMgr.Entities.Entity;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts; using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto.ErpInputs; using Tnb.WarehouseMgr.Entities.Dto.ErpInputs;
@@ -511,7 +513,6 @@ namespace Tnb.WarehouseMgr
WmsMaterialTransferD wmsMaterialTransferD = new WmsMaterialTransferD(); WmsMaterialTransferD wmsMaterialTransferD = new WmsMaterialTransferD();
wmsMaterialTransferD.lineno = detail.lineno; wmsMaterialTransferD.lineno = detail.lineno;
wmsMaterialTransferD.material_code = detail.material_code; wmsMaterialTransferD.material_code = detail.material_code;
wmsMaterialTransferD.unit_code = detail.unit_code;
wmsMaterialTransferD.code_batch = detail.code_batch; wmsMaterialTransferD.code_batch = detail.code_batch;
wmsMaterialTransferD.station_code = detail.station_code; wmsMaterialTransferD.station_code = detail.station_code;
wmsMaterialTransferD.qty = detail.qty; wmsMaterialTransferD.qty = detail.qty;
@@ -526,8 +527,20 @@ namespace Tnb.WarehouseMgr
{ {
wmsMaterialTransferD.material_id = material.id; wmsMaterialTransferD.material_id = material.id;
wmsMaterialTransferD.material_specification = material.material_specification; wmsMaterialTransferD.material_specification = material.material_specification;
wmsMaterialTransferD.unit_id = detail.unit_code;
} }
var erpExtendField = await db.Queryable<ErpExtendField>().InnerJoin<DictionaryDataEntity>((a, b) => a.table_id == b.Id).Where((a, b) => a.cunitid == detail.unit_code).Select((a, b) => b).FirstAsync();
if (erpExtendField != null)
{
wmsMaterialTransferD.unit_id = erpExtendField.Id;
wmsMaterialTransferD.unit_code = erpExtendField.EnCode;
}
else
{
_LoggerErp2Mes.LogWarning($@"【MaterialTransfer】表体明细中单位{detail.unit_code}在wms系统中未找到！");
throw new AppFriendlyException($@"表体明细中单位{detail.unit_code}在wms系统中未找到！", 500);
}
wmsMaterialTransferDs.Add(wmsMaterialTransferD); wmsMaterialTransferDs.Add(wmsMaterialTransferD);
} }

4
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -669,12 +669,12 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException("点位" + input.targetName + "不存在", 500); throw new AppFriendlyException("点位" + input.targetName + "不存在", 500);
} }
string data = await _redisData.GetHash(strs[0], strs[1]); string data = await _redisData.GetHash(strs[0], strs[1]);
Logger.Information("联核请求CheckPut接口查询X2Server数据:" + data); Logger.Information("wcs请求CheckPut接口查询X2Server数据:" + data);
JObject? res = JsonConvert.DeserializeObject<JObject>(data); JObject? res = JsonConvert.DeserializeObject<JObject>(data);
bool result = res != null && res["Value"] != null ? res.Value<bool>("Value") : false; bool result = res != null && res["Value"] != null ? res.Value<bool>("Value") : false;
if (!result) if (!result)
throw new AppFriendlyException("点位" + input.targetName + "不可放", 500); throw new AppFriendlyException("点位" + input.targetName + "不可放", 500);
Logger.Information("联核请求CheckPut接口结果：CTU可放货" + data); Logger.Information("wcs请求CheckPut接口结果：CTU可放货" + data);
} }
/// <summary> /// <summary>

101
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryStockReportService.cs
View File

@@ -34,10 +34,7 @@ namespace Tnb.WarehouseMgr
_userManager = userManager; _userManager = userManager;
} }
/// <summary> [HttpPost]
/// 转库单
/// </summary>
[HttpPost, NonUnify, AllowAnonymous]
public async Task<dynamic> CarryStock(CarryStockInput input) public async Task<dynamic> CarryStock(CarryStockInput input)
{ {
var warehouse_id = ""; var warehouse_id = "";
@@ -66,25 +63,25 @@ namespace Tnb.WarehouseMgr
.OrderByDescending((a, b, c, d, e, f) => b.carry_code) .OrderByDescending((a, b, c, d, e, f) => b.carry_code)
.Select((a, b, c, d, e, f) => new WmsCarryStockReport .Select((a, b, c, d, e, f) => new WmsCarryStockReport
{ {
仓库名称 = c.whname, warehouse_name = c.whname,
carry_id = b.id, carry_id = b.id,
载具编码 = string.IsNullOrEmpty(b.carry_code) ? "空托盘堆垛" : b.carry_code, carry_code = string.IsNullOrEmpty(b.carry_code) ? "空托盘堆垛" : b.carry_code,
载具名称 = string.IsNullOrEmpty(b.carry_code) ? "空托盘堆垛" : b.carry_name, carry_name = string.IsNullOrEmpty(b.carry_code) ? "空托盘堆垛" : b.carry_name,
载具状态 = b.is_lock == 1 ? "锁定" : "未锁定", carry_status = b.is_lock == 1 ? "锁定" : "未锁定",
载具类型 = d.carrystd_name, carry_type = d.carrystd_name,
库位编码 = a.location_code, location_code = a.location_code,
库位名称 = a.location_name, location_name = a.location_name,
库位状态 = b.is_lock == 1 ? "锁定" : "未锁定", location_status = b.is_lock == 1 ? "锁定" : "未锁定",
入库时间 = b.instock_time != null ? b.instock_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", instock_time = b.instock_time != null ? b.instock_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
条码 = e.barcode, barcode = e.barcode,
批次 = e.code_batch, code_batch = e.code_batch,
数量 = e.codeqty, qty = e.codeqty,
material_id = e.material_id, material_id = e.material_id,
物料编码 = e.material_code, material_code = e.material_code,
物料名称 = f.name, material_name = f.name,
单位 = e.unit_id, unit = e.unit_id,
操作用户 = e.create_id, creator = e.create_id,
绑定时间 = e.create_time != null ? e.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" bind_time = e.create_time != null ? e.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
}) })
.ToListAsync(); .ToListAsync();
@@ -104,27 +101,27 @@ namespace Tnb.WarehouseMgr
.WhereIF(!string.IsNullOrEmpty(material_id), (a, b, c, d, e, f, g) => g.id == material_id) .WhereIF(!string.IsNullOrEmpty(material_id), (a, b, c, d, e, f, g) => g.id == material_id)
.Select((a, b, c, d, e, f, g, h) => new WmsCarryStockReport .Select((a, b, c, d, e, f, g, h) => new WmsCarryStockReport
{ {
仓库名称 = c.whname, warehouse_name = c.whname,
carry_id = b.id, carry_id = b.id,
载具编码 = b.carry_code, carry_code = b.carry_code,
载具名称 = b.carry_name, carry_name = b.carry_name,
子载具编码 = h.carry_code, membercarry_code = h.carry_code,
子载具名称 = h.carry_name, membercarry_name = h.carry_name,
载具状态 = b.is_lock == 1 ? "锁定" : "未锁定", carry_status = b.is_lock == 1 ? "锁定" : "未锁定",
载具类型 = d.carrystd_name, carry_type = d.carrystd_name,
库位编码 = a.location_code, location_code = a.location_code,
库位名称 = a.location_name, location_name = a.location_name,
库位状态 = b.is_lock == 1 ? "锁定" : "未锁定", location_status = b.is_lock == 1 ? "锁定" : "未锁定",
入库时间 = b.instock_time != null ? b.instock_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", instock_time = b.instock_time != null ? b.instock_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
条码 = f.barcode, barcode = f.barcode,
批次 = f.code_batch, code_batch = f.code_batch,
数量 = f.codeqty, qty = f.codeqty,
material_id = f.material_id, material_id = f.material_id,
物料编码 = f.material_code, material_code = f.material_code,
物料名称 = g.name, material_name = g.name,
单位 = f.unit_id, unit = f.unit_id,
操作用户 = f.create_id, creator = f.create_id,
绑定时间 = f.create_time != null ? f.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : "" bind_time = f.create_time != null ? f.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
}) })
.ToListAsync(); .ToListAsync();
@@ -138,7 +135,7 @@ namespace Tnb.WarehouseMgr
_ = storeMap.TryGetValue(itGroup.Key, out WmsCarryStockReport? report); _ = storeMap.TryGetValue(itGroup.Key, out WmsCarryStockReport? report);
WmsCarryStockReportH stockReport = report.Adapt<WmsCarryStockReportH>(); WmsCarryStockReportH stockReport = report.Adapt<WmsCarryStockReportH>();
if (report.载具编码 != "空托盘堆垛") if (report.carry_code != "空托盘堆垛")
{ {
List<WmsCarryStockReport> curCarryCodes = items.FindAll(x => x.carry_id == itGroup.Key.carry_id); List<WmsCarryStockReport> curCarryCodes = items.FindAll(x => x.carry_id == itGroup.Key.carry_id);
@@ -148,19 +145,19 @@ namespace Tnb.WarehouseMgr
{ {
index++; index++;
WmsCarryStockReportCode wmsCarryStockReportCode = new(); WmsCarryStockReportCode wmsCarryStockReportCode = new();
wmsCarryStockReportCode.序号 = index; wmsCarryStockReportCode.index = index;
//wmsCarryStockReportCode.carry_id = x.carry_id; //wmsCarryStockReportCode.carry_id = x.carry_id;
wmsCarryStockReportCode.载具编码 = !string.IsNullOrEmpty(x.子载具编码) ? x.子载具编码 : x.载具编码; wmsCarryStockReportCode.carry_code = !string.IsNullOrEmpty(x.membercarry_code) ? x.membercarry_code : x.carry_code;
wmsCarryStockReportCode.载具名称 = !string.IsNullOrEmpty(x.子载具名称) ? x.子载具名称 : x.载具名称; wmsCarryStockReportCode.carry_name = !string.IsNullOrEmpty(x.membercarry_name) ? x.membercarry_name : x.carry_name;
//wmsCarryStockReportCode.material_id = x.material_id; //wmsCarryStockReportCode.material_id = x.material_id;
wmsCarryStockReportCode.物料编号 = x.物料编码; wmsCarryStockReportCode.material_code = x.material_code;
wmsCarryStockReportCode.物料名称 = x.物料编码; wmsCarryStockReportCode.material_name = x.material_name;
wmsCarryStockReportCode.条码 = x.条码; wmsCarryStockReportCode.barcode = x.barcode;
wmsCarryStockReportCode.批次 = x.批次; wmsCarryStockReportCode.code_batch = x.code_batch;
wmsCarryStockReportCode.数量 = x.数量; wmsCarryStockReportCode.qty = x.qty;
wmsCarryStockReportCode.单位 = x.单位; wmsCarryStockReportCode.unit = x.unit;
//wmsCarryStockReportCode.创建用户 = x.操作用户; //wmsCarryStockReportCode.创建用户 = x.操作用户;
wmsCarryStockReportCode.绑定时间 = x.绑定时间; wmsCarryStockReportCode.bind_time = x.bind_time;
wmsCarryStockReportCodes.Add(wmsCarryStockReportCode); wmsCarryStockReportCodes.Add(wmsCarryStockReportCode);
}); });
@@ -176,7 +173,7 @@ namespace Tnb.WarehouseMgr
int rowIndex = 0; int rowIndex = 0;
List<WmsCarryStockReportH> pages = result.Skip((input.currentPage - 1) * input.pageSize).Take(input.pageSize).ToList(); List<WmsCarryStockReportH> pages = result.Skip((input.currentPage - 1) * input.pageSize).Take(input.pageSize).ToList();
pages.ForEach(page => { rowIndex++; page.序号 = rowIndex; }); pages.ForEach(page => { rowIndex++; page.index = rowIndex; });
SqlSugarPagedList<WmsCarryStockReportH> pagedList = new() SqlSugarPagedList<WmsCarryStockReportH> pagedList = new()
{ {

9
apihost/Tnb.API.Entry/Configurations/ConnectionStrings.json
View File

@@ -20,8 +20,15 @@
//Oracle //Oracle
//"DefaultConnection": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={0})(PORT={1}))(CONNECT_DATA=(SERVER = DEDICATED)(SERVICE_NAME={2})));User Id={3};Password={4}" //"DefaultConnection": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={0})(PORT={1}))(CONNECT_DATA=(SERVER = DEDICATED)(SERVICE_NAME={2})));User Id={3};Password={4}"
//PostgreSQL //PostgreSQL
"DefaultConnection": "server={0};port={1};database={2};uid={3};pwd={4};pooling=true;KeepAlive=60;ConnectionLifetime=300;MaxPoolSize=320;" "DefaultConnection": "server={0};port={1};database={2};uid={3};pwd={4};pooling=true;KeepAlive=60;ConnectionLifetime=300;MaxPoolSize=320;",
//MySql //MySql
//"DefaultConnection": "server={0};port={1};database={2};uid={3};pwd={4};sslmode=none;pooling=true;charset=utf8mb4;allowLoadLocalInfile=true;allowPublicKeyRetrieval=true" //"DefaultConnection": "server={0};port={1};database={2};uid={3};pwd={4};sslmode=none;pooling=true;charset=utf8mb4;allowLoadLocalInfile=true;allowPublicKeyRetrieval=true"
"ConfigList": [
{
"ServiceName": "erpdb",
"dbType": "Oracle",
"connectionStr": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.11)(PORT=1521))(CONNECT_DATA=(SERVER = DEDICATED)(SERVICE_NAME=orcl)));User Id=BIP0201;Password=BIP0201"
}
]
} }
} }