From 5fdf7d0cac0f6941baa140446f78aebc5981479f Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Thu, 5 Sep 2024 10:27:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=A0=87=E5=87=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs b/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs index e71ed103..2d7f0342 100644 --- a/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs +++ b/PerMgr/Tnb.PerMgr/PerProcessParamTypeService.cs @@ -135,7 +135,7 @@ namespace Tnb.PerMgr List notDeleteIds = input.Select(x => x.id).ToList(); notDeleteIds.AddRange(insertIds); - await db.Deleteable().Where(x => !notDeleteIds.Contains(x.id)).ExecuteCommandAsync(); + await db.Deleteable().Where(x => !notDeleteIds.Contains(x.id) && x.process_standards_id==input[0].process_standards_id).ExecuteCommandAsync(); } From 28173f67595da3ac1711642367a2241ce17e4d69 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Thu, 5 Sep 2024 10:30:12 +0800 Subject: [PATCH 2/2] bug --- .../Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs index d2fd0e80..cd4c9543 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs @@ -133,7 +133,7 @@ namespace Tnb.WarehouseMgr 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>(); + //List> requestData = new List>(); Dictionary erpRequestData = new Dictionary(); erpRequestData.Add("billmaker", erpCreateId); erpRequestData.Add("corpoid", erpOrg.corpoid); @@ -181,7 +181,7 @@ namespace Tnb.WarehouseMgr }); } erpRequestData.Add("dtls", erpRequestDataDetails); - requestData.Add(erpRequestData); + // 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(); @@ -190,7 +190,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.method = "POST"; thirdWebapiRecord.url = config.value + "uapws/rest/whstrans/save"; // thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/transIn/save"; - thirdWebapiRecord.request_data = JsonConvert.SerializeObject(requestData); + thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); thirdWebapiRecord.create_time = DateTime.Now; await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); }