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:
贺立波
2023-11-16 14:06:21 +08:00
parent 98d0fd1004
commit e1920db0bb
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsInstockH.cs
View File

@@ -217,4 +217,8 @@ public partial class WmsInstockH : BaseEntity<string>, InOutCheckStatusUpdateEnt
/// 检验结论 /// 检验结论
/// </summary> /// </summary>
public int? check_conclusion { get; set; } public int? check_conclusion { get; set; }
/// <summary>
/// 审核状态
/// </summary>
public int? audit_status { get; set; }
} }

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

@@ -84,6 +84,7 @@ namespace Tnb.WarehouseMgr
{ {
x.modify_id = _userManager.UserId; x.modify_id = _userManager.UserId;
x.modify_time = DateTime.Now; x.modify_time = DateTime.Now;
x.purchase_arriveqty = 0;
}); });
await _db.Updateable(purchaseDs).UpdateColumns(it => new { it.purchase_prqty, it.line_status }).ExecuteCommandAsync(); await _db.Updateable(purchaseDs).UpdateColumns(it => new { it.purchase_prqty, it.line_status }).ExecuteCommandAsync();

9
WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
View File

@@ -75,6 +75,15 @@ namespace Tnb.WarehouseMgr
instock.create_id = _userManager.UserId; instock.create_id = _userManager.UserId;
instock.create_time = DateTime.Now; instock.create_time = DateTime.Now;
instock.org_id = _userManager.User.OrganizeId; instock.org_id = _userManager.User.OrganizeId;
if (instock.source_code != null) {
instock.sync_status = WmsWareHouseConst.SYNC_STATUS__NOTSYNC;
}
else {
instock.sync_status = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;
}
instock.audit_status = 0;
instock.print_status = "0";
instock.is_check = 0;
await _db.Insertable(instock).ExecuteCommandAsync(); await _db.Insertable(instock).ExecuteCommandAsync();
instockDs = purchaseDs.Adapt<List<WmsInstockD>>(); instockDs = purchaseDs.Adapt<List<WmsInstockD>>();

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

@@ -16,6 +16,7 @@ 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; using Tnb.QcMgr.Interfaces;
using Tnb.WarehouseMgr.Entities.Consts;
namespace Tnb.WarehouseMgr namespace Tnb.WarehouseMgr
{ {
@@ -47,10 +48,18 @@ namespace Tnb.WarehouseMgr
_ = await PurchaseAndSaleUpdate(input); _ = await PurchaseAndSaleUpdate(input);
VisualDevModelDataCrInput visualDevModelDataInput = new(); VisualDevModelDataCrInput visualDevModelDataInput = new();
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["station_id"] = "30018443941397";
visualDevModelDataInput.data["location_code"] = "YCL01-01-01"; visualDevModelDataInput.data["station_code"] = "02DTGW";
if (visualDevModelDataInput.data.ContainsKey(nameof(WmsPurchaseH.source_code))) {
(string pkId, List <WmsOutstockD> outStockDList) multi = await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput); visualDevModelDataInput.data["sync_status"] = WmsWareHouseConst.SYNC_STATUS__NOTSYNC;
}
else
{
visualDevModelDataInput.data["sync_status"] = WmsWareHouseConst.SYNC_STATUS_NONEEDSYNC;
}
visualDevModelDataInput.data["audit_status"] = 0;
visualDevModelDataInput.data["is_check"] = 0;
(string pkId, List <WmsOutstockD> outStockDList) multi = await _wmsOutStockService.OutStockApplyFor(visualDevModelDataInput);
_ = SyncMesData(multi.pkId, multi.outStockDList?.Select(x => x.material_id!).ToList() ?? Array.Empty<string>().ToList(), EnumTriggerEvent.出厂检按入厂频次); _ = SyncMesData(multi.pkId, multi.outStockDList?.Select(x => x.material_id!).ToList() ?? Array.Empty<string>().ToList(), EnumTriggerEvent.出厂检按入厂频次);
return await Task.FromResult(1); return await Task.FromResult(1);