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:
qianjiawei
2023-07-21 17:02:55 +08:00
parent 470ae8e8f6 c4ffd8e53c
commit 42c57ed97f
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,22 +197,25 @@ namespace Tnb.WarehouseMgr
{ {
x.is_chain = 0; x.is_chain = 0;
}); });
items[^items.Count].groups = $"{groupCode}-1"; items[0].groups = groupCode;
items[0].bill_code = $"{groupCode}-1";
} }
else if ((moveNum > areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum < areaPreTasks.Count) else if ((moveNum > areaPreTasks.Count && areaPreTasks.Count > 1) || moveNum < areaPreTasks.Count)
{ {
items.ForEach(x => x.is_chain = 1); items.ForEach(x => x.is_chain = 1);
var mod = items.Count % moveNum > 0 ? items.Count / moveNum + 1 : items.Count / moveNum; var mod = items.Count % moveNum > 0 ? items.Count / moveNum + 1 : items.Count / moveNum;
int start = 0, end = moveNum;
var arrary = items.ToArray();
var itemsCount = items.Count; var itemsCount = items.Count;
var start = 0;
var end = Math.Min(itemsCount, moveNum);
var arrary = items.ToArray();
for (int i = 1; i <= mod; i++) for (int i = 1; i <= mod; i++)
{ {
if (start >= itemsCount) break; if (start >= itemsCount) break;
var subArray = arrary[start..end]; var subArray = arrary[start..end];
for (int j = 0, arrLen = subArray.Length; j < arrLen; j++) for (int j = 0, arrLen = subArray.Length; j < arrLen; j++)
{ {
subArray[j].groups = $"{groupCode}-{i}"; subArray[j].groups = groupCode;
subArray[j].bill_code = $"{groupCode}-{i}";
} }
start = end; start = end;
if ((end + moveNum) >= arrary.Length) if ((end + moveNum) >= arrary.Length)
@@ -255,7 +258,7 @@ namespace Tnb.WarehouseMgr
{ {
items[i].id = SnowflakeIdHelper.NextId(); items[i].id = SnowflakeIdHelper.NextId();
items[i].status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID; items[i].status = WmsWareHouseConst.TASK_BILL_STATUS_DZX_ID;
items[i].bill_code = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE); //items[i].groups = await _billRullService.GetBillNumber(WmsWareHouseConst.WMS_TASK_EXECUTE_ENCODE);
} }
if (moveNum == 1) if (moveNum == 1)

17
WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Dynamic; using System.Dynamic;
using System.Linq; using System.Linq;
using System.Linq.Expressions;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Aop.Api.Domain; using Aop.Api.Domain;
@@ -11,6 +12,7 @@ using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using Tnb.WarehouseMgr.Entities; using Tnb.WarehouseMgr.Entities;
using Tnb.WarehouseMgr.Entities.Consts;
using Tnb.WarehouseMgr.Entities.Dto; using Tnb.WarehouseMgr.Entities.Dto;
using Tnb.WarehouseMgr.Entities.Dto.Inputs; using Tnb.WarehouseMgr.Entities.Dto.Inputs;
using Tnb.WarehouseMgr.Entities.Dto.Outputs; using Tnb.WarehouseMgr.Entities.Dto.Outputs;
@@ -67,9 +69,18 @@ namespace Tnb.WarehouseMgr
try try
{ {
var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code); var carry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.carry_code == input.carry_code);
var carryDs = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToListAsync(); List<WmsCarryCode> carryCodes = new();
var mCarryIds = carryDs.Select(x=>x.membercarry_id).ToList(); if (carry.carrystd_id == WmsWareHouseConst.CARRY_LJSTD_ID)
var carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => mCarryIds.Contains(it.carry_id)).ToListAsync(); {
var carryDs = await _db.Queryable<WmsCarryD>().Where(it => it.carry_id == carry.id).ToListAsync();
var mCarryIds = carryDs.Select(x => x.membercarry_id).ToList();
carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => mCarryIds.Contains(it.carry_id)).ToListAsync();
}
else
{
carryCodes = await _db.Queryable<WmsCarryCode>().Where(it => it.carry_id == carry.id).ToListAsync();
}
data = carry.Adapt<CarryQueryOutput>(); data = carry.Adapt<CarryQueryOutput>();
data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>(); data.wmsCarryCodes = carryCodes.Adapt<List<CarryCodeQueryOutput>>();

14
WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs
View File

@@ -341,20 +341,6 @@ namespace Tnb.WarehouseMgr
if (input.IsNull()) throw new ArgumentNullException(nameof(input)); if (input.IsNull()) throw new ArgumentNullException(nameof(input));
try try
{ {
//var kittingOut = input[^1];
//if ((!kittingOut.carry_id.IsNullOrEmpty() || !kittingOut.carry_code.IsNullOrEmpty()) && !kittingOut.location_code.IsNullOrEmpty())
//{
// WmsCarryH? curCarry = null;
// if (!kittingOut.carry_id.IsNullOrEmpty())
// curCarry = await _db.Queryable<WmsCarryH>().SingleAsync(it => it.id == kittingOut.carry_id);
// else
// curCarry = await _db.Queryable<WmsCarryH>().FirstAsync(it => it.carry_code == kittingOut.carry_code);
// var endLocation = await _db.Queryable<BasLocation>().SingleAsync(it => it.id == kittingOut.location_code);
// var isMatch = await IsCarryAndLocationMatchByCarryStd(curCarry, endLocation);
// if (!isMatch) throw new AppFriendlyException("该载具无法放置到目标库位", 500);
//}
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();