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-08-21 12:37:56 +08:00
parent cdaeefa4ae
commit 3ab02675d7
10 changed files with 131 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/SaleShippingInput.cs
View File

@@ -48,10 +48,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
/// </summary> /// </summary>
public string erp_pk { get; set; } public string erp_pk { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string erp_wh_type { get; set; }
public List<SaleShippingDetail> details { get; set; } public List<SaleShippingDetail> details { get; set; }

165
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOrderInput.cs
View File

@@ -1,93 +1,92 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Transactions; using System.Transactions;
namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
{ {
public class TransferOrderInput public class TransferOrderInput
{ {
/// <summary> /// <summary>
/// 单号 /// 单号
/// </summary> /// </summary>
public string? transfer_order { get; set; } public string? transfer_order { get; set; }
/// <summary> /// <summary>
/// 部门编码 /// 部门编码
/// </summary> /// </summary>
public string? dept_code { get; set; } public string? dept_code { get; set; }
/// <summary> /// <summary>
/// 业务员编码 /// 业务员编码
/// </summary> /// </summary>
public string? biller { get; set; } public string? biller { get; set; }
/// <summary> /// <summary>
/// 出库仓库 /// 出库仓库
/// </summary> /// </summary>
public string? warehouse_outstock { get; set; } public string? warehouse_outstock { get; set; }
/// <summary> /// <summary>
/// 入库组织编号 /// 入库组织编号
/// </summary> /// </summary>
public string? instockorg_code { get; set; } public string? instockorg_code { get; set; }
/// <summary> /// <summary>
/// 供货日期 /// 供货日期
/// </summary> /// </summary>
public DateTime? ship_date { get; set; } public DateTime? ship_date { get; set; }
/// <summary> /// <summary>
/// 主表pk /// 主表pk
/// </summary> /// </summary>
public string? erp_pk { get; set; } public string? erp_pk { get; set; }
/// <summary> /// <summary>
/// 交易类型 /// 交易类型
/// </summary> /// </summary>
public string? transaction_type { get; set; } public string? transaction_type { get; set; }
/// <summary>
/// </summary> public List<TransferOrderInputDetail> details { get; set; }
public string erp_wh_type { get; set; } }
public class TransferOrderInputDetail
public List<TransferOrderInputDetail> details { get; set; } {
} /// <summary>
public class TransferOrderInputDetail /// 行号
{ /// </summary>
/// <summary> public string? lineno { get; set; }
/// 行号
/// </summary> /// <summary>
public string? lineno { get; set; } /// 物品代码
/// </summary>
/// <summary> public string? material_code { get; set; }
/// 物品代码
/// </summary> /// <summary>
public string? material_code { get; set; } /// 单位代码
/// </summary>
/// <summary> public string? unit_code { get; set; }
/// 单位代码
/// </summary> /// <summary>
public string? unit_code { get; set; } /// 采购数量
/// </summary>
public decimal? qty { get; set; } public decimal? qty { get; set; }
/// 采购数量
/// </summary> /// <summary>
public decimal? qty { get; set; } /// 批次
/// </summary>
/// <summary> public string? code_batch { get; set; }
/// 批次
/// </summary> /// <summary>
public string? code_batch { get; set; } /// 交货日期
/// </summary>
/// <summary> public DateTime? delivery_date { get; set; }
/// 交货日期
/// </summary> /// <summary>
public DateTime? delivery_date { get; set; } /// 子表主键
/// </summary>
/// <summary> public string erp_line_pk { get; set; }
/// 子表主键 }
/// </summary> }

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/TransferOutstockInput.cs
View File

@@ -58,11 +58,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
/// </summary> /// </summary>
public string? erp_pk { get; set; } public string? erp_pk { get; set; }
/// <summary>
/// erp仓库类型
/// </summary>
public string? erp_wh_type { get; set; }
public List<RawMatTransferInstockDetail> details { get; set; } public List<RawMatTransferInstockDetail> details { get; set; }
} }
public class RawMatTransferInstockDetail public class RawMatTransferInstockDetail

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

@@ -42,7 +42,7 @@ public partial class WmsOutinStockDetail : BaseEntity<string>
/// <summary> /// <summary>
/// 源单单据类型 /// 源单单据类型
/// </summary> /// </summary>
public int? source_type { get; set; } public string? source_type { get; set; }
/// <summary> /// <summary>
/// 来源单据行号 /// 来源单据行号

1
WarehouseMgr/Tnb.WarehouseMgr/DeviceProviderService.cs
View File

@@ -760,7 +760,6 @@ namespace Tnb.WarehouseMgr
s_eleUseStatusDic[elevator.device_id] = (int)EnumElevatorUseStatus.空闲; s_eleUseStatusDic[elevator.device_id] = (int)EnumElevatorUseStatus.空闲;
Logger.Information($"【TaskCallback】 {devName.Match(@"\d+")}#梯，设备名称：{devName}，开始进入关门流程 {devName} 变更为空闲 {s_eleUseStatusDic.GetHashCode()} {s_eleUseStatusDic[elevator.device_id]}"); Logger.Information($"【TaskCallback】 {devName.Match(@"\d+")}#梯，设备名称：{devName}，开始进入关门流程 {devName} 变更为空闲 {s_eleUseStatusDic.GetHashCode()} {s_eleUseStatusDic[elevator.device_id]}");
int doorStatus = await _elevatorControlService.GetTagAsync(devName, ElevatorConsts.DoorStatus); int doorStatus = await _elevatorControlService.GetTagAsync(devName, ElevatorConsts.DoorStatus);
Logger.Information($"【TaskCallback】 设备:{devName},门状态：{doorStatus.ToEnum<EnumDoorStatus>().ToString()}"); Logger.Information($"【TaskCallback】 设备:{devName},门状态：{doorStatus.ToEnum<EnumDoorStatus>().ToString()}");
if (doorStatus.ToEnum<EnumDoorStatus>() != EnumDoorStatus.关门到位保持 if (doorStatus.ToEnum<EnumDoorStatus>() != EnumDoorStatus.关门到位保持

24
WarehouseMgr/Tnb.WarehouseMgr/ElevatorControlService.cs
View File

@@ -501,18 +501,18 @@ namespace Tnb.WarehouseMgr
} }
var tasks = ParallelWriteTagAsync(input); var tasks = ParallelWriteTagAsync(input);
var writeRes = await Task.WhenAll(tasks); var writeRes = await Task.WhenAll(tasks);
var timedTaskSvc = _backgudSvc as TimedTaskBackgroundService; //var timedTaskSvc = _backgudSvc as TimedTaskBackgroundService;
if (timedTaskSvc != null) //if (timedTaskSvc != null)
{ //{
if (input.flag.Equals("close", StringComparison.OrdinalIgnoreCase)) // if (input.flag.Equals("close", StringComparison.OrdinalIgnoreCase))
{ // {
_ = timedTaskSvc.CloseAgvHeartbeat(input.devNames); // _ = timedTaskSvc.CloseAgvHeartbeat(input.devNames);
} // }
else // else
{ // {
_ = timedTaskSvc.OpenAgvHeartbeat(input.devNames); // _ = timedTaskSvc.OpenAgvHeartbeat(input.devNames);
} // }
} //}
} }

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

@@ -751,11 +751,11 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($@"表体存在物料和批号重复的明细！", 500); throw new AppFriendlyException($@"表体存在物料和批号重复的明细！", 500);
} }
WmsErpWarehouserelaH wmsErpWarehouserelaH = await db.Queryable<WmsErpWarehouserelaH>().Where(r => r.erp_warehousecode == input.erp_wh_type).FirstAsync(); WmsErpWarehouserelaH wmsErpWarehouserelaH = await db.Queryable<WmsErpWarehouserelaH>().Where(r => r.erp_warehousecode == input.warehouse_code).FirstAsync();
if (wmsErpWarehouserelaH == null) if (wmsErpWarehouserelaH == null)
{ {
_LoggerErp2Mes.LogWarning($@"【TransferOrder】不存在erp仓库类型{input.erp_wh_type}对应wms系统的映射关系！"); _LoggerErp2Mes.LogWarning($@"【TransferOrder】不存在erp仓库类型{input.warehouse_code}对应wms系统的映射关系！");
throw new AppFriendlyException($@"不存在erp仓库类型{input.erp_wh_type}对应wms系统的映射关系！", 500); throw new AppFriendlyException($@"不存在erp仓库类型{input.warehouse_code}对应wms系统的映射关系！", 500);
} }
string warehouse_outstock_code = wmsErpWarehouserelaH.wms_warehousecode; string warehouse_outstock_code = wmsErpWarehouserelaH.wms_warehousecode;
@@ -778,7 +778,7 @@ namespace Tnb.WarehouseMgr
wmsSaleH.status = WmsWareHouseConst.BILLSTATUS_ADD_ID; wmsSaleH.status = WmsWareHouseConst.BILLSTATUS_ADD_ID;
wmsSaleH.warehouse_id = warehouse_outstock.id; wmsSaleH.warehouse_id = warehouse_outstock.id;
wmsSaleH.customer_code = input.customer_code; wmsSaleH.customer_code = input.customer_code;
wmsSaleH.erp_wh_type = input.erp_wh_type; wmsSaleH.erp_wh_type = input.warehouse_code;
var customer = await db.Queryable<BasCustomer>().Where(p => p.customer_code == input.customer_code).FirstAsync(); var customer = await db.Queryable<BasCustomer>().Where(p => p.customer_code == input.customer_code).FirstAsync();
if (customer != null) if (customer != null)
{ {
@@ -866,11 +866,11 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($"主表主键不能为空", 500); throw new AppFriendlyException($"主表主键不能为空", 500);
} }
WmsErpWarehouserelaH wmsErpWarehouserelaH = await db.Queryable<WmsErpWarehouserelaH>().Where(r => r.erp_warehousecode == input.erp_wh_type).FirstAsync(); WmsErpWarehouserelaH wmsErpWarehouserelaH = await db.Queryable<WmsErpWarehouserelaH>().Where(r => r.erp_warehousecode == input.warehouse_instock).FirstAsync();
if (wmsErpWarehouserelaH == null) if (wmsErpWarehouserelaH == null)
{ {
_LoggerErp2Mes.LogWarning($@"【TransferOrder】不存在erp仓库类型{input.erp_wh_type}对应wms系统的映射关系！"); _LoggerErp2Mes.LogWarning($@"【TransferOrder】不存在erp仓库类型{input.warehouse_instock}对应wms系统的映射关系！");
throw new AppFriendlyException($@"不存在erp仓库类型{input.erp_wh_type}对应wms系统的映射关系！", 500); throw new AppFriendlyException($@"不存在erp仓库类型{input.warehouse_instock}对应wms系统的映射关系！", 500);
} }
string warehouse_instock_code = wmsErpWarehouserelaH.wms_warehousecode; string warehouse_instock_code = wmsErpWarehouserelaH.wms_warehousecode;
@@ -918,7 +918,7 @@ namespace Tnb.WarehouseMgr
wmsRawmatTransferinstockH.create_time = DateTime.Now; wmsRawmatTransferinstockH.create_time = DateTime.Now;
wmsRawmatTransferinstockH.dept_code = input.dept_code; wmsRawmatTransferinstockH.dept_code = input.dept_code;
wmsRawmatTransferinstockH.biller = input.biller; wmsRawmatTransferinstockH.biller = input.biller;
wmsRawmatTransferinstockH.erp_wh_type = input.erp_wh_type; wmsRawmatTransferinstockH.erp_wh_type = input.warehouse_instock;
wmsRawmatTransferinstockH.org_id = WmsWareHouseConst.AdministratorOrgId; wmsRawmatTransferinstockH.org_id = WmsWareHouseConst.AdministratorOrgId;
await db.Insertable(wmsRawmatTransferinstockH).ExecuteCommandAsync(); await db.Insertable(wmsRawmatTransferinstockH).ExecuteCommandAsync();
@@ -978,7 +978,7 @@ namespace Tnb.WarehouseMgr
wmsTransferInstockH.create_time = DateTime.Now; wmsTransferInstockH.create_time = DateTime.Now;
wmsTransferInstockH.dept_code = input.dept_code; wmsTransferInstockH.dept_code = input.dept_code;
wmsTransferInstockH.biller = input.biller; wmsTransferInstockH.biller = input.biller;
wmsTransferInstockH.erp_wh_type = input.erp_wh_type; wmsTransferInstockH.erp_wh_type = input.warehouse_instock;
await db.Insertable(wmsTransferInstockH).ExecuteCommandAsync(); await db.Insertable(wmsTransferInstockH).ExecuteCommandAsync();
List<WmsTransferInstockD> wmsTransferInstockDs = new List<WmsTransferInstockD>(); List<WmsTransferInstockD> wmsTransferInstockDs = new List<WmsTransferInstockD>();
@@ -1079,11 +1079,11 @@ namespace Tnb.WarehouseMgr
throw new AppFriendlyException($@"表体存在物料和批号重复的明细！", 500); throw new AppFriendlyException($@"表体存在物料和批号重复的明细！", 500);
} }
WmsErpWarehouserelaH wmsErpWarehouserelaH = await db.Queryable<WmsErpWarehouserelaH>().Where(r => r.erp_warehousecode == input.erp_wh_type).FirstAsync(); WmsErpWarehouserelaH wmsErpWarehouserelaH = await db.Queryable<WmsErpWarehouserelaH>().Where(r => r.erp_warehousecode == input.warehouse_outstock).FirstAsync();
if (wmsErpWarehouserelaH == null) if (wmsErpWarehouserelaH == null)
{ {
_LoggerErp2Mes.LogWarning($@"【TransferOrder】不存在erp仓库类型{input.erp_wh_type}对应wms系统的映射关系！"); _LoggerErp2Mes.LogWarning($@"【TransferOrder】不存在erp仓库类型{input.warehouse_outstock}对应wms系统的映射关系！");
throw new AppFriendlyException($@"不存在erp仓库类型{input.erp_wh_type}对应wms系统的映射关系！", 500); throw new AppFriendlyException($@"不存在erp仓库类型{input.warehouse_outstock}对应wms系统的映射关系！", 500);
} }
string warehouse_outstock_code = wmsErpWarehouserelaH.wms_warehousecode; string warehouse_outstock_code = wmsErpWarehouserelaH.wms_warehousecode;
@@ -1107,7 +1107,7 @@ namespace Tnb.WarehouseMgr
wmsTransferOrderH.create_id = WmsWareHouseConst.ErpUserId; wmsTransferOrderH.create_id = WmsWareHouseConst.ErpUserId;
wmsTransferOrderH.create_time = DateTime.Now; wmsTransferOrderH.create_time = DateTime.Now;
wmsTransferOrderH.org_id = WmsWareHouseConst.AdministratorOrgId; wmsTransferOrderH.org_id = WmsWareHouseConst.AdministratorOrgId;
wmsTransferOrderH.erp_wh_type = input.erp_wh_type; wmsTransferOrderH.erp_wh_type = input.warehouse_outstock;
var _erpExtendField = await db.Queryable<ErpExtendField>().InnerJoin<DictionaryDataEntity>((a, b) => a.table_id == b.Id) var _erpExtendField = await db.Queryable<ErpExtendField>().InnerJoin<DictionaryDataEntity>((a, b) => a.table_id == b.Id)
.Where((a, b) => a.transaction_type_id == input.transaction_type).Select((a, b) => b).FirstAsync(); .Where((a, b) => a.transaction_type_id == input.transaction_type).Select((a, b) => b).FirstAsync();
@@ -1176,7 +1176,7 @@ namespace Tnb.WarehouseMgr
wmsRawmatTransferoutstockH.issuance_status = "0"; wmsRawmatTransferoutstockH.issuance_status = "0";
wmsRawmatTransferoutstockH.transaction_type = _erpExtendField.EnCode; wmsRawmatTransferoutstockH.transaction_type = _erpExtendField.EnCode;
wmsRawmatTransferoutstockH.org_id = WmsWareHouseConst.AdministratorOrgId; wmsRawmatTransferoutstockH.org_id = WmsWareHouseConst.AdministratorOrgId;
wmsRawmatTransferoutstockH.erp_wh_type = input.erp_wh_type; wmsRawmatTransferoutstockH.erp_wh_type = input.warehouse_outstock;
List<WmsRawmatTransferoutstockD> wmsRawmatTransferoutstockDs = new List <WmsRawmatTransferoutstockD>(); List<WmsRawmatTransferoutstockD> wmsRawmatTransferoutstockDs = new List <WmsRawmatTransferoutstockD>();
foreach (var detail in input.details) foreach (var detail in input.details)
{ {
@@ -1229,7 +1229,7 @@ namespace Tnb.WarehouseMgr
wmsTransferOutstockH.issuance_status = "0"; wmsTransferOutstockH.issuance_status = "0";
wmsTransferOutstockH.transaction_type = _erpExtendField.EnCode; wmsTransferOutstockH.transaction_type = _erpExtendField.EnCode;
wmsTransferOutstockH.org_id = WmsWareHouseConst.AdministratorOrgId; wmsTransferOutstockH.org_id = WmsWareHouseConst.AdministratorOrgId;
wmsTransferOutstockH.erp_wh_type = input.erp_wh_type; wmsTransferOutstockH.erp_wh_type = input.warehouse_outstock;
List<WmsTransferOutstockD> wmsTransferOutstockDs = new List<WmsTransferOutstockD>(); List<WmsTransferOutstockD> wmsTransferOutstockDs = new List<WmsTransferOutstockD>();
foreach (var detail in input.details) foreach (var detail in input.details)
{ {

19
WarehouseMgr/Tnb.WarehouseMgr/WmsOutinStockDetailService.cs
View File

@@ -138,6 +138,16 @@ namespace Tnb.WarehouseMgr
wmsOutinStockDetail.act_end_date = input.disTask.act_end_date; wmsOutinStockDetail.act_end_date = input.disTask.act_end_date;
wmsOutinStockDetail.pretask_code = input.disTask.pretask_code; wmsOutinStockDetail.pretask_code = input.disTask.pretask_code;
wmsOutinStockDetail.distask_code = input.disTask.bill_code; wmsOutinStockDetail.distask_code = input.disTask.bill_code;
wmsOutinStockDetail.create_time = DateTime.Now;
switch (input.disTask.biz_type)
{
case WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID:
{
wmsOutinStockDetail.source_detail_id = input.disTask.source_id;
wmsOutinStockDetail.source_type = WmsWareHouseConst.BIZTYPE_WMSINSTOCK_ID;
break;
}
}
wmsOutinStockDetail.type = type; wmsOutinStockDetail.type = type;
List<BasMaterial> mats = await db.Queryable<BasMaterial>().Where(r => wmsCarryCodes.Select(x => x.material_id).Distinct().Contains(r.id)).ToListAsync(); List<BasMaterial> mats = await db.Queryable<BasMaterial>().Where(r => wmsCarryCodes.Select(x => x.material_id).Distinct().Contains(r.id)).ToListAsync();
@@ -187,7 +197,14 @@ namespace Tnb.WarehouseMgr
rows = await db.Insertable(wmsOutinStockCodes).ExecuteCommandAsync(); rows = await db.Insertable(wmsOutinStockCodes).ExecuteCommandAsync();
if (rows == 0) if (rows == 0)
{ {
throw new Exception($"插入出入库明细条码失败！"); if (wmsCarryCodes.Count == 0)
{
Logger.LogWarning("空载具无需插入出入库明细条码");
}
else
{
throw new Exception($"插入出入库明细条码失败！");
}
} }
await db.Ado.CommitTranAsync(); await db.Ado.CommitTranAsync();
} }

2
WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
View File

@@ -397,6 +397,7 @@ namespace Tnb.WarehouseMgr
var billCode = input.data.ContainsKey(nameof(WmsPurchaseH.bill_code)) ? input.data[nameof(WmsPurchaseH.bill_code)] : null; var billCode = input.data.ContainsKey(nameof(WmsPurchaseH.bill_code)) ? input.data[nameof(WmsPurchaseH.bill_code)] : null;
string bill_type = ""; string bill_type = "";
string required_type = (await _dbScanInStockByRedis.Queryable<WmsTempCode>().FirstAsync(it => it.barcode == input.data["物料条码"])).required_type; string required_type = (await _dbScanInStockByRedis.Queryable<WmsTempCode>().FirstAsync(it => it.barcode == input.data["物料条码"])).required_type;
string source_id = (await _dbScanInStockByRedis.Queryable<WmsTempCode>().FirstAsync(it => it.barcode == input.data["物料条码"])).require_id;
switch (required_type) switch (required_type)
{ {
case WmsWareHouseConst.BILLTYPE_PURCHASE_ID: case WmsWareHouseConst.BILLTYPE_PURCHASE_ID:
@@ -581,6 +582,7 @@ namespace Tnb.WarehouseMgr
area_code = it.Key, area_code = it.Key,
require_id = instock.id, require_id = instock.id,
require_code = instock.bill_code, require_code = instock.bill_code,
source_id = source_id,
create_id = _userManager.User == null ? "" : _userManager.UserId!, create_id = _userManager.User == null ? "" : _userManager.UserId!,
create_time = DateTime.Now, create_time = DateTime.Now,
priority = WmsWareHouseConst.priority_instock priority = WmsWareHouseConst.priority_instock

2
apihost/Tnb.API.Entry/Configurations/AgvRequestCfgUrl.json
View File

@@ -1,6 +1,6 @@
{ {
"AgvRequestUrls": { "AgvRequestUrls": {
"CreateTaskChainUrl": "http://10.147.19.104:5013/api/task-chain/create", "CreateTaskChainUrl": "http://192.168.11.104:1880/api/task-chain/create",
"CancelTaskChainUrl": "http://192.168.11.104:1880/api/task-chain/cancel" "CancelTaskChainUrl": "http://192.168.11.104:1880/api/task-chain/cancel"
} }
} }