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

出库接口添加

Browse Source
This commit is contained in:
赵正易
2024-03-27 17:19:24 +08:00
parent a980a980a0
commit c756597610
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,9 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Admin.WebApi.Extensions; using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters; using ZR.Admin.WebApi.Filters;
using ZR.Service.mes.wms.IService;
using ZR.Model.MES.wms.Dto;
using ZR.Model.MES.wms; using ZR.Model.MES.wms;
using ZR.Service.mes.wms; using ZR.Model.MES.wms.Dto;
using static System.Runtime.InteropServices.JavaScript.JSType; using ZR.Service.mes.wms.IService;
//创建时间：2024-03-18 //创建时间：2024-03-18
namespace ZR.Admin.WebApi.Controllers namespace ZR.Admin.WebApi.Controllers
@@ -14,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary> /// <summary>
/// 出货单（物料+客户） /// 出货单（物料+客户）
/// </summary> /// </summary>
[Verify] // [Verify]
[Route("mes/wm/WmOutOrder")] [Route("mes/wm/WmOutOrder")]
public class WmOutOrderController : BaseController public class WmOutOrderController : BaseController
{ {
@@ -38,7 +35,7 @@ namespace ZR.Admin.WebApi.Controllers
public IActionResult QueryWmOutOrder([FromQuery] WmOutOrderQueryDto parm) public IActionResult QueryWmOutOrder([FromQuery] WmOutOrderQueryDto parm)
{ {
var response = _WmOutOrderService.GetList(parm); var response = _WmOutOrderService.GetList(parm);
return SUCCESS(response); return SUCCESS(response);
} }
@@ -65,7 +62,7 @@ namespace ZR.Admin.WebApi.Controllers
[Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.INSERT)] [Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.INSERT)]
public IActionResult AddWmOutOrder([FromBody] WmOutOrder_materialDto parm) public IActionResult AddWmOutOrder([FromBody] WmOutOrder_materialDto parm)
{ {
if(parm == null) if (parm == null)
{ {
return SUCCESS(null); return SUCCESS(null);
} }
@@ -100,9 +97,9 @@ namespace ZR.Admin.WebApi.Controllers
[Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.DELETE)] [Log(Title = "出货单（物料+客户）", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteWmOutOrder(string ids) public IActionResult DeleteWmOutOrder(string ids)
{ {
if (string.IsNullOrEmpty(ids)) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } if (string.IsNullOrEmpty(ids)) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _WmOutOrderService.Delete(ids.Split(",")); var response = _WmOutOrderService.Delete(ids.Split(","));
@@ -116,8 +113,8 @@ namespace ZR.Admin.WebApi.Controllers
[HttpGet("getcustom_list")] [HttpGet("getcustom_list")]
public IActionResult GetWmOutOrder() public IActionResult GetWmOutOrder()
{ {
List<WmCustom> customs= _WmOutOrderService.GetCustominfo(); List<WmCustom> customs = _WmOutOrderService.GetCustominfo();
return SUCCESS(customs); return SUCCESS(customs);
} }
@@ -127,7 +124,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="parm"></param> /// <param name="parm"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("getmaterial_list")] [HttpGet("getmaterial_list")]
public IActionResult QueryWmMaterial([FromQuery] WmMaterialQueryDto parm) public IActionResult QueryWmMaterial([FromQuery] WmMaterialQueryDto parm)
{ {
var response = _WmOutOrderService.GetmaterialList(parm); var response = _WmOutOrderService.GetmaterialList(parm);
@@ -141,7 +138,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet("getoutorder_matrials")] [HttpGet("getoutorder_matrials")]
public IActionResult Queryoutoder_matrials(string shipment_num) public IActionResult Queryoutoder_matrials(string shipment_num)
{ {
if (shipment_num == null) if (shipment_num == null)
{ {
@@ -159,14 +156,14 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="shipment_num"></param> /// <param name="shipment_num"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("generate_outorderplan")] [HttpGet("generate_outorderplan")]
public IActionResult Generate_outorderplan(string shipment_num) public IActionResult Generate_outorderplan(string shipment_num)
{ {
if (shipment_num == null) if (shipment_num == null)
{ {
return SUCCESS(null); return SUCCESS(null);
} }
// TODO 1.返回值修改为 对象 返回是否可生成计划，计划结果：{canPlan:true,resultList:[]} // TODO 1.返回值修改为 对象 返回是否可生成计划，计划结果：{canPlan:true,resultList:[]}
List<WmOutOrderPlan> WmOutOrderPlanList = _WmOutOrderService.Generate_outorderplan(shipment_num); List<WmOutOrderPlan> WmOutOrderPlanList = _WmOutOrderService.Generate_outorderplan(shipment_num);
return SUCCESS(WmOutOrderPlanList); return SUCCESS(WmOutOrderPlanList);
} }
@@ -178,14 +175,14 @@ namespace ZR.Admin.WebApi.Controllers
/// ///
/// </returns> /// </returns>
[HttpPost("doMaterialOut")] [HttpPost("doMaterialOut")]
public IActionResult DoMaterialOut([FromBody] WmDoMaterialOut_Dto doMaterialOut) public IActionResult DoMaterialOut([FromBody] WmDoMaterialOut_Dto doMaterialOut)
{ {
if(doMaterialOut == null||doMaterialOut.ShipmentNum==null) if (doMaterialOut == null || doMaterialOut.ShipmentNum == null)
{ {
return SUCCESS(null); return SUCCESS(null);
} }
(int,int) data= _WmOutOrderService.DoMaterialOut(doMaterialOut, HttpContext.GetName()); (int, int) data = _WmOutOrderService.DoMaterialOut(doMaterialOut, HttpContext.GetName());
return SUCCESS(data); return SUCCESS(data);
} }
@@ -197,7 +194,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="shipment_num"></param> /// <param name="shipment_num"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet("over_outorderplan")] [HttpGet("over_outorderplan")]
public IActionResult OverOutorderplan(string shipment_num) public IActionResult OverOutorderplan(string shipment_num)
{ {
if (shipment_num == null) if (shipment_num == null)
{ {
@@ -208,5 +205,18 @@ namespace ZR.Admin.WebApi.Controllers
return SUCCESS(status); return SUCCESS(status);
} }
/// <summary>
/// 7 检查是否可出库
/// </summary>
/// <param name="production_packcode">扫码结果</param>
/// <param name="shipment_num">出库单号</param>
/// <returns></returns>
[HttpGet("checkProductionOut")]
public IActionResult checkProductionOut(string production_packcode = "", string shipment_num = "")
{
string msg = "可出库";
return ToResponse(new ApiResult(200, msg, true));
}
} }
} }