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-10 12:02:16 +08:00
parent a4ce415b62
commit 8a5ff0ebe6
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs
View File

@@ -478,7 +478,7 @@ namespace Tnb.ProductionMgr
// } // }
/// <summary> /// <summary>
/// 定点配送 /// 空载具定点配送
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
@@ -540,12 +540,13 @@ namespace Tnb.ProductionMgr
Log.Error($"{equipment.name}未配置上料库位"); Log.Error($"{equipment.name}未配置上料库位");
continue; continue;
} }
if (await _db.Queryable<WmsPretaskH>().AnyAsync(x => if (await _db.Queryable<WmsDistaskH>().AnyAsync(x =>
x.endlocation_id == equipment.upmat_location_id && x.endlocation_id == equipment.upmat_location_id &&
x.biz_type == WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID && x.biz_type == WmsWareHouseConst.BIZTYPE_WMSDELIVERY_ID &&
(x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_DXF_ID (x.status == WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID
|| x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_YXF_ID || x.status == WmsWareHouseConst.TASK_BILL_STATUS_YXD_ID
|| x.status == WmsWareHouseConst.PRETASK_BILL_STATUS_START_ID || x.status == WmsWareHouseConst.TASK_BILL_STATUS_RUNING_ID
|| x.status == WmsWareHouseConst.TASK_BILL_STATUS_PAUSE_ID
) )
)) ))
{ {

4
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -231,6 +231,10 @@ namespace Tnb.WarehouseMgr.Entities.Consts
/// </summary> /// </summary>
public const string TASK_BILL_STATUS_RUNING_ID = "26126856028453"; public const string TASK_BILL_STATUS_RUNING_ID = "26126856028453";
/// <summary> /// <summary>
/// 任务单据状态-已暂停Id
/// </summary>
public const string TASK_BILL_STATUS_PAUSE_ID = "26126866160677";
/// <summary>
/// 任务单据状态-已完成ID /// 任务单据状态-已完成ID
/// </summary> /// </summary>
public const string TASK_BILL_STATUS_COMPLE_ID = "26126860808229"; public const string TASK_BILL_STATUS_COMPLE_ID = "26126860808229";

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatOutstockH.cs
View File

@@ -103,5 +103,8 @@ public partial class WmsRawmatOutstockH : BaseEntity<string>
/// </summary> /// </summary>
public string? erp_project_id { get; set; } public string? erp_project_id { get; set; }
/// <summary>
/// erp领料员 存的天益用户表的id 需关联erp_extend_field 取
/// </summary>
public string? erp_cbizid { get; set; }
} }

3
WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatOutstockService.cs
View File

@@ -123,6 +123,7 @@ namespace Tnb.WarehouseMgr
string userId = wmsRawmatOutstockH.create_id ?? WmsWareHouseConst.AdministratorUserId; string userId = wmsRawmatOutstockH.create_id ?? WmsWareHouseConst.AdministratorUserId;
tableIds.Add(userId); tableIds.Add(userId);
tableIds.Add(wmsRawmatOutstockH.erp_cbizid);
List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); List<ErpExtendField> erpExtendFields = await _db.Queryable<ErpExtendField>().Where(x => tableIds.Contains(x.table_id)).ToListAsync();
// string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID; // string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? WmsWareHouseConst.ERPUSERID;
string erpCreateId = WmsWareHouseConst.ERPUSERID; string erpCreateId = WmsWareHouseConst.ERPUSERID;
@@ -133,6 +134,8 @@ namespace Tnb.WarehouseMgr
List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>(); List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
Dictionary<string, object> erpRequestData = new Dictionary<string, object>(); Dictionary<string, object> erpRequestData = new Dictionary<string, object>();
erpRequestData.Add("billmaker", erpCreateId); erpRequestData.Add("billmaker", erpCreateId);
erpRequestData.Add("cbizid", wmsRawmatOutstockH.erp_cbizid!=null ? erpExtendFields.Find(x => x.table_id == wmsRawmatOutstockH.erp_cbizid)?.person_id : null);
erpRequestData.Add("cwhsmanagerid", erpExtendFields.Find(x => x.table_id == userId)?.person_id);
erpRequestData.Add("ccostdomainoid", wmsRawmatOutstockH.erp_org_costregion ?? "1001A1100000001MNB3H"); erpRequestData.Add("ccostdomainoid", wmsRawmatOutstockH.erp_org_costregion ?? "1001A1100000001MNB3H");
erpRequestData.Add("cdrawcalbodyoid", erpOrg.pk_org); erpRequestData.Add("cdrawcalbodyoid", erpOrg.pk_org);
erpRequestData.Add("cdrawcalbodyvid", erpOrg.pk_org_v); erpRequestData.Add("cdrawcalbodyvid", erpOrg.pk_org_v);