diff --git a/BasicData/Tnb.BasicData/ThirdApiRecordService.cs b/BasicData/Tnb.BasicData/ThirdApiRecordService.cs index 6b80dee3..988a4166 100644 --- a/BasicData/Tnb.BasicData/ThirdApiRecordService.cs +++ b/BasicData/Tnb.BasicData/ThirdApiRecordService.cs @@ -164,6 +164,7 @@ namespace Tnb.BasicData .SetColumns(x => x.response_data == response) .SetColumns(x => x.response_code == thirdResult.Code) .SetColumns(x => x.last_send_time == now) + .SetColumns(x => x.error_count == x.error_count + 1) .SetColumns(x => x.response_time == elapsedMilliseconds) .Where(x=>x.id==record.id) .ExecuteCommandAsync(); diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs index 4c6b2d15..873b11d3 100644 --- a/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs +++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs @@ -254,10 +254,10 @@ public partial class PrdMoTask : BaseEntity /// /// 按时间更换批次次数 /// - public int change_batch_count_by_day { get; set; } = -1; + public int change_batch_count_by_day { get; set; } = -2; /// /// 按产量更换批次次数 /// - public int change_batch_count_by_qty { get; set; } = -1; + public int change_batch_count_by_qty { get; set; } = -2; } diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs index b23a507e..a6092235 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPrdInstockHService.cs @@ -418,7 +418,7 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("pk_group", erpOrg.pk_group); erpRequestData.Add("vbillcode", instock.bill_code); erpRequestData.Add("vtrantypecode", "46-01"); - erpRequestData.Add("csourcebillhid", prdReport?.erp_pk_wr ?? "");//todo 后面填 + erpRequestData.Add("csourcebillhid", prdReport?.erp_pk_wr ?? ""); erpRequestData.Add("report_id", prdReport?.id ?? ""); diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs index 478e51bd..5dd77d48 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSterilizationInstockHService.cs @@ -168,6 +168,7 @@ namespace Tnb.WarehouseMgr erpRequestData.Add("vbillcode", wmsRawmatTransferoutstockH.bill_code); erpRequestData.Add("ctrantypeid", tranTypeid);//先写死 erpRequestData.Add("vtrantypecode", tranTypecode);//先写死 + erpRequestData.Add("distask_code", input.wmsDistaskH.bill_code);//先写死 List> erpRequestDataDetails = new List>(); foreach(var item in wmsCarryCodes) @@ -203,6 +204,7 @@ namespace Tnb.WarehouseMgr thirdWebapiRecord.url = WmsWareHouseConst.BIP_DOMAIN + "uapws/rest/whstrans/save"; thirdWebapiRecord.request_data = JsonConvert.SerializeObject(erpRequestData); thirdWebapiRecord.create_time = DateTime.Now; + thirdWebapiRecord.remark = $"任务号wms_distask_h:{input.wmsDistaskH.bill_code}"; await _db.Insertable(thirdWebapiRecord).ExecuteCommandAsync(); BasFactoryConfig callErp = await _db.Queryable().FirstAsync(x => x.enabled == 1 && x.key == FactoryConfigConst.CALLERP);