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

Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

Browse Source 
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
This commit is contained in:
赵正易
2024-03-26 15:31:49 +08:00
parent f26209ba45 e620e3d8b9
commit 01803c1f09
36 changed files with 1140 additions and 125 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));
}

110
ZR.Admin.WebApi/Controllers/mes/wms/WmCheckLogController.cs Normal file
View File

@@ -0,0 +1,110 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.Business.IBusinessService;
//创建时间：2024-03-26
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 盘点记录
/// </summary>
[Verify]
[Route("/mes/wm//WmCheckLog")]
public class WmCheckLogController : BaseController
{
/// <summary>
/// 盘点记录接口
/// </summary>
private readonly IWmCheckLogService _WmCheckLogService;
public WmCheckLogController(IWmCheckLogService WmCheckLogService)
{
_WmCheckLogService = WmCheckLogService;
}
/// <summary>
/// 查询盘点记录列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmchecklog:list")]
public IActionResult QueryWmCheckLog([FromQuery] WmCheckLogQueryDto parm)
{
var response = _WmCheckLogService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询盘点记录详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmchecklog:query")]
public IActionResult GetWmCheckLog(int Id)
{
var response = _WmCheckLogService.GetInfo(Id);
var info = response.Adapt<WmCheckLog>();
return SUCCESS(info);
}
/// <summary>
/// 添加盘点记录
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmchecklog:add")]
[Log(Title = "盘点记录", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmCheckLog([FromBody] WmCheckLogDto parm)
{
var modal = parm.Adapt<WmCheckLog>().ToCreate(HttpContext);
var response = _WmCheckLogService.AddWmCheckLog(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新盘点记录
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmchecklog:edit")]
[Log(Title = "盘点记录", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmCheckLog([FromBody] WmCheckLogDto parm)
{
var modal = parm.Adapt<WmCheckLog>().ToUpdate(HttpContext);
var response = _WmCheckLogService.UpdateWmCheckLog(modal);
return ToResponse(response);
}
/// <summary>
/// 删除盘点记录
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmchecklog:delete")]
[Log(Title = "盘点记录", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmCheckLog(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmCheckLogService.Delete(idsArr);
return ToResponse(response);
}
}
}

110
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsNowProductionController.cs Normal file
View File

@@ -0,0 +1,110 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms.IService;
//创建时间：2024-03-22
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// 成品库当前货物表
/// </summary>
[Verify]
[Route("/mes/wm/WmGoodsNowProduction")]
public class WmGoodsNowProductionController : BaseController
{
/// <summary>
/// 成品库当前货物表接口
/// </summary>
private readonly IWmGoodsNowProductionService _WmGoodsNowProductionService;
public WmGoodsNowProductionController(IWmGoodsNowProductionService WmGoodsNowProductionService)
{
_WmGoodsNowProductionService = WmGoodsNowProductionService;
}
/// <summary>
/// 查询成品库当前货物表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsnowproduction:list")]
public IActionResult QueryWmGoodsNowProduction([FromQuery] WmGoodsNowProductionQueryDto parm)
{
var response = _WmGoodsNowProductionService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询成品库当前货物表详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsnowproduction:query")]
public IActionResult GetWmGoodsNowProduction(string Id)
{
var response = _WmGoodsNowProductionService.GetInfo(Id);
var info = response.Adapt<WmGoodsNowProduction>();
return SUCCESS(info);
}
/// <summary>
/// 添加成品库当前货物表
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsnowproduction:add")]
[Log(Title = "成品库当前货物表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmGoodsNowProduction([FromBody] WmGoodsNowProductionDto parm)
{
var modal = parm.Adapt<WmGoodsNowProduction>().ToCreate(HttpContext);
var response = _WmGoodsNowProductionService.AddWmGoodsNowProduction(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新成品库当前货物表
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsnowproduction:edit")]
[Log(Title = "成品库当前货物表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmGoodsNowProduction([FromBody] WmGoodsNowProductionDto parm)
{
var modal = parm.Adapt<WmGoodsNowProduction>().ToUpdate(HttpContext);
var response = _WmGoodsNowProductionService.UpdateWmGoodsNowProduction(modal);
return ToResponse(response);
}
/// <summary>
/// 删除成品库当前货物表
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsnowproduction:delete")]
[Log(Title = "成品库当前货物表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmGoodsNowProduction(string ids)
{
long[] idsArr = Tools.SpitLongArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmGoodsNowProductionService.Delete(idsArr);
return ToResponse(response);
}
}
}

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

@@ -33,7 +33,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:list")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:list")]
public IActionResult QueryWmGoodsOutProduction([FromQuery] WmGoodsOutProductionQueryDto parm)
{
var response = _WmGoodsOutProductionService.GetList(parm);
@@ -47,12 +47,12 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:query")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:query")]
public IActionResult GetWmGoodsOutProduction(string Id)
{
var response = _WmGoodsOutProductionService.GetInfo(Id);
var info = response.Adapt<WmGoodsOutProduction>();
var info = response.Adapt<WmGoodsOutRecord>();
return SUCCESS(info);
}
@@ -61,11 +61,11 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:add")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:add")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmGoodsOutProduction([FromBody] WmGoodsOutProductionDto parm)
{
var modal = parm.Adapt<WmGoodsOutProduction>().ToCreate(HttpContext);
var modal = parm.Adapt<WmGoodsOutRecord>().ToCreate(HttpContext);
var response = _WmGoodsOutProductionService.AddWmGoodsOutProduction(modal);
@@ -77,11 +77,11 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:edit")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:edit")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmGoodsOutProduction([FromBody] WmGoodsOutProductionDto parm)
{
var modal = parm.Adapt<WmGoodsOutProduction>().ToUpdate(HttpContext);
var modal = parm.Adapt<WmGoodsOutRecord>().ToUpdate(HttpContext);
var response = _WmGoodsOutProductionService.UpdateWmGoodsOutProduction(modal);
return ToResponse(response);
@@ -92,11 +92,11 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:delete")]
[ActionPermissionFilter(Permission = "wmsManagement:wmgoodsoutproduction:delete")]
[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);
}
}

42
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>
@@ -162,11 +165,48 @@ namespace ZR.Admin.WebApi.Controllers
{
return SUCCESS(null);
}
List<WmOutOrderPlan> WmOutOrderPlanList= _WmOutOrderService.Generate_outorderplan(shipment_num);
// TODO 1.返回值修改为 对象 返回是否可生成计划，计划结果：{canPlan:true,resultList:[]}
List<WmOutOrderPlan> WmOutOrderPlanList = _WmOutOrderService.Generate_outorderplan(shipment_num);
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);
}
}
}