wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
马健
2024-06-28 16:06:30 +08:00
parent 8f78a36e17 8a9708ffc7
commit f802feb2b9
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ProductionMgr/Tnb.ProductionMgr.Interfaces/IPrdMaterialReceiptService.cs
View File

@@ -7,12 +7,12 @@ namespace Tnb.ProductionMgr.Interfaces
/// </summary> /// </summary>
public interface IPrdMaterialReceiptService public interface IPrdMaterialReceiptService
{ {
/// <summary> // /// <summary>
/// 根据铁片二维码获取信息 // /// 根据铁片二维码获取信息
/// </summary> // /// </summary>
/// <param name="qrCode"></param> // /// <param name="qrCode"></param>
/// <returns></returns> // /// <returns></returns>
public Task<dynamic> GetInfoByQrCode(string qrCode); // public Task<dynamic> GetInfoByQrCode(string qrCode);
/// <summary> /// <summary>
/// 保存数据 /// 保存数据

4
ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
View File

@@ -507,8 +507,8 @@ namespace Tnb.ProductionMgr
{ {
org = prdFeedingH.org_id, org = prdFeedingH.org_id,
create_id = prdFeedingH.create_id, create_id = prdFeedingH.create_id,
carry_id = prdFeedingH.carry_id, carry_id = prdMaterialReceiptH.carry_id,
carry_code = prdFeedingH.carry_code, carry_code = prdMaterialReceiptH.carry_code,
carrystd_id = carry.carrystd_id, carrystd_id = carry.carrystd_id,
membercarry_code = item.member_carry_code, membercarry_code = item.member_carry_code,
membercarry_id = item.member_carry_id, membercarry_id = item.member_carry_id,

21
ProductionMgr/Tnb.ProductionMgr/PrdMaterialReceiptService.cs
View File

@@ -64,8 +64,11 @@ namespace Tnb.ProductionMgr
[HttpPost] [HttpPost]
public async Task<dynamic> GetInfoByQrCode(string qrCode) public async Task<dynamic> GetInfoByQrCode(Dictionary<String,String> dic)
{ {
string qrCode = dic["qrcode"];
string station_id = dic["station_id"];
ISqlSugarClient db = _repository.AsSugarClient(); ISqlSugarClient db = _repository.AsSugarClient();
// var result = await db.Queryable<WmsCarryH>() // var result = await db.Queryable<WmsCarryH>()
// .Where((a) => a.carry_code == qrCode) // .Where((a) => a.carry_code == qrCode)
@@ -87,12 +90,25 @@ namespace Tnb.ProductionMgr
// }) // })
// }).FirstAsync(); // }).FirstAsync();
OrganizeEntity workline = await _organizeService.GetAnyParentByWorkstationId(station_id, DictConst.RegionCategoryWorklineCode);
PrdMoTask prdMoTask = await db.Queryable<PrdMoTask>().Where(x => x.workline_id == workline.Id && x.worker_id == _userManager.UserId && x.mo_task_status==DictConst.InProgressEnCode)
.FirstAsync();
if (prdMoTask == null)
{
throw Oops.Bah("未找到进行中的任务单");
}
List<String> ids = await db.Queryable<PrdMaterialReceiptH>()
.Where(x => x.mo_task_id == prdMoTask.id).Select(x=>x.id).ToListAsync();
if (await db.Queryable<PrdMaterialReceiptD>() if (await db.Queryable<PrdMaterialReceiptD>()
.AnyAsync(x => x.member_carry_code == qrCode && x.is_all_feeding == 0)) .AnyAsync(x => x.member_carry_code == qrCode && x.is_all_feeding == 0))
{ {
FeedingDetailOutput result = await db.Queryable<PrdMaterialReceiptD>() FeedingDetailOutput result = await db.Queryable<PrdMaterialReceiptD>()
.LeftJoin<WmsCarryH>((a, b) => b.carry_code==qrCode) .LeftJoin<WmsCarryH>((a, b) => b.carry_code==qrCode)
.Where((a) => a.member_carry_code == qrCode && a.is_all_feeding == 0) .Where((a) => a.member_carry_code == qrCode && a.is_all_feeding == 0 && ids.Contains(a.material_receipt_id))
.Select((a, b) => new FeedingDetailOutput .Select((a, b) => new FeedingDetailOutput
{ {
carry_id = b.id, carry_id = b.id,
@@ -432,6 +448,7 @@ namespace Tnb.ProductionMgr
CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code}); CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code});
if (carryQueryOutput.wmsCarryCodes != null && carryQueryOutput.wmsCarryCodes.Count > 0) if (carryQueryOutput.wmsCarryCodes != null && carryQueryOutput.wmsCarryCodes.Count > 0)
{ {
Log.Information($"签收载具信息{JsonConvert.SerializeObject(carryQueryOutput)}");
foreach (var item in carryQueryOutput.wmsCarryCodes) foreach (var item in carryQueryOutput.wmsCarryCodes)
{ {