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

仓库管理-库位信息：初始化

Browse Source
This commit is contained in:
qianhao.xu
2024-03-12 17:41:03 +08:00
parent 9532be659f
commit d1a42a11e0
532 changed files with 414 additions and 48559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
ZR.Admin.WebApi/Controllers/mes/wm/MaterialReceiptController.cs
View File

@@ -1,68 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.MES.wm;
using ZR.Model.MES.wm.DTO;
using ZR.Service.mes.wm.IService;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Admin.WebApi.Controllers.mes.wm
{
[Route("mes/wm/mrt")]
public class MaterialReceiptController : BaseController
{
private readonly IMaterialReceiptService materialReceiptService;
public MaterialReceiptController(IMaterialReceiptService materialReceiptService)
{
this.materialReceiptService = materialReceiptService;
}
/// <summary>
/// 生成并查询原材料入库单
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="year"></param>
/// <param name="week"></param>
/// <param name="date"></param>
/// <returns></returns>
[HttpGet("getMaterialReceiptList")]
public IActionResult GetMaterialReceiptList(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<WmMaterialReceiptDTO>, int) data = materialReceiptService.GetWmMaterialReceiptList(pageNum, pageSize, year, week, date);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 保存单条数据
/// </summary>
/// <param name="wmMaterialReceiptDTO">一条记录参数</param>
/// <returns></returns>
[HttpPost("saveOneMaterialReceipt")]
public IActionResult saveOneMaterialReceipt([FromBody] WmMaterialReceiptDTO wmMaterialReceiptDTO)
{
int resultInt = materialReceiptService.SaveOneMaterialReceipt(wmMaterialReceiptDTO);
if (resultInt == 0)
{
return ToResponse(new ApiResult((int)ResultCode.GLOBAL_ERROR, "保存失败,数据库操作异常", "保存失败"));
}
if (resultInt == -1)
{
return ToResponse(new ApiResult((int)ResultCode.GLOBAL_ERROR, "保存失败,传入参数异常", "保存失败"));
}
return ToResponse(new ApiResult((int)ResultCode.SUCCESS, "success", "保存成功"));
}
/// <summary>
/// 保存整页数据
/// </summary>
/// <param name="list">整页数据</param>
/// <returns></returns>
[HttpPost("savePageMaterialReceipts")]
public IActionResult savePageMaterialReceipts([FromBody] List<WmMaterialReceiptDTO> list)
{
string resultStr = materialReceiptService.SavePageMaterialReceipts(list);
return ToResponse(new ApiResult((int)ResultCode.SUCCESS, "success", resultStr));
}
}
}

48
ZR.Admin.WebApi/Controllers/mes/wm/MaterialRequisitionController.cs
View File

@@ -1,48 +0,0 @@
using Infrastructure.Extensions;
using JinianNet.JNTemplate;
using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Text.Json;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.MES.wm;
using ZR.Service.mes.pro;
using ZR.Service.mes.wm.IService;
namespace ZR.Admin.WebApi.Controllers.mes.wm
{
[Route("mes/wm/mr")]
public class MaterialRequisitionController : BaseController
{
private readonly IMaterialRequisitionService mquire;
public MaterialRequisitionController(IMaterialRequisitionService mquire)
{
this.mquire = mquire;
}
/// <summary>
/// 查询领料单
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="year"></param>
/// <param name="week"></param>
/// <param name="date"></param>
/// <returns></returns>
[HttpGet("getmaterialsRequisition")]
public IActionResult GetmaterialsRequisition(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<WmMaterialrequisition>, int) data = mquire.GetmaterialsRequisition(pageNum, pageSize, year, week, date);
return ToResponse(new ApiResult(200, "success", data));
}
}
}

46
ZR.Admin.WebApi/Controllers/mes/wm/MaterialReturnController.cs
View File

@@ -1,46 +0,0 @@
using Infrastructure.Extensions;
using JinianNet.JNTemplate;
using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Text.Json;
using ZR.Admin.WebApi.Controllers;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.MES.wm;
using ZR.Service.mes.pro;
using ZR.Service.mes.wm;
using ZR.Service.mes.wm.IService;
[Route("mes/wm/return")]
public class MaterialReturnController : BaseController
{
private readonly IMaterialreturnService materialreturn;
public MaterialReturnController(IMaterialreturnService materialreturn)
{
this.materialreturn = materialreturn;
}
/// <summary>
/// 查询领料单
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="year"></param>
/// <param name="week"></param>
/// <param name="date"></param>
/// <returns></returns>
[HttpGet("getmaterialreturn")]
public IActionResult Getmaterialreturn(int pageNum, int pageSize, int year = -1, int week = -1, int date = -1)
{
(List<WmMaterialreturn>, int) data = materialreturn.Getmaterialreturn(pageNum, pageSize, year, week, date);
return ToResponse(new ApiResult(200, "success", data));
}
}

