zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

dev_DY_CC
lvzb 12 months ago
parent
0e530f0301 3681bc1c68
commit
56280a0cc3
2 changed files with 119 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 225
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
  2. 14
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

225
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
View File

@ -204,116 +204,121 @@ public class CoatingIssueJobAppService
} }
[HttpPost("sync-issue-job-stereo")] //[HttpPost("sync-issue-job-stereo")]
public virtual async Task<ReusltObject> SyncCoatingJobStereoAsync(List<CoatingIssueJobDTO> input) //public virtual async Task<ReusltObject> SyncCoatingJobStereoAsync(List<CoatingIssueJobDTO> input)
{ //{
ReusltObject ret=new ReusltObject(); // ReusltObject ret=new ReusltObject();
ret.Code = "1"; // ret.Code = "1";
ret.Message = "操作成功"; // ret.Message = "操作成功";
ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd"); // ret.OperateTime = DateTime.Now.ToString("yyyy-MM-dd");
List<IssueJobToRestoDetailDTO> IssueJobToRestoDetailDTOs = new List<IssueJobToRestoDetailDTO>(); // List<IssueJobToRestoDetailDTO> IssueJobToRestoDetailDTOs = new List<IssueJobToRestoDetailDTO>();
IssueJobToRestoDTO main=new IssueJobToRestoDTO(); // IssueJobToRestoDTO main=new IssueJobToRestoDTO();
main.OperatorName=CurrentUser.UserName; // main.OperatorName=CurrentUser.UserName;
foreach (var job in input) // foreach (var job in input)
{ // {
foreach (var jobitem in job.Details) // foreach (var jobitem in job.Details)
{ // {
IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO() // IssueJobToRestoDetailDTOs.Add(new IssueJobToRestoDetailDTO()
{ // {
Count=jobitem.HandledToQty, // Count=jobitem.HandledToQty,
ProductNo=jobitem.ItemCode, // ProductNo=jobitem.ItemCode,
NeedSite=jobitem.HandledToLocationCode, // NeedSite=jobitem.HandledToLocationCode,
WorkNo=job.Number, // WorkNo=job.Number,
TaskNo=job.Number // TaskNo=job.Number
}); // });
} // }
} // }
main.Details=IssueJobToRestoDetailDTOs; // main.Details=IssueJobToRestoDetailDTOs;
#region // #region
IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, _httpClientFactory.CreateClient()); // IssueJobToRestoClient client = new IssueJobToRestoClient(_options.Value.Address, _httpClientFactory.CreateClient());
ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false); // ret = await client.SyncIssueJobStereoAsync(main).ConfigureAwait(false);
#endregion // #endregion
return ret; // return ret;
} //}
[HttpPost("receive-issue-job-stereo")] //[HttpPost("receive-issue-job-stereo")]
public virtual async Task<ReusltObject> SyncReciveCoatingJobStereoAsync(IssueRequestFromRestoDTO input) //public virtual async Task<ReusltObject> SyncReciveCoatingJobStereoAsync(IssueRequestFromRestoDTO input)
{ //{
List<string> errors = new List<string>(); // List<string> errors = new List<string>();
var ret=new ReusltObject() // var ret=new ReusltObject()
{ // {
Code = "1", // Code = "1",
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), // OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
Message = "操作成功" // Message = "操作成功"
}; // };
try // try
{ // {
if (input.Jobs.Count > 0) // if (input.Jobs.Count > 0)
{ // {
var inputs = input.Jobs; // var inputs = input.Jobs;
var numbers = inputs.Select(p => p.JobNumber); // var numbers = inputs.Select(p => p.JobNumber);
var query = _repository.WithDetails() // var query = _repository.WithDetails()
.Where(p => numbers.Contains(p.Number)); // .Where(p => numbers.Contains(p.Number));
var entities = query.ToList(); // var entities = query.ToList();
if (input.Jobs.Count == entities.Count) { // if (input.Jobs.Count == entities.Count) {
errors.Add("出库任务和WMS出库任务不符,请核对! \n"); // errors.Add("出库任务和WMS出库任务不符,请核对! \n");
} // }
var dtos = ObjectMapper.Map<List<CoatingIssueJob>, List<CoatingIssueJobDTO>>(entities); // var dtos = ObjectMapper.Map<List<CoatingIssueJob>, List<CoatingIssueJobDTO>>(entities);
foreach (var itm in dtos) // foreach (var itm in dtos)
{ // {
var first = inputs.FirstOrDefault<IssueJobFromRestoDTO>(p => p.JobNumber == itm.Number); // var first = inputs.FirstOrDefault<IssueJobFromRestoDTO>(p => p.JobNumber == itm.Number);
List<CoatingIssueJobDetailDTO> details = new List<CoatingIssueJobDetailDTO>();
foreach (var detail in first.Details) // var itmDetails = itm.Details;
{ // List<CoatingIssueJobDetailDTO> details = new List<CoatingIssueJobDetailDTO>();
CoatingIssueJobDetailDTO dto = new CoatingIssueJobDetailDTO(); // foreach (var detail in first.Details)
dto.HandledFromLocationCode = detail.FromLocationCode; // {
dto.HandledToLocationCode = detail.ToLocationCode; // var entity=itmDetails.FirstOrDefault(p => p.ItemCode == detail.ItemCode);
dto.ItemCode = detail.ItemCode; // CoatingIssueJobDetailDTO dto = new CoatingIssueJobDetailDTO();
dto.RecommendFromQty = detail.Qty; // dto.HandledFromLocationCode = entity.HandledFromContainerCode;
dto.RecommendToQty = detail.Qty; // dto.HandledToLocationCode = entity.HandledToLocationCode;
dto.HandledFromQty = detail.Qty; // dto.ItemCode = detail.ItemCode;
dto.HandledToQty = detail.Qty; // dto.RecommendFromQty = detail.Qty;
details.Add(dto); // dto.RecommendToQty = detail.Qty;
} // dto.HandledFromQty = detail.Qty;
itm.Details = details; // dto.HandledToQty = detail.Qty;
} // details.Add(dto);
} // }
else // itm.Details = details;
{ // await CompleteAsync(itm.Id, itm).ConfigureAwait(false);
errors.Add("立体库确认单据里无数据! \n"); // }
}
} // }
catch (Exception ex) // else
{ // {
ret=new ReusltObject() // errors.Add("立体库确认单据里无数据! \n");
{ // }
Code = "2", // }
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), // catch (Exception ex)
Message = ex.Message // {
}; // ret=new ReusltObject()
return ret; // {
} // Code = "2",
// OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
if (errors.Count > 0) // Message = ex.Message
{ // };
// return ret;
ret= new ReusltObject() // }
{
Code = "2", // if (errors.Count > 0)
OperateTime = DateTime.Now.ToString("yyyy-MM-dd"), // {
Message = string.Join(",",errors.ToArray())
}; // ret= new ReusltObject()
} // {
return ret; // Code = "2",
} // OperateTime = DateTime.Now.ToString("yyyy-MM-dd"),
// Message = string.Join(",",errors.ToArray())
// };
// }
// return ret;
//}

