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:
alex
2023-07-10 13:35:01 +08:00
parent 8f9924e918 d662984b38
commit 217d4a02e0
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Aop.Api.Domain; using Aop.Api.Domain;
using JNPF.Common.Extension;
using JNPF.FriendlyException;
using Mapster; using Mapster;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
@@ -32,13 +34,14 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task<dynamic> MESCarryQuery(MESCarryQueryInput input) public async Task<dynamic> MESCarryQuery(MESCarryQueryInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input");
var results = new List<CarryQueryOutput>(); var results = new List<CarryQueryOutput>();
try try
{ {
var carrys = await _db.Queryable<WmsCarryH>() var carrys = await _db.Queryable<WmsCarryH>()
.InnerJoin<WmsCollocationSchemeH>((a, b) => a.collocation_scheme_id == b.id) .InnerJoin<WmsCollocationSchemeH>((a, b) => a.collocation_scheme_id == b.id)
.Where((a, b) => a.carry_code.Contains(input.carry_code) || b.bill_name.Contains(input.collocation_scheme_name)) .Where((a, b) => a.carry_code.Contains(input.carry_code) || b.bill_name.Contains(input.collocation_scheme_name))
.ToListAsync(); .ToListAsync();
results = carrys.Adapt<List<CarryQueryOutput>>(); results = carrys.Adapt<List<CarryQueryOutput>>();
@@ -58,6 +61,7 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input) public async Task<dynamic> MESCarryQueryResult(MESCarryQueryResultInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input");
var result = new CarryQueryOutput(); var result = new CarryQueryOutput();
try try
{ {

1
WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
View File

@@ -90,6 +90,7 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task<dynamic> MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input) public async Task<dynamic> MESCollocationSchemeQuery(MESCollocationSchemeQueryInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input");
var results = new List<CollocationSchemeOutput>(); var results = new List<CollocationSchemeOutput>();
try try
{ {

5
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyInstockService.cs
View File

@@ -171,6 +171,7 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task<dynamic> MesEmptyCarryInStock(MESEmptyCarryInStockInput input) public async Task<dynamic> MesEmptyCarryInStock(MESEmptyCarryInStockInput input)
{ {
if(input.IsNull())throw new ArgumentNullException("input");
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);
@@ -196,13 +197,11 @@ namespace Tnb.WarehouseMgr
dic[nameof(WmsEmptyInstock.create_time)] = DateTime.Now; dic[nameof(WmsEmptyInstock.create_time)] = DateTime.Now;
dic[nameof(WmsEmptyInstock.warehouse_id)] = input.warehouse_id; dic[nameof(WmsEmptyInstock.warehouse_id)] = input.warehouse_id;
VisualDevModelDataCrInput visualDevModelDataCrInput = new () VisualDevModelDataCrInput visualDevModelDataCrInput = new()
{ {
data = dic data = dic
}; };
await WmsEmptyIn(visualDevModelDataCrInput); await WmsEmptyIn(visualDevModelDataCrInput);
}
} }
catch (Exception ex) catch (Exception ex)
{ {

35
WarehouseMgr/Tnb.WarehouseMgr/WmsEmptyOutstockService .cs
View File

@@ -222,26 +222,27 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task<dynamic> MESEmptyCarryOutStk(MESEmptyCarryOutStkInput input) public async Task<dynamic> MESEmptyCarryOutStk(MESEmptyCarryOutStkInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input");
try try
{ {
var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.location_code == input.location_code); var location = await _db.Queryable<BasLocation>().SingleAsync(it => it.location_code == input.location_code);
var dic = new Dictionary<string, object>(); var dic = new Dictionary<string, object>();
dic[nameof(WmsEmptyOutstockH.id)] = SnowflakeIdHelper.NextId(); dic[nameof(WmsEmptyOutstockH.id)] = SnowflakeIdHelper.NextId();
dic[nameof(WmsEmptyOutstockH.org_id)] = input.org_id; dic[nameof(WmsEmptyOutstockH.org_id)] = input.org_id;
dic[nameof(WmsEmptyOutstockH.location_id)] = location.id; dic[nameof(WmsEmptyOutstockH.location_id)] = location.id;
dic[nameof(WmsEmptyOutstockH.carrystd_id)] = input.carrystd_id; dic[nameof(WmsEmptyOutstockH.carrystd_id)] = input.carrystd_id;
dic[nameof(WmsEmptyOutstockH.bill_code)] = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_EMPTYOUTSTK_ENCODE).GetAwaiter().GetResult(); dic[nameof(WmsEmptyOutstockH.bill_code)] = _billRullService.GetBillNumber(WmsWareHouseConst.WMS_EMPTYOUTSTK_ENCODE).GetAwaiter().GetResult();
dic[nameof(WmsEmptyOutstockH.status)] = WmsWareHouseConst.BILLSTATUS_ADD_ID; dic[nameof(WmsEmptyOutstockH.status)] = WmsWareHouseConst.BILLSTATUS_ADD_ID;
dic[nameof(WmsEmptyOutstockH.qty)] = input.qty; dic[nameof(WmsEmptyOutstockH.qty)] = input.qty;
dic[nameof(WmsEmptyOutstockH.biz_type)] = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID; dic[nameof(WmsEmptyOutstockH.biz_type)] = WmsWareHouseConst.BIZTYPE_WMSEPTYOUTSTK_ID;
dic[nameof(WmsEmptyOutstockH.create_id)] = input.create_id; dic[nameof(WmsEmptyOutstockH.create_id)] = input.create_id;
dic[nameof(WmsEmptyOutstockH.create_time)] = DateTime.Now; dic[nameof(WmsEmptyOutstockH.create_time)] = DateTime.Now;
VisualDevModelDataCrInput visualDevModelDataCrInput = new VisualDevModelDataCrInput VisualDevModelDataCrInput visualDevModelDataCrInput = new VisualDevModelDataCrInput
{ {
data = dic, data = dic,
}; };
await PDAWmsEmptyOut(visualDevModelDataCrInput); await PDAWmsEmptyOut(visualDevModelDataCrInput);
} }
catch (Exception ex) catch (Exception ex)
{ {

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

@@ -121,6 +121,7 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task MESCarrySign(MESCarrySignInput input) public async Task MESCarrySign(MESCarrySignInput input)
{ {
if (input.IsNull()) throw new ArgumentNullException("input");
var signInput = input.Adapt<SignForDeliveryInput>(); var signInput = input.Adapt<SignForDeliveryInput>();
await SignForDelivery(signInput); await SignForDelivery(signInput);
} }

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

@@ -54,6 +54,7 @@ namespace Tnb.WarehouseMgr
[HttpPost] [HttpPost]
public async Task KittingOutByAdd() public async Task KittingOutByAdd()
{ {
if (input.IsNull()) throw new ArgumentNullException("input");
try try
{ {
await _db.Ado.BeginTranAsync(); await _db.Ado.BeginTranAsync();