From a66d0c0a9a3dcd4b888d7481fe2e538c6dd6865a Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 16 Jul 2024 10:11:26 +0800 Subject: [PATCH 1/2] ... --- ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs index 5286bf22..55add93a 100644 --- a/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs +++ b/ProductionMgr/Tnb.ProductionMgr/TimeWorkService.cs @@ -280,6 +280,9 @@ namespace Tnb.ProductionMgr .Where((x, y) => x.code == "ZSJ") .Select((x, y) => y).ToListAsync(); + int? cs01Count = await _redisData.TryGetValueByKeyField("YTCS", "EmptyNo_CS01"); + int? cs03Count = await _redisData.TryGetValueByKeyField("YTCS", "EmptyNo_CS03"); + List eqpIds = equipments.Select(x => x.id).ToList(); List eqpDaqs = await _db.Queryable().Where(x => eqpIds.Contains(x.equip_id) && x.label_name.Contains("允许入空箱")).ToListAsync(); //BasFactoryConfig config = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.DOMAIN); @@ -475,7 +478,16 @@ namespace Tnb.ProductionMgr stopwatch.Stop(); elapsedMilliseconds = stopwatch.ElapsedMilliseconds; - thirdResult = JsonConvert.DeserializeObject(response); + try + { + thirdResult = JsonConvert.DeserializeObject(response); + } + catch (Exception e) + { + thirdResult.Code = 500; + thirdResult.msgResult = response; + } + if (thirdResult.Code == 200) { await _db.Updateable() From 97045e3bbe6fdb51c17f929cbf2c1fbec951661f Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 16 Jul 2024 12:37:34 +0800 Subject: [PATCH 2/2] bug --- WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs | 9 +++++---- .../Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs index 01c9e88d..2e5738d7 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs @@ -2367,6 +2367,7 @@ namespace Tnb.WarehouseMgr List erpExtendFields = await _db.Queryable().Where(x=>ids.Contains(x.table_id)).ToListAsync(); string erpCreateId = erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.create_id)?.user_id ?? ""; ErpExtendField erpOrg = erpExtendFields.Find(x => x.table_id == (wmsMaterialTransfer.org_id ?? WmsWareHouseConst.AdministratorOrgId)); + string nowStr = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); List> requestData = new List>(); Dictionary erpRequestData = new Dictionary(); @@ -2374,13 +2375,13 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("billmaker",erpCreateId); erpRequestData.Add("corpoid",erpOrg.corpoid); erpRequestData.Add("corpvid",erpOrg.corpvid); - erpRequestData.Add("creationtime",DateTime.Now); + erpRequestData.Add("creationtime",nowStr); erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("ctrantypeid","0001H11000000000D30Z"); erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); erpRequestData.Add("cwhsmanagerid",""); - erpRequestData.Add("dbilldate",DateTime.Now); - erpRequestData.Add("dmakedate",DateTime.Now); + erpRequestData.Add("dbilldate",nowStr); + erpRequestData.Add("dmakedate",nowStr); erpRequestData.Add("ntotalnum",wmsMaterialTransferDs.Sum(x=>x.qty)); erpRequestData.Add("pk_group",erpOrg.pk_group); erpRequestData.Add("pk_org",erpOrg.pk_org); @@ -2405,7 +2406,7 @@ namespace Tnb.WarehouseMgr ["cunitid"] = erpExtendFields.Find(x=>x.table_id==(unitDatas.Find(x=>x.EnCode==item.unit_id)?.Id ?? ""))?.cunitid ?? "", ["cvendorid"] = "", ["cvendorvid"] = "", - ["dbizdate"] = DateTime.Now, + ["dbizdate"] = nowStr, ["nnum"] = item.qty, ["pk_group"] = erpOrg.pk_group, ["pk_org"] = erpOrg.pk_org, diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs index 151c2981..991b0816 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs @@ -649,6 +649,7 @@ namespace Tnb.WarehouseMgr List> requestData = new List>(); Dictionary erpRequestData = new Dictionary(); + string nowStr = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); erpRequestData.Add("billmaker",erpCreateId); erpRequestData.Add("cdptid","1001A1100000000JRLI1A100");// 先写死 erpRequestData.Add("cdptvid","0001A11000000007GGO8");// 先写死 @@ -656,12 +657,12 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("corpvid",erpOrg.corpoid); erpRequestData.Add("cothercalbodyoid",erpOrg.cdptid); erpRequestData.Add("cotherwhid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_instock)?.cotherwhid ?? ""); - erpRequestData.Add("creationtime",DateTime.Now); + erpRequestData.Add("creationtime",nowStr); erpRequestData.Add("creator",erpCreateId); erpRequestData.Add("ctrantypeid","0001H11000000000D31W"); erpRequestData.Add("cwarehouseid",erpExtendFields.Find(x=>x.table_id==wmsMaterialTransfer.warehouse_outstock)?.cotherwhid ?? ""); - erpRequestData.Add("dbilldate",DateTime.Now); - erpRequestData.Add("dmakedate",DateTime.Now); + erpRequestData.Add("dbilldate",nowStr); + erpRequestData.Add("dmakedate",nowStr); erpRequestData.Add("ntotalnum",wmsCarryCodes.Sum(r => r.codeqty)); erpRequestData.Add("pk_group",erpOrg.pk_group); erpRequestData.Add("pk_org",erpOrg.pk_org); @@ -683,7 +684,7 @@ namespace Tnb.WarehouseMgr ["cunitid"] = erpExtendFields.Find(x=>x.table_id==unitData.Id)?.cunitid ?? "", ["cvendorid"] = "", ["cvendorvid"] = "", - ["dbizdate"] = DateTime.Now, + ["dbizdate"] = nowStr, ["nnum"] = wmsCarryCodes.Sum(r => r.codeqty), ["nshouldnum"] = wmsMaterialTransferd.qty, ["pk_group"] = erpOrg.pk_group,