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

仓库模块_出库货物记录:init

Browse Source
This commit is contained in:
qianhao.xu
2024-03-22 08:54:11 +08:00
parent 2074ea2e84
commit dac58ddb77
20 changed files with 800 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ZR.Admin.WebApi/Controllers/mes/qc/FQC/QCStatisticsController.cs
View File

@@ -4,9 +4,13 @@ using ZR.Admin.WebApi.Hubs;
using ZR.Service.mes.qc.IService;
using Microsoft.AspNetCore.Mvc;
using ZR.Model.MES.qc;
using System.Collections.Generic;
namespace ZR.Admin.WebApi.Controllers.mes.qc.FQC
{
/// <summary>
/// 生成报表
/// </summary>
[Route("mes/qc/statistics")]
public class QCStatisticsController : BaseController
{
@@ -64,8 +68,12 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.FQC
}
[HttpGet("delete_statisticsTable")]
public IActionResult DeleteStatisticsTable(string workorderid)
{
int deletenum= qcStatistics.DeleteStatisticsTable(workorderid);
return SUCCESS(deletenum);
}
}
}

111
ZR.Admin.WebApi/Controllers/mes/wms/WmGoodsOutProductionController.cs Normal file
View File

@@ -0,0 +1,111 @@
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/WmGoodsOutProduction")]
public class WmGoodsOutProductionController : BaseController
{
/// <summary>
/// 出库货物记录表接口
/// </summary>
private readonly IWmGoodsOutProductionService _WmGoodsOutProductionService;
public WmGoodsOutProductionController(IWmGoodsOutProductionService WmGoodsOutProductionService)
{
_WmGoodsOutProductionService = WmGoodsOutProductionService;
}
/// <summary>
/// 查询出库货物记录表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:list")]
public IActionResult QueryWmGoodsOutProduction([FromQuery] WmGoodsOutProductionQueryDto parm)
{
var response = _WmGoodsOutProductionService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询出库货物记录表详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:query")]
public IActionResult GetWmGoodsOutProduction(string Id)
{
var response = _WmGoodsOutProductionService.GetInfo(Id);
var info = response.Adapt<WmGoodsOutProduction>();
return SUCCESS(info);
}
/// <summary>
/// 添加出库货物记录表
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:add")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmGoodsOutProduction([FromBody] WmGoodsOutProductionDto parm)
{
var modal = parm.Adapt<WmGoodsOutProduction>().ToCreate(HttpContext);
var response = _WmGoodsOutProductionService.AddWmGoodsOutProduction(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新出库货物记录表
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:edit")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateWmGoodsOutProduction([FromBody] WmGoodsOutProductionDto parm)
{
var modal = parm.Adapt<WmGoodsOutProduction>().ToUpdate(HttpContext);
var response = _WmGoodsOutProductionService.UpdateWmGoodsOutProduction(modal);
return ToResponse(response);
}
/// <summary>
/// 删除出库货物记录表
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "business:wmgoodsoutproduction:delete")]
[Log(Title = "出库货物记录表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmGoodsOutProduction(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmGoodsOutProductionService.Delete(idsArr);
return ToResponse(response);
}
}
}

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

@@ -135,6 +135,37 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 生成出货单的物料信息
/// </summary>
/// <returns></returns>
[HttpGet("getoutorder_matrials")]
public IActionResult Queryoutoder_matrials(string shipment_num)
{
if (shipment_num == null)
{
return SUCCESS(null);
}
List<WmMaterialQuery_print> data = _WmOutOrderService.Queryoutoder_matrials(shipment_num);
return SUCCESS(data);
}
/// <summary>
/// 生成出货单的出货计划
/// </summary>
/// <param name="shipment_num"></param>
/// <returns></returns>
[HttpGet("generate_outorderplan")]
public IActionResult Generate_outorderplan(string shipment_num)
{
if (shipment_num == null)
{
return SUCCESS(null);
}
List<WmOutOrderPlan> WmOutOrderPlanList= _WmOutOrderService.Generate_outorderplan(shipment_num);
return SUCCESS(WmOutOrderPlanList);
}
}

8
ZR.Admin.WebApi/appsettings.development.json
View File

@@ -10,13 +10,13 @@
"dbConfigs": [
{
//外网连接服务器
"Conn": "Data Source=localhost;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
//本地连接服务器
// "Conn": "Data Source=localhost;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
//外网连接服务器
//"Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
//内网连接服务器
//"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
"Type": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4,
"ConfigId": "0", //多租户唯一标识
"IsAutoCloseConnection": true
@@ -26,7 +26,7 @@
//代码生成数据库配置
"CodeGenDbConfig": {
//代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
"Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog={dbName};",
"Conn": "Data Source=192.168.0.36;Port=3306;User ID=root;Password=123456;Initial Catalog={dbName};",
"DbType": 0,
"IsAutoCloseConnection": true,
"DbName": "ZrAdmin" //代码生成默认连接数据库

BIN
ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-出库货物记录表-0322083827.zip Normal file
View File

Binary file not shown.