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:
贺立波
2023-06-29 15:35:26 +08:00
parent b5440eb27a 3c270ce8f5
commit e001b9e7f6
4 changed files with 67 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BasicData/Tnb.BasicData.Entities/Dto/BasDefect/DefectOutput.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace Tnb.BasicData.Entities.Dto
{
public class DefectOutput
{
public string id { get; set; }
public string defect_code { get; set; }
public string defect_name { get; set; }
}
}

22
BasicData/Tnb.BasicData/BasDefectService.cs
View File

@@ -5,6 +5,7 @@ using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev; using JNPF.VisualDev;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using Tnb.BasicData.Entities.Dto;
using Tnb.BasicData.Entities; using Tnb.BasicData.Entities;
using Tnb.BasicData.Interfaces; using Tnb.BasicData.Interfaces;
@@ -33,11 +34,22 @@ namespace Tnb.BasicData
public async Task<dynamic> GetDefectListByProcessId(Dictionary<string, string> dic) public async Task<dynamic> GetDefectListByProcessId(Dictionary<string, string> dic)
{ {
string processId = dic["processId"]; string processId = dic["processId"];
return await _repository.AsSugarClient().Queryable<BasProcessDefective>() var db = _repository.AsSugarClient();
.LeftJoin<BasProcess>((a, b) => a.process_id == b.id) List<string> defectIds = await db.Queryable<BasProcessDefective>().Where(x=>x.process_id==processId).Select(x=>x.defective_id).ToListAsync();
.LeftJoin<BasDefect>((a, b, c) => a.defective_id == c.id) List<string> defectTypeIds = await db.Queryable<BasDefect>().Where(x=>defectIds.Contains(x.id) && x.enabled==1).Select(x=>x.defect_type_id).ToListAsync();
.Where((a, b, c) => a.process_id == processId) return await _repository.AsSugarClient().Queryable<BasDefectType>()
.Select((a, b, c) => c).ToListAsync(); .Where((a) => defectTypeIds.Contains(a.id))
.Select(a => new
{
defect_type_id = a.id,
defect_type_name = a.defect_type_name,
children = SqlFunc.Subqueryable<BasDefect>().Where(x=>x.defect_type_id==a.id && defectIds.Contains(x.id)).ToList(x=>new DefectOutput()
{
id = x.id,
defect_code = x.defect_code,
defect_name = x.defect_name,
})
}).ToListAsync();
} }
} }
} }

15
WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
View File

@@ -224,7 +224,20 @@ namespace Tnb.WarehouseMgr
} }
} }
} }
var isOk = await _wareHouseService.GenPreTask(preTasks, null); List<WmsPretaskCode> pretaskCodes = new();
foreach (var pt in preTasks)
{
var partCodes = carryCodes.FindAll(x => x.carry_id == pt.carry_id).Distinct().ToList();
var curPreTaskCodes = partCodes.Adapt<List<WmsPretaskCode>>();
curPreTaskCodes.ForEach(x =>
{
x.id=SnowflakeIdHelper.NextId();
x.bill_id = pt.id;
x.create_time = DateTime.Now;
});
pretaskCodes.AddRange(curPreTaskCodes);
}
var isOk = await _wareHouseService.GenPreTask(preTasks, pretaskCodes);
GenPreTaskUpInput genPreTaskAfterUpInput = new(); GenPreTaskUpInput genPreTaskAfterUpInput = new();
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList(); genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList(); genPreTaskAfterUpInput.LocationIds = new HashSet<string>(locIds).ToList();

44
WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
View File

@@ -79,27 +79,35 @@ namespace Tnb.WarehouseMgr
{ {
if (_dicBizType.ContainsKey(disTask.biz_type)) if (_dicBizType.ContainsKey(disTask.biz_type))
{ {
switch (_dicBizType[disTask.biz_type]) WareHouseUpInput upInput = new() {
{ loginType = "web",
case "空载具出库": bizTypeId = disTask.biz_type,
case "寄存出库": requireId = disTask.require_id,
case "齐套出库": carryIds = new List<string> { input.carryId },
case "一般出库": distaskCodes = input.distaskCodes };
{ await DoUpdate(upInput); //回更业务
WareHouseUpInput upInput = new() { loginType = "web", bizTypeId = disTask.biz_type, requireId = disTask.require_id, carryIds = new List<string> { input.carryId } }; //switch (_dicBizType[disTask.biz_type])
await DoUpdate(upInput); //回更业务 //{
// case "空载具出库":
// case "寄存出库":
// case "齐套出库":
// case "一般出库":
// {
// WareHouseUpInput upInput = new() { loginType = "web", bizTypeId = disTask.biz_type, requireId = disTask.require_id, carryIds = new List<string> { input.carryId }, distaskCodes = input.distaskCodes };
// await DoUpdate(upInput); //回更业务
} // }
break; // break;
case "载具移出": // case "载具移出":
{ // {
WareHouseUpInput upInput = new() { loginType = "web", bizTypeId = disTask.biz_type, requireId = disTask.require_id, carryIds = new List<string> { input.carryId } }; // WareHouseUpInput upInput = new() { loginType = "web", bizTypeId = disTask.biz_type, requireId = disTask.require_id, carryIds = new List<string> { input.carryId }, distaskCodes = input.distaskCodes };
await DoUpdate(upInput); //回更业务 // await DoUpdate(upInput); //回更业务
} // }
break; // break;
} //}
} }
disTask.is_sign = 1; disTask.is_sign = 1;
await _db.Updateable(disTask).UpdateColumns(it => it.is_sign).ExecuteCommandAsync(); await _db.Updateable(disTask).UpdateColumns(it => it.is_sign).ExecuteCommandAsync();