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(); } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs index c269b076..3e88494a 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs @@ -132,7 +132,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); @@ -180,7 +180,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(); @@ -189,7 +189,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(); }