Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库管理:库位：update

Browse Source
This commit is contained in:
qianhao.xu
2024-03-23 14:31:50 +08:00
parent f7eb497570
commit 1272af5989
23 changed files with 294 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ZR.Admin.WebApi/Controllers/mes/wms/WMlocationInfoController.cs
View File

@@ -26,9 +26,9 @@ namespace ZR.Admin.WebApi.Controllers.mes.wms
/// </summary>
/// <returns></returns>
[HttpGet("production_warehouse_info")]
public IActionResult Queryproduction_warehouse_info(string shelf = "", int layer = 0, int pageNum = 0, int pageSize = 0)
public IActionResult Queryproduction_warehouse_info(string shelf , int? layer , int pageNum = 0, int pageSize = 0)
{
(List<WmInfo>, int) data = wm_locationInfoService.Getwminfo_product(shelf, layer, pageNum, pageSize);
(List<WmInfo>, int) data = wm_locationInfoService.Getwminfo_product(shelf, layer??0, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}

2
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsNowProductionController.cs
View File

@@ -95,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers
[Log(Title = "成品库当前货物表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmGoodsNowProduction(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
long[] idsArr = Tools.SpitLongArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmGoodsNowProductionService.Delete(idsArr);

2
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs
View File

@@ -96,7 +96,7 @@ namespace ZR.Admin.WebApi.Controllers
[Log(Title = "出库货物记录表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmGoodsOutProduction(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
long[] idsArr = Tools.SpitLongArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmGoodsOutProductionService.Delete(idsArr);

14
ZR.Admin.WebApi/Controllers/mes/wms/WmMaterialController.cs
View File

@@ -107,6 +107,20 @@ namespace ZR.Admin.WebApi.Controllers
}
[HttpGet("getInfoByPatchCode")]
[Log(Title = "物料记录表", BusinessType = BusinessType.QUERY)]
public IActionResult GetInfoByPatchCode(string patchCode)
{
if (string.IsNullOrEmpty(patchCode))
{
return SUCCESS(null);
}
WmGoodsNowProduction nowProduction= _WmMaterialService.GetInfoByPatchCode(patchCode);
return SUCCESS(nowProduction);
}
}

39
ZR.Admin.WebApi/Controllers/mes/wms/WmOutOrderController.cs
View File

@@ -6,6 +6,7 @@ using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms.Dto;
using ZR.Model.MES.wms;
using ZR.Service.mes.wms;
using static System.Runtime.InteropServices.JavaScript.JSType;
//创建时间：2024-03-18
namespace ZR.Admin.WebApi.Controllers
@@ -150,6 +151,8 @@ namespace ZR.Admin.WebApi.Controllers
List<WmMaterialQuery_print> data = _WmOutOrderService.Queryoutoder_matrials(shipment_num);
return SUCCESS(data);
}
/// <summary>
/// 生成出货单的出货计划
/// </summary>
@@ -166,7 +169,43 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(WmOutOrderPlanList);
}
/// <summary>
/// 5 成品出库
/// </summary>
/// <param name="doMaterialOut"></param>
/// <returns>
///
/// </returns>
[HttpPost("doMaterialOut")]
public IActionResult DoMaterialOut([FromBody] WmDoMaterialOut_Dto doMaterialOut)
{
if(doMaterialOut == null||doMaterialOut.ShipmentNum==null)
{
return SUCCESS(null);
}
(int,int) data= _WmOutOrderService.DoMaterialOut(doMaterialOut, HttpContext.GetName());
return SUCCESS(data);
}
/// <summary>
/// 6 出库单完成
/// </summary>
/// <param name="shipment_num"></param>
/// <returns></returns>
[HttpGet("over_outorderplan")]
public IActionResult OverOutorderplan(string shipment_num)
{
if (shipment_num == null)
{
return SUCCESS(null);
}
bool status = _WmOutOrderService.OverOutorderplan(shipment_num);
return SUCCESS(status);
}
}
}

14
ZR.Admin.WebApi/Filters/GlobalActionMonitor.cs
View File

@@ -34,9 +34,16 @@ namespace ZR.Admin.WebApi.Filters
{
ApiResult response = new();
response.Code = (int)ResultCode.PARAM_ERROR;
// todo 模型校验
/*
在.Net Core的时代中，框架会帮你自动验证model的state，也就是ModelState。
框架会为你自动注册ModelStateInvalidFilter，
这个会运行在OnActionExecuting事件里面。
*/
var values = context.ModelState.Values;
//todo 在干啥？？？
// return next();
foreach (var item in values)
{
foreach (var err in item.Errors)
@@ -64,7 +71,8 @@ namespace ZR.Admin.WebApi.Filters
}
/// <summary>
/// OnActionExecuted是在Action中的代码执行之后运行的方法。
/// 写入操作日志
/// OnActionExecuted是在Action中的代码执行之后运行的方法。
/// </summary>
/// <param name="context"></param>
public override void OnResultExecuted(ResultExecutedContext context)

7
ZR.Admin.WebApi/Program.cs
View File

@@ -2,6 +2,7 @@ using AspNetCoreRateLimit;
using Infrastructure;
using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens;
using System.Text.Json.Serialization;
using ZR.Admin.WebApi.AutoMapperProfile;
@@ -92,7 +93,11 @@ builder.Services.AddMvc(options =>
builder.Services.AddSwaggerConfig();
builder.Services.AddAutoMapper(typeof(AutoMapperProfile));
//关闭参数自动校验,我们需要返回自定义的格式
builder.Services.Configure<ApiBehaviorOptions>((o) =>
{
o.SuppressModelStateInvalidFilter = true;
});
var app = builder.Build();
InternalApp.ServiceProvider = app.Services;
InternalApp.Configuration = builder.Configuration;