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:
yang.lee
2023-12-17 20:30:41 +08:00
parent 0888719b39 afaf05e5a4
commit dc784077f0
3 changed files with 87 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/CheckPutInput.cs
View File

@@ -9,12 +9,26 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
public class CheckPutInput
{
public string point_code { get; set; }
public int type { get; set; }
}
public enum exectype
{
放 = 0,
取 = 1
/// <summary>
/// 任务链编号
/// </summary>
public string taskChainCode { get; set; }
/// <summary>
/// 子任务编号
/// </summary>
public string taskCode { get; set; }
/// <summary>
/// 起点编号
/// </summary>
public string sourceName { get; set; }
/// <summary>
/// 终点编号
/// </summary>
public string targetName { get; set; }
/// <summary>
/// 料箱code
/// </summary>
public string containerCode { get; set; }
}
}

29
WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs
View File

@@ -13,6 +13,7 @@ using JNPF.Common.Security;
using JNPF.FriendlyException;
using JNPF.Systems.Interfaces.System;
using Mapster;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.CodeAnalysis;
@@ -241,37 +242,31 @@ namespace Tnb.WarehouseMgr
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task CheckPut(CheckPutInput input)
{
Dictionary<string, string[]> putdic = new Dictionary<string, string[]>();
putdic.Add("SSX-021-005", new string[] { "CS05", "ConveyorAllowPutEmptyBox" });
putdic.Add("SSX-021-006", new string[] { "CS06", "ConveyorAllowPutEmptyBox" });
Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
getdic.Add("SSX-021-005", new string[] { "CS05", "FullBoxAllowGet" });
getdic.Add("SSX-021-006", new string[] { "CS06", "FullBoxAllowGet" });
// Dictionary<string, string[]> getdic = new Dictionary<string, string[]>();
// getdic.Add("SSX-021-005", new string[] { "CS05", "FullBoxAllowGet" });
// getdic.Add("SSX-021-006", new string[] { "CS06", "FullBoxAllowGet" });
var strs = new string[] { };
if (input.type == (int)exectype.放)
{
if (!putdic.ContainsKey(input.point_code))
throw new AppFriendlyException("点位" + input.point_code + "不存在", 500);
strs = putdic.Where(p => p.Key == input.point_code).First().Value;
}
else if (input.type == (int)exectype.取)
{
if (!getdic.ContainsKey(input.point_code))
throw new AppFriendlyException("点位" + input.point_code + "不存在", 500);
strs = getdic.Where(p => p.Key == input.point_code).First().Value;
}
if (!putdic.ContainsKey(input.targetName))
throw new AppFriendlyException("点位" + input.targetName + "不存在", 500);
strs = putdic.Where(p => p.Key == input.targetName).First().Value;
bool flag = await _redisData.HashExist(strs[0], strs[1]);
if (!flag)
{
throw new AppFriendlyException("点位" + input.point_code + "不存在", 500);
throw new AppFriendlyException("点位" + input.targetName + "不存在", 500);
}
string data = await _redisData.GetHash(strs[0], strs[1]);
JObject? res = JsonConvert.DeserializeObject<JObject>(data);
bool result = res != null && res["Value"] != null ? res.Value<bool>("Value") : false;
if (!result)
throw new AppFriendlyException("点位" + input.point_code + "不可放", 500);
throw new AppFriendlyException("点位" + input.targetName + "不可放", 500);
}
/// <summary>