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

委外到货bug

Browse Source
This commit is contained in:
周科达
2024-10-14 11:44:52 +08:00
parent 9259c5fca5
commit 4db77bc3e0
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceD.cs
View File

@@ -45,7 +45,7 @@ public partial class WmsOutsourceD : BaseEntity<string>
public string? unit { get; set; } public string? unit { get; set; }
/// <summary> /// <summary>
/// 采购数量 /// 委外数量
/// </summary> /// </summary>
public decimal? outsource_quantity { get; set; } public decimal? outsource_quantity { get; set; }
@@ -169,11 +169,6 @@ public partial class WmsOutsourceD : BaseEntity<string>
/// </summary> /// </summary>
public int? gift { get; set; } public int? gift { get; set; }
/// <summary>
/// 委外数量
/// </summary>
public decimal? outsource_qty { get; set; }
public string erp_outsource_order_d_pk { get; set; } public string erp_outsource_order_d_pk { get; set; }
public string erp_outsource_order_d_lineno { get; set; } public string erp_outsource_order_d_lineno { get; set; }

22
WarehouseMgr/Tnb.WarehouseMgr/WmsOutsourceService.cs
View File

@@ -231,14 +231,24 @@ namespace Tnb.WarehouseMgr
instock.is_check = 0; instock.is_check = 0;
await _db.Insertable(instock).ExecuteCommandAsync(); await _db.Insertable(instock).ExecuteCommandAsync();
instockDs = purchaseDs.Adapt<List<WmsInstockD>>(); foreach (var item in purchaseDs)
instockDs.ForEach(instockD =>
{ {
WmsInstockD instockD = new WmsInstockD();
instockD.id = SnowflakeIdHelper.NextId();
instockD.bill_id = instock.id; instockD.bill_id = instock.id;
instockD.line_status = WmsWareHouseConst.BILLSTATUS_ADD_ID;
instockD.material_id = item.matcode_id;
instockD.material_code = item.matcode;
instockD.material_specification = item.matspecification;
instockD.unit_id = item.unit;
instockD.pr_qty = item.outsource_quantity;
instockD.qty = item.bind_qty.Value;
instockD.code_batch = item.code_batch;
instockD.create_id = _userManager.UserId; instockD.create_id = _userManager.UserId;
instockD.create_time = DateTime.Now; instockD.create_time = DateTime.Now;
instockD.org_id = _userManager.User.OrganizeId; instockD.org_id = _userManager.User.OrganizeId;
}); instockDs.Add(instockD);
}
await _db.Insertable(instockDs).ExecuteCommandAsync(); await _db.Insertable(instockDs).ExecuteCommandAsync();
List<WmsOutsourceD> dList = input.details; List<WmsOutsourceD> dList = input.details;
@@ -253,10 +263,10 @@ namespace Tnb.WarehouseMgr
WmsOutsourceOrderH wmsOutsourceOrderH = await _db.Queryable<WmsOutsourceOrderH>().SingleAsync(x => x.id == wmsOutsourceH.erp_bill_code); WmsOutsourceOrderH wmsOutsourceOrderH = await _db.Queryable<WmsOutsourceOrderH>().SingleAsync(x => x.id == wmsOutsourceH.erp_bill_code);
//自制的不调erp接口 //自制的不调erp接口
if (!string.IsNullOrEmpty(wmsOutsourceOrderH.erp_bill_code)) if (wmsOutsourceOrderH!=null && !string.IsNullOrEmpty(wmsOutsourceOrderH.erp_bill_code))
{ {
List<string> ids = new List<string>(); List<string> ids = new List<string>();
// ids.Add(_userManager.UserId); ids.Add(_userManager.UserId);
// ids.Add(WmsWareHouseConst.AdministratorUserId); // ids.Add(WmsWareHouseConst.AdministratorUserId);
ids.Add(WmsWareHouseConst.AdministratorOrgId); ids.Add(WmsWareHouseConst.AdministratorOrgId);
ids.AddRange(materialIds); ids.AddRange(materialIds);
@@ -321,7 +331,7 @@ namespace Tnb.WarehouseMgr
// ["nastnum"] = item.purchase_arriveqty, // ["nastnum"] = item.purchase_arriveqty,
["nnum"] = item.bind_qty, ["nnum"] = item.bind_qty,
// ["nplanastnum"] = 0, // ["nplanastnum"] = 0,
["nplannum"] = item.outsource_qty, ["nplannum"] = item.outsource_quantity,
["pk_apfinanceorg"] = erpOrg.corpoid, ["pk_apfinanceorg"] = erpOrg.corpoid,
["pk_apfinanceorg_v"] = erpOrg.corpvid, ["pk_apfinanceorg_v"] = erpOrg.corpvid,
["pk_arriveorder"] = null, ["pk_arriveorder"] = null,