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:
yang.lee
2023-11-08 17:07:50 +08:00
parent 6bb3db57aa
commit cb359b4ef9
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -74,6 +74,7 @@ namespace Tnb.WarehouseMgr
public async Task<dynamic> OutStockApplyFor(VisualDevModelDataCrInput input) public async Task<dynamic> OutStockApplyFor(VisualDevModelDataCrInput input)
{ {
List<WmsOutstockD> outStockDList = new();
try try
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();
@@ -132,10 +133,11 @@ namespace Tnb.WarehouseMgr
List<string> carryIds = new(); List<string> carryIds = new();
var mapKeys = new List<string> { "tablefield120", "details" }; var mapKeys = new List<string> { "tablefield120", "details" };
//tablefield120 出库物料明细 //tablefield120 出库物料明细
if (input.data.Keys.Any(k => mapKeys.Contains(k))) //input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull() if (input.data.Keys.Any(k => mapKeys.Contains(k))) //input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull()
{ {
List<WmsOutstockD> outStockDList = new();
if (input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull()) if (input.data.ContainsKey("tablefield120") && input.data["tablefield120"].IsNotEmptyOrNull())
{ {
outStockDList = input.data["tablefield120"].ToObject<List<WmsOutstockD>>(); outStockDList = input.data["tablefield120"].ToObject<List<WmsOutstockD>>();
@@ -387,7 +389,7 @@ namespace Tnb.WarehouseMgr
{ {
await InvokeGenPretaskExcute(); await InvokeGenPretaskExcute();
} }
return Task.FromResult(true); return Task.FromResult((input.data["ReturnIdentity"].ToString(), outStockDList));
} }

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

@@ -9,10 +9,13 @@ using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using Tnb.Common.Utils; using Tnb.Common.Utils;
using Tnb.QcMgr.Entities.Enums;
using Tnb.QcMgr.Entities;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Interfaces; using Tnb.WarehouseMgr.Interfaces;
using Tnb.QcMgr.Interfaces;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
@@ -22,11 +25,13 @@ namespace Tnb.WarehouseMgr
public class WmsSaleService : WmsPurchaseAndSaleCommonService<WmsSaleD>, IWmsSaleService public class WmsSaleService : WmsPurchaseAndSaleCommonService<WmsSaleD>, IWmsSaleService
{ {
private readonly IWmsOutStockService _wmsOutStockService; private readonly IWmsOutStockService _wmsOutStockService;
private readonly IQcCheckPlanService _qcCheckPlanService;
public WmsSaleService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IWmsOutStockService wmsOutStockService) public WmsSaleService(ISqlSugarRepository<WmsPurchaseH> repo, IUserManager userManager, IWmsOutStockService wmsOutStockService, IQcCheckPlanService qcCheckPlanService)
: base(repo, userManager) : base(repo, userManager)
{ {
_wmsOutStockService = wmsOutStockService; _wmsOutStockService = wmsOutStockService;
_qcCheckPlanService = qcCheckPlanService;
} }
/// <summary> /// <summary>
/// 销售发货 /// 销售发货
@@ -43,10 +48,15 @@ namespace Tnb.WarehouseMgr
visualDevModelDataInput.data = PocoToDictionary.ToDictionary(input) as Dictionary<string, object>; visualDevModelDataInput.data = PocoToDictionary.ToDictionary(input) as Dictionary<string, object>;
visualDevModelDataInput.data["location_id"] = "26412597341221"; visualDevModelDataInput.data["location_id"] = "26412597341221";
visualDevModelDataInput.data["location_code"] = "YCL01-01-01"; visualDevModelDataInput.data["location_code"] = "YCL01-01-01";
if (_wmsOutStockService != null)
{ (string pkId, List <WmsOutstockD> outStockDList) multi = await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
} CreateTaskEntity ctEntity = new();
ctEntity.maintableid = multi.pkId;
ctEntity.materialids = multi.outStockDList?.Select(x => x.material_id).ToList() ?? Array.Empty<string>().ToList();
ctEntity.triggerevent = EnumTriggerEvent.出厂检按入厂频次;
_ = _qcCheckPlanService.CreateWmsTask(ctEntity);
return await Task.FromResult(1); return await Task.FromResult(1);
} }
/// <summary> /// <summary>
@@ -67,9 +77,9 @@ namespace Tnb.WarehouseMgr
/// </param> /// </param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<bool> Audit(PurchaseAndSaleAuditUpInput input) public async Task<bool> Audit(PurchaseAndSaleAuditUpInput input)
{ {
return await Audit<WmsSaleH>(input); return await Audit<WmsSaleH>(input);
} }
/// <summary> /// <summary>