删除掉暂存单
This commit is contained in:
@@ -15,6 +15,12 @@ namespace WMS.Web.Core.Dto.Erp
|
||||
this.FormId = formId;
|
||||
this.Numbers =new List<string>() { number };
|
||||
}
|
||||
public ErpOperateDto(string formId, string number,string ids)
|
||||
{
|
||||
this.FormId = formId;
|
||||
this.Numbers = new List<string>() { };
|
||||
this.Ids = ids;
|
||||
}
|
||||
/// <summary>
|
||||
/// 业务对象表单Id(必录)
|
||||
/// </summary>
|
||||
@@ -24,5 +30,7 @@ namespace WMS.Web.Core.Dto.Erp
|
||||
/// 单据编码
|
||||
/// </summary>
|
||||
public List<string> Numbers { get; set; }
|
||||
|
||||
public string Ids { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -964,8 +964,8 @@ namespace WMS.Web.Domain.Services
|
||||
FormId = FormIdParam.PUR_PurchaseOrder.ToString(),
|
||||
TargetFormId = FormIdParam.STK_InStock.ToString(),
|
||||
DetailsId = det.ErpDetailId.ToString(),
|
||||
// IsDraftWhenSaveFail = true//是否需要暂存fa
|
||||
IsDraftWhenSaveFail = false//是否需要暂存
|
||||
IsDraftWhenSaveFail = true//是否需要暂存fa
|
||||
//IsDraftWhenSaveFail = false//是否需要暂存
|
||||
};
|
||||
|
||||
var erp_InStockBillNos = erp_InStockErpDetails.Where(x => x.SourceBillNo == det.SourceBillNo).Select(x => x.ErpSyncBillNo).ToList();
|
||||
@@ -1055,8 +1055,8 @@ namespace WMS.Web.Domain.Services
|
||||
FormId = FormIdParam.PRD_MORPT.ToString(),
|
||||
TargetFormId = FormIdParam.PRD_INSTOCK.ToString(),
|
||||
DetailsId = det.ErpDetailId.ToString(),
|
||||
// IsDraftWhenSaveFail = true//是否需要暂存
|
||||
IsDraftWhenSaveFail = false//是否需要暂存
|
||||
IsDraftWhenSaveFail = true//是否需要暂存
|
||||
//IsDraftWhenSaveFail = false//是否需要暂存
|
||||
};
|
||||
|
||||
var erp_InStockBillNos = erp_InStockErpDetails.Where(x => x.SourceBillNo == det.SourceBillNo).Select(x => x.ErpSyncBillNo).ToList();
|
||||
@@ -1166,6 +1166,9 @@ namespace WMS.Web.Domain.Services
|
||||
var res_s = await sc_erpService.Save<ErpProduceInStockSaveDto>(purchaseInStock, formId);
|
||||
if (!res_s.IsSuccess)
|
||||
{
|
||||
ErpOperateDto o_dto1 = new ErpOperateDto(dto.TargetFormId, null, id);//res_s.Data
|
||||
//如果有错,就删除相关单据
|
||||
var del_res = await sc_erpService.Delete(o_dto1, "PRD_INSTOCK");
|
||||
_logger.LogInformation($"入库单->保存失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{res_s.Message}");
|
||||
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.SubmitFail, "", purchaseInStock.Details[0].DetailId);
|
||||
}
|
||||
|
||||
@@ -717,7 +717,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
|
||||
//2.时间条件:可能还有其它条件
|
||||
//var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00");
|
||||
var beginStr = DateTime.Now.AddDays(-300).ToString("yyyy-MM-dd HH:mm:ss");
|
||||
var beginStr = DateTime.Now.AddDays(-3).ToString("yyyy-MM-dd HH:mm:ss");
|
||||
if (beginTime != null) beginStr = beginTime?.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
|
||||
//3.获取金蝶分步式入库订单:拼接参数和条件
|
||||
@@ -1901,6 +1901,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
}
|
||||
|
||||
var msg = jobject["Result"]["ResponseStatus"]["Errors"][0]["Message"].ToString();
|
||||
|
||||
|
||||
return Result<string>.ReFailure(msg, 10002);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -2017,7 +2019,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
var token_result = await this.Init();
|
||||
if (!token_result.IsSuccess)
|
||||
return token_result;
|
||||
var query = new ErpBillQueryDto(token_result.Data);
|
||||
var query = new ErpBillQueryDto(token_result.Data,formId);
|
||||
|
||||
//提交
|
||||
query.Data = JsonConvert.SerializeObject(dto);
|
||||
@@ -2043,6 +2045,7 @@ namespace WMS.Web.Domain.Services.Public
|
||||
/// <returns></returns>
|
||||
public async Task<Result<string>> Push(ErpPushDto dto)
|
||||
{
|
||||
string id = "";
|
||||
try
|
||||
{
|
||||
var token_result = await this.Init();
|
||||
@@ -2057,10 +2060,11 @@ namespace WMS.Web.Domain.Services.Public
|
||||
JObject jobject = (JObject)JsonConvert.DeserializeObject(result_json);
|
||||
var isSuccess = jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower();
|
||||
|
||||
|
||||
if (jobject["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToLower() == "true")
|
||||
{
|
||||
//保存成功后返回Id 后续操作根据Id操作
|
||||
string id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Id"].ToString();
|
||||
id = jobject["Result"]["ResponseStatus"]["SuccessEntitys"][0]["Id"].ToString();
|
||||
return Result<string>.ReSuccess(id);
|
||||
}
|
||||
|
||||
@@ -2069,6 +2073,8 @@ namespace WMS.Web.Domain.Services.Public
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
|
||||
return Result<string>.ReFailure(ex.ToString(), 10002);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user