14
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
View File

@ -437,18 +437,11 @@ public class KittingIssueJobAppService
var query = _repository.WithDetails() var query = _repository.WithDetails()
.Where(p => numbers.Contains(p.Number)); .Where(p => numbers.Contains(p.Number));
var entities = query.ToList(); var entities = query.ToList();
var dtos = ObjectMapper.Map<List<KittingIssueJob>, List<KittingIssueJobDTO>>(entities); var dtos = ObjectMapper.Map<List<KittingIssueJob>, List<KittingIssueJobDTO>>(entities);
if (input.Jobs.Count == entities.Count) if (input.Jobs.Count == entities.Count)
{ {
errors.Add("提交出库任务和WMS出库任务不符,请核对! \n"); errors.Add("提交出库任务和WMS出库任务不符,请核对! \n");
} }
foreach (var itm in dtos) foreach (var itm in dtos)
{ {
var first = jobs.FirstOrDefault<IssueJobFromRestoDTO>(p => p.JobNumber == itm.Number); var first = jobs.FirstOrDefault<IssueJobFromRestoDTO>(p => p.JobNumber == itm.Number);
@ -456,17 +449,20 @@ public class KittingIssueJobAppService
List<KittingIssueJobDetailDTO> details = new List<KittingIssueJobDetailDTO>(); List<KittingIssueJobDetailDTO> details = new List<KittingIssueJobDetailDTO>();
foreach (var detail in first.Details) foreach (var detail in first.Details)
{ {
var entity = itmDetails.FirstOrDefault(p => p.ItemCode == detail.ItemCode);
KittingIssueJobDetailDTO dto = new KittingIssueJobDetailDTO(); KittingIssueJobDetailDTO dto = new KittingIssueJobDetailDTO();
dto.HandledFromLocationCode = detail.FromLocationCode; dto.HandledFromLocationCode = entity.HandledFromLocationCode;
dto.HandledToLocationCode = detail.ToLocationCode; dto.HandledToLocationCode = entity.HandledToLocationCode;
dto.ItemCode = detail.ItemCode; dto.ItemCode = detail.ItemCode;
dto.RecommendFromQty = detail.Qty; dto.RecommendFromQty = detail.Qty;
dto.RecommendToQty = detail.Qty; dto.RecommendToQty = detail.Qty;
dto.HandledFromQty = detail.Qty; dto.HandledFromQty = detail.Qty;
dto.HandledToQty = detail.Qty; dto.HandledToQty = detail.Qty;
dto.Status =entity.Status;
details.Add(dto); details.Add(dto);
} }
itm.Details = details; itm.Details = details;
await CompleteAsync(itm.Id, itm).ConfigureAwait(false);
} }
} }
else else

Write Preview
Loading…
Cancel
Save