83
ZR.Admin.WebApi/Controllers/mes/wms/AreaController.cs
View File

@@ -1,83 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.POJO.DTO;
using ZR.Model.MES.wms.POJO.query;
namespace ZR.Admin.WebApi.Controllers.mes.wms
{
/// <summary>
/// 货区接口列表
/// </summary>
[Route("mes/wms/area")]
public class AreaController : BaseController
{
/// <summary>
/// 查询货区列表
/// </summary>
/// <param name="query">查询条件</param>
/// <param name="page">分页条件</param>
/// <returns></returns>
[HttpPost("list")]
public IActionResult List(AreaQuery query, Pageable page)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 导出货区列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
[HttpGet("export")]
public IActionResult Export(AreaQuery query)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 获取货区详细信息
/// </summary>
/// <param name="id">货区id</param>
/// <returns></returns>
[HttpGet("getInfo")]
public IActionResult GetInfo(long id)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 新增货区
/// </summary>
/// <param name="area">新增数据</param>
/// <returns></returns>
[HttpPost("add")]
public IActionResult Add(WmsArea area)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 修改货区
/// </summary>
/// <param name="area">修改数据</param>
/// <returns></returns>
[HttpPost("edit")]
public IActionResult Edit(WmsArea area)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 删除货区
/// </summary>
/// <param name="ids">删除id列表</param>
/// <returns></returns>
[HttpPost("remove")]
public IActionResult Remove(long[] ids)
{
return ToResponse(new ApiResult(200, "success", null));
}
}
}

83
ZR.Admin.WebApi/Controllers/mes/wms/RackController.cs
View File

@@ -1,83 +0,0 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.POJO.DTO;
using ZR.Model.MES.wms.POJO.query;
namespace ZR.Admin.WebApi.Controllers.mes.wms
{
/// <summary>
/// 货架接口列表
/// </summary>
[Route("mes/wms/rack")]
public class RackController : BaseController
{
/// <summary>
/// 查询货架列表
/// </summary>
/// <param name="query">查询条件</param>
/// <param name="page">分页条件</param>
/// <returns></returns>
[HttpPost("list")]
public IActionResult List(AreaQuery query, Pageable page)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 导出货架列表
/// </summary>
/// <param name="query">查询条件</param>
/// <returns></returns>
[HttpGet("export")]
public IActionResult Export(AreaQuery query)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 获取货架详细信息
/// </summary>
/// <param name="id">货区id</param>
/// <returns></returns>
[HttpGet("getInfo")]
public IActionResult GetInfo(long id)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 新增货架
/// </summary>
/// <param name="area">新增数据</param>
/// <returns></returns>
[HttpPost("add")]
public IActionResult Add(WmsArea area)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 修改货架
/// </summary>
/// <param name="area">修改数据</param>
/// <returns></returns>
[HttpPost("edit")]
public IActionResult Edit(WmsArea area)
{
return ToResponse(new ApiResult(200, "success", null));
}
/// <summary>
/// 删除货架
/// </summary>
/// <param name="ids">删除数据</param>
/// <returns></returns>
[HttpPost("remove")]
public IActionResult Remove(long[] ids)
{
return ToResponse(new ApiResult(200, "success", null));
}
}
}

34
ZR.Admin.WebApi/Controllers/mes/wms/WMlocationInfoController.cs Normal file
View File

@@ -0,0 +1,34 @@
using Infrastructure.Extensions;
using JinianNet.JNTemplate;
using Microsoft.AspNetCore.Mvc;
using Microsoft.IdentityModel.Tokens;
using ZR.Model.MES.qu;
using ZR.Model.MES.wms;
using ZR.Service.mes.wms.IService;
namespace ZR.Admin.WebApi.Controllers.mes.wms
{
[Route("/mes/wm/storagelocation")]
public class WMlocationInfoController : BaseController
{
private readonly IWMlocationInfoService wm_locationInfoService;
public WMlocationInfoController(IWMlocationInfoService wm_locationInfoService)
{
this.wm_locationInfoService = wm_locationInfoService;
}
/// <summary>
/// 查询仓库库位信息
/// </summary>
/// <returns></returns>
[HttpGet("production_warehouse_info")]
public IActionResult Queryproduction_warehouse_info(string shelf = "", int layer = 0,int pageNum=0,int pageSize=0)
{
(List<WmInfo>, int) data = wm_locationInfoService.Getwminfo_product(shelf, layer, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
}
}