From f56c0ed3216c3f52cf9522a61807bcf6328001cc Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Mon, 26 Aug 2024 14:26:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.ProductionMgr/PrdFeedingService.cs | 2 + .../PrdMoTaskIssueService.cs | 2 + QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs | 4 + .../Tnb.QcMgr.Entities/Entity/QcCheckExecH.cs | 4 + QcMgr/Tnb.QcMgr/QcCheckTaskService.cs | 11 +- .../WmsMaterialSignHService.cs | 204 ++++++++---------- .../WmsRawmatTransferinstockService.cs | 10 +- 7 files changed, 114 insertions(+), 123 deletions(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs index 4151c0a2..98929e39 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs @@ -501,6 +501,7 @@ namespace Tnb.ProductionMgr await db.Updateable() .SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString()) + .SetColumns(x => x.is_check == ((int)EnumCheckConclusion.待检).ToString()) .Where(x => x.carry_code==input.carry_code) .ExecuteCommandAsync(); @@ -586,6 +587,7 @@ namespace Tnb.ProductionMgr await db.Updateable() .SetColumns(x => x.carry_status == ((int)EnumCarryStatus.空闲).ToString()) + .SetColumns(x => x.is_check == ((int)EnumCheckConclusion.待检).ToString()) .Where(x => carryIds.Contains(x.id)) .ExecuteCommandAsync(); diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs index ab426301..123204c6 100644 --- a/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/PrdMoTaskIssueService.cs @@ -97,6 +97,7 @@ namespace Tnb.ProductionMgr Dictionary? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject>(input.queryJson) : new Dictionary(); string moTaskCode = queryJson.ContainsKey("mo_task_code") ? queryJson["mo_task_code"].ToString() : ""; string moTaskStatus = queryJson.ContainsKey("mo_task_status") ? queryJson["mo_task_status"].ToString() : ""; + string eqpId = queryJson.ContainsKey("eqp_id") ? queryJson["eqp_id"].ToString() : ""; SqlSugarPagedList result = await db.Queryable() .LeftJoin((a, b) => a.material_id == b.id) .LeftJoin((a, b, c) => c.EnCode == DictConst.TaskStatus) @@ -108,6 +109,7 @@ namespace Tnb.ProductionMgr //.LeftJoin((a, b, c, d, e, f, g,h,i)=>a.worker_id==i.Id) .WhereIF(!string.IsNullOrEmpty(moTaskCode), (a, b, c, d) => a.mo_task_code.Contains(moTaskCode)) .WhereIF(!string.IsNullOrEmpty(moTaskStatus), (a, b, c, d) => a.mo_task_status == moTaskStatus) + .WhereIF(!string.IsNullOrEmpty(eqpId), (a, b, c, d,e,f,g) => g.code.Contains(eqpId) || g.name.Contains(eqpId)) .Where((a, b, c, d, e, f) => a.schedule_type == 1) .Select((a, b, c, d, e, f, g,h) => new PrdMoTaskIssueListOutput { diff --git a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs index f09336ca..7f49016a 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Dto/CheckTask.cs @@ -132,6 +132,10 @@ public string check_type { get; set; } public string remark { get; set; } + /// + /// 附件对象. + /// + public string attachment { get; set; } = string.Empty; public List>? checktypes { get; set; } } diff --git a/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecH.cs b/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecH.cs index d68799c3..ff0f6b8d 100644 --- a/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecH.cs +++ b/QcMgr/Tnb.QcMgr.Entities/Entity/QcCheckExecH.cs @@ -129,5 +129,9 @@ namespace Tnb.QcMgr.Entities /// public string remark { get; set; } public string batch { get; set; } + /// + /// 附件对象. + /// + public string attachment { get; set; } = string.Empty; } } diff --git a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs index fc9f2026..5ce98c24 100644 --- a/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs +++ b/QcMgr/Tnb.QcMgr/QcCheckTaskService.cs @@ -136,10 +136,10 @@ namespace Tnb.QcMgr throw Oops.Bah($"未找到任务单{QcCheckExecH.mo_task_code}"); } - if (string.IsNullOrEmpty(QcCheckExecH.report_id)) - { - throw Oops.Bah($"未找到提报记录{QcCheckExecH.report_id}"); - } + // if (string.IsNullOrEmpty(QcCheckExecH.report_id)) + // { + // throw Oops.Bah($"未找到提报记录{QcCheckExecH.report_id}"); + // } BasMaterial basMaterial = await db.Queryable().Where(x=>x.id==moTask.material_id).FirstAsync(); PrdReport prdReport = await db.Queryable().SingleAsync(x => x.id == QcCheckExecH.report_id); UserEntity userEntity = await db.Queryable().SingleAsync(x => x.Id == prdReport.create_id); @@ -156,7 +156,7 @@ namespace Tnb.QcMgr checknum = !string.IsNullOrEmpty(QcCheckExecH.checknum) ? int.Parse(QcCheckExecH.checknum) : 0, worker_name = userEntity?.RealName ?? "", bill_code = QcCheckExecH.bill_code, - carry_code = prdReport.material_box_code, + carry_code = prdReport?.material_box_code, }; if (!string.IsNullOrEmpty(CheckTaskOut.workid)) { @@ -262,6 +262,7 @@ namespace Tnb.QcMgr QcCheckExecH.exectime = DateTime.Now.ToString(); QcCheckExecH.check_type = CheckTaskInput.check_type; QcCheckExecH.remark = CheckTaskInput.remark; + QcCheckExecH.attachment = CheckTaskInput.attachment; List QcCheckExecDs = await db.Queryable().Where(p => p.mainid == CheckTaskInput.mainid).ToListAsync(); int rqty = 0; diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs index 94a723a6..a425afee 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialSignHService.cs @@ -28,6 +28,7 @@ using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Entity; using Tnb.WarehouseMgr.Interfaces; using Tnb.ProductionMgr.Entities.Entity; +using Tnb.BasicData; namespace Tnb.WarehouseMgr { @@ -243,120 +244,97 @@ namespace Tnb.WarehouseMgr { // 出库数量wmsMaterialSignD.sign_qty } - - - //todo 对接调拨出库 - - // WmsInstockH instock = await _db.Queryable().SingleAsync(x => x.id == input.requireId); - // List allInstockDetails = await _db.Queryable().Where(it => it.bill_id == input.requireId).ToListAsync(); - // - // WmsTempCode wmsTempCode = await _db.Queryable() - // .LeftJoin((a, b) => a.barcode == b.barcode) - // .Where((a, b) => a.carry_id == input.wmsDistaskH.carry_id) - // .Select((a, b) => b) - // .FirstAsync(); - // - // string rawmatTransferinstockDId = wmsTempCode?.require_id ?? ""; - // WmsRawmatTransferinstockD wmsRawmatTransferinstockD = await _db.Queryable().SingleAsync(x => x.id == rawmatTransferinstockDId); - // string rawmatTransferinstockHId = wmsRawmatTransferinstockD?.bill_id ?? ""; - // WmsRawmatTransferinstockH wmsRawmatTransferinstockH = await _db.Queryable().SingleAsync(x => x.id == rawmatTransferinstockHId); - // - // List materialIds = allInstockDetails.Select(x => x.material_id).Distinct().ToList(); - // List unitCodes = allInstockDetails.Select(x => x.unit_id).Distinct().ToList(); - // List unitDatas = await _db.Queryable() - // .LeftJoin((x, y) => x.Id == y.DictionaryTypeId) - // .Where((x, y) => x.EnCode == DictConst.MeasurementUnit && unitCodes.Contains(y.EnCode)) - // .Select((x, y) => y) - // .ToListAsync(); - // List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); - // BasWarehouse basWarehouse = await _db.Queryable().SingleAsync(x=>x.id==instock.warehouse_id); - // - // string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID; - // List tableIds = new List(); - // tableIds.Add(_userManager.UserId); - // tableIds.Add(WmsWareHouseConst.AdministratorOrgId); - // tableIds.Add(instock.warehouse_id); - // tableIds.AddRange(materialIds); - // tableIds.Add(supplierId); - // tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); - // - // List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - // string userAccount = wmsRawmatTransferinstockH?.biller ?? ""; - // string deptCode = wmsRawmatTransferinstockH?.dept_code ?? ""; - // UserEntity userEntity = await _db.Queryable().Where(x=>x.Account==userAccount).FirstAsync(); - // string userId = userEntity?.Id ?? ""; - // string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; - // ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); - // string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - // - // List> requestData = new List>(); - // Dictionary erpRequestData = new Dictionary(); - // erpRequestData.Add("billmaker", erpCreateId); + + List materialIds = wmsMaterialSignDs.Select(x => x.material_id).Distinct().ToList(); + List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); + + string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID; + List tableIds = new List(); + tableIds.Add( wmsMaterialSignH.create_id); + tableIds.Add(WmsWareHouseConst.AdministratorOrgId); + tableIds.AddRange(materialIds); + tableIds.Add(supplierId); + tableIds.Add(wmsRawmatTransferoutstockD.unit_id); + + List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); + string userId = input.create_id; + string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; + ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); + string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + List wmsErpWarehouserelaHs = await _db.Queryable().Where(x=>!SqlFunc.IsNullOrEmpty(x.id)).ToListAsync(); + + List> requestData = new List>(); + Dictionary erpRequestData = new Dictionary(); + erpRequestData.Add("billmaker", erpCreateId); // erpRequestData.Add("cbiztype", ""); - // erpRequestData.Add("cdptid","1001A1100000000JRLI1");//部门先写死 - // erpRequestData.Add("cdptvid","0001A11000000007GGO8");//部门先写死 - // erpRequestData.Add("corpoid", erpOrg.corpoid); - // erpRequestData.Add("corpvid", erpOrg.corpvid); - // erpRequestData.Add("creationtime", nowStr); - // erpRequestData.Add("creator", erpCreateId); - // // erpRequestData.Add("cwarehouseid", erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "");//类型视图里取 - // erpRequestData.Add("cwarehouseid", erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "");//类型视图里取 - // erpRequestData.Add("dbilldate", nowStr); - // erpRequestData.Add("dmakedate", nowStr); - // erpRequestData.Add("fbillflag", 1); - // erpRequestData.Add("ntotalnum", allInstockDetails.Sum(x => x.qty)); - // erpRequestData.Add("pk_org", erpOrg.pk_org); - // erpRequestData.Add("pk_org_v", erpOrg.pk_org_v); - // erpRequestData.Add("pk_group", erpOrg.pk_group); - // erpRequestData.Add("vdef1", null); - // erpRequestData.Add("vbillcode", instock.bill_code); - // erpRequestData.Add("ctrantypeid", "0001H11000000000D31E");//先写死 - // erpRequestData.Add("vtrantypecode", "4E-01");//先写死 - // erpRequestData.Add("csourcebillhid", wmsRawmatTransferinstockH?.erp_pk ?? ""); - // - // - // List> erpRequestDataDetails = new List>(); - // foreach (WmsInstockD item in allInstockDetails) - // { - // erpRequestDataDetails.Add(new Dictionary() - // { - // ["cbodytranstypecode"] = "4E-01", - // // ["cbodywarehouseid"] = erpExtendFields.Find(x => x.table_id == instock.warehouse_id)?.cotherwhid ?? "", - // ["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.erp_warehousecode == basWarehouse.whcode)?.erp_warehouseid ?? "", - // ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", - // ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", - // ["corpoid"] = erpOrg.corpoid, - // ["corpvid"] = erpOrg.corpvid, - // ["crowno"] = (allInstockDetails.FindIndex(x => x.id == item.id) + 1) * 10, - // ["csourcebillhid"] = wmsRawmatTransferinstockH?.erp_pk ?? "", - // ["csourcebillbid"] = wmsRawmatTransferinstockD?.erp_line_pk ?? "", - // ["cunitid"] = erpExtendFields.Find(x => x.table_id == (unitDatas.Find(x => x.EnCode == item.unit_id)?.Id ?? ""))?.cunitid ?? "", - // ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", - // ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", - // ["dbizdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), - // ["dplanarrivedate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), - // ["dplanoutdate"] = instock.create_time.ToString("yyyy-MM-dd HH:mm:ss"), - // ["nnum"] = item.qty, - // ["nshouldnum"] = item.pr_qty, - // ["pk_group"] = erpOrg.pk_group, - // ["pk_org"] = erpOrg.pk_org, - // ["pk_org_v"] = erpOrg.pk_org_v, - // ["vbatchcode"] = item.code_batch, - // }); - // } - // erpRequestData.Add("dtls", erpRequestDataDetails); - // requestData.Add(erpRequestData); - // BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); - // ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); - // thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); - // thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; - // thirdWebapiRecord.name = "调拨入库"; - // thirdWebapiRecord.method = "POST"; - // thirdWebapiRecord.url = config.value + "uapws/rest/transIn/save"; - // // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save"; - // thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); - // thirdWebapiRecord.create_time = DateTime.Now; - // await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); + erpRequestData.Add("cdptid","1001A1100000000JRLI1");//部门先写死 + erpRequestData.Add("cdptvid","0001A11000000007GGO8");//部门先写死 + erpRequestData.Add("corpoid", erpOrg.corpoid); + erpRequestData.Add("corpvid", erpOrg.corpvid); + erpRequestData.Add("corpvid", erpOrg.corpvid); + erpRequestData.Add("cotherwhid", wmsErpWarehouserelaHs.Find(x=>x.wms_warehousecode==wmsRawmatTransferoutstockD.warehouse_instock_code)?.erp_warehouseid ?? ""); + erpRequestData.Add("cwarehouseid", wmsErpWarehouserelaHs.Find(x=>x.erp_warehousecode==wmsRawmatTransferoutstockD.erp_wh_type)?.erp_warehouseid ?? ""); + erpRequestData.Add("creationtime", nowStr); + erpRequestData.Add("creator", erpCreateId); + erpRequestData.Add("ctrantypeid", "0001H11000000000D32A");//先写死 + erpRequestData.Add("vtrantypecode", "4Y-01");//先写死 + erpRequestData.Add("dbilldate", nowStr); + erpRequestData.Add("dmakedate", nowStr); + erpRequestData.Add("fbillflag", 1); + erpRequestData.Add("fmodetype", 0); + erpRequestData.Add("ntotalnum", input.details.Sum(x=>x.sign_qty)); + erpRequestData.Add("pk_org", erpOrg.pk_org); + erpRequestData.Add("pk_org_v", erpOrg.pk_org_v); + erpRequestData.Add("pk_group", erpOrg.pk_group); + erpRequestData.Add("vbillcode", wmsRawmatTransferoutstockH.bill_code); + erpRequestData.Add("csourcebillhid", wmsTransferOrderH.erp_pk); + + + List> erpRequestDataDetails = new List>(); + foreach(var item in wmsMaterialSignDs) + { + // 出库数量wmsMaterialSignD.sign_qty + erpRequestDataDetails.Add(new Dictionary() + { + ["cbodytranstypecode"] = "4Y-01", + ["cbodywarehouseid"] = erpWarehouserelaHs.Find(x => x.wms_warehousecode==wmsRawmatTransferoutstockD.warehouse_instock_code)?.erp_warehouseid ?? "", + ["cmaterialoid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialoid ?? "", + ["cmaterialvid"] = erpExtendFields.Find(x => x.table_id == item.material_id)?.cmaterialvid ?? "", + ["corpoid"] = erpOrg.corpoid, + ["corpvid"] = erpOrg.corpvid, + ["crowno"] = wmsRawmatTransferoutstockD.lineno, + ["csourcebillhid"] = wmsTransferOrderH?.erp_pk ?? "", + ["csourcebillbid"] = wmsRawmatTransferoutstockD?.erp_line_pk ?? "", + ["vsourcebillcode"] = wmsTransferOrderH?.erp_bill_code ?? "", + ["vsourcerowno"] = wmsRawmatTransferoutstockD?.lineno ?? "", + ["cunitid"] = erpExtendFields.Find(x => x.table_id == wmsRawmatTransferoutstockD.unit_id)?.cunitid ?? "", + ["cvendorid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "", + ["cvendorvid"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_vid ?? "", + ["dbizdate"] = wmsTransferOrderH.create_time.Value.ToString("yyyy-MM-dd HH:mm:ss"), + ["dplanarrivedate"] = nowStr, + ["dplanoutdate"] = nowStr, + ["nnum"] = item.sign_qty, + ["nshouldnum"] = item.sign_qty, + ["pk_group"] = erpOrg.pk_group, + ["pk_org"] = erpOrg.pk_org, + ["pk_org_v"] = erpOrg.pk_org_v, + ["vbatchcode"] = item.code_batch, + ["vfree1"] = item.code_batch, + }); + } + erpRequestData.Add("dtls", erpRequestDataDetails); + requestData.Add(erpRequestData); + BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.BIPURL); + ThirdWebapiRecord thirdWebapiRecord = new ThirdWebapiRecord(); + thirdWebapiRecord.id = SnowflakeIdHelper.NextId(); + thirdWebapiRecord.third_name = WmsWareHouseConst.BIP; + thirdWebapiRecord.name = "调拨出库"; + thirdWebapiRecord.method = "POST"; + thirdWebapiRecord.url = config.value + "uapws/rest/transIn/save"; + // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save"; + thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); + thirdWebapiRecord.create_time = DateTime.Now; + await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); break; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs index 206b9090..7f310360 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsRawmatTransferinstockService.cs @@ -98,10 +98,14 @@ namespace Tnb.WarehouseMgr .ToListAsync(); List erpWarehouserelaHs = await _db.Queryable().Where(x=>x.id!=null).ToListAsync(); BasWarehouse basWarehouse = await _db.Queryable().SingleAsync(x=>x.id==instock.warehouse_id); + string userAccount = wmsRawmatTransferinstockH?.biller ?? ""; + string deptCode = wmsRawmatTransferinstockH?.dept_code ?? ""; + UserEntity userEntity = await _db.Queryable().Where(x=>x.Account==userAccount).FirstAsync(); + string userId = userEntity?.Id ?? ""; string supplierId = WmsWareHouseConst.TIANYIGONGYINGSHANG_ID; List tableIds = new List(); - tableIds.Add(_userManager.UserId); + tableIds.Add(userId); tableIds.Add(WmsWareHouseConst.AdministratorOrgId); tableIds.Add(instock.warehouse_id); tableIds.AddRange(materialIds); @@ -109,10 +113,6 @@ namespace Tnb.WarehouseMgr tableIds.AddRange(unitDatas.Select(x => x.Id).ToList()); List erpExtendFields = await _db.Queryable().Where(x => tableIds.Contains(x.table_id)).ToListAsync(); - string userAccount = wmsRawmatTransferinstockH?.biller ?? ""; - string deptCode = wmsRawmatTransferinstockH?.dept_code ?? ""; - UserEntity userEntity = await _db.Queryable().Where(x=>x.Account==userAccount).FirstAsync(); - string userId = userEntity?.Id ?? ""; string erpCreateId = erpExtendFields.Find(x => x.table_id == userId)?.user_id ?? ""; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (WmsWareHouseConst.AdministratorOrgId)); string nowStr = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");