From b63766325fc24613d481de3f35544fb22b5565ad Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期五, 11 七月 2025 16:10:32 +0800
Subject: [PATCH] 携客云改善报告，新增，审核，刷新供应商回复数据代码提交
---
StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs | 401 +++++---------------------------------------------------
1 files changed, 39 insertions(+), 362 deletions(-)
diff --git a/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs b/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
index a106240..685acd3 100644
--- a/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
+++ b/StandardPda/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
@@ -1,9 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.Modes;
+using MES.Service.service;
using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using System.Dynamic;
+using System.Threading;
namespace MESApplication.Controllers.Warehouse;
@@ -13,14 +15,39 @@
{
private readonly MesInvItemOutsManager m = new();
- //GetProductionPick
- [HttpPost("GetProductionPick")]
- public ResponseResult GetProductionPick(WarehouseQuery entity)
+ private readonly MessageCenterManager _manager = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "MesInvItemOuts";
+
+ private readonly string URL = "http://localhost:10054/api/MesInvItemOuts/";
+
+ /// <summary>
+ /// 閲囪喘閫�璐х敵璇峰崟
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ReturnRequest")]
+ public ResponseResult ReturnRequest(ItemOut oItemOut)
{
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "ReturnRequest";
+ entity.Method = METHOD;
+ entity.Data = Newtonsoft.Json.JsonConvert.SerializeObject(oItemOut);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetProductionPick(entity);
+ var result = m.ReturnRequest(oItemOut);
+ resultInfos.tbBillList = result;
+
+ entity.Result = 0;
+ if (result) entity.Result = 1;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
return new ResponseResult
{
status = 0,
@@ -30,363 +57,14 @@
}
catch (Exception ex)
{
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
return ResponseResult.ResponseError(ex);
}
}
-
- //GetProductionPickPage
- [HttpPost("GetProductionPickPage")]
- public ResponseResult GetProductionPickPage(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetProductionPickPage(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //AuditProduction
- [HttpPost("AuditProduction")]
- public ResponseResult AuditProduction(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.AuditProduction(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //MesToErp
- [HttpPost("SaveProductionMessageCenter")]
- public ResponseResult SaveProductionMessageCenter(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SaveProductionMessageCenter(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("ScanCode")]
- public ResponseResult ScanCode(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanCode(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("GetScanBarcode")]
- public ResponseResult GetScanBarcode(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetScanBarcode(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("SaveMessageCenter")]
- public ResponseResult SaveMessageCenter(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SaveMessageCenter(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetItemOutNo
- [HttpPost("GetItemOutNo")]
- public ResponseResult GetItemOutNo()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItemOutNo();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- //Audit
- [HttpPost("Audit")]
- public ResponseResult Audit(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Audit(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //SetNFlag
- [HttpPost("SetNFlag")]
- public ResponseResult SetNFlag(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SetNFlag(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //DeApproveBefore
- [HttpPost("DeApproveBefore")]
- public ResponseResult DeApproveBefore(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeApproveBefore(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("DeApprove")]
- public ResponseResult DeApprove(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeApprove(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //SaveCombination
- [HttpPost("SaveCombination")]
- public ResponseResult SaveCombination(OutItemDto dto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SaveCombination(dto);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetMaxItemOutNo
- [HttpPost("GetMaxItemOutNo")]
- public ResponseResult GetMaxItemOutNo()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetMaxItemOutNo();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("GetPage")]
- public ResponseResult GetPage(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetPage(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetItems
- [HttpPost("GetItems")]
- public ResponseResult GetItems(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItems(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("GetSumItem")]
- public ResponseResult GetSumItem(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetSumItem(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //SelectMaterials
- [HttpPost("SelectMaterials")]
- public ResponseResult SelectMaterials(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SelectMaterials(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
/// <summary>
/// 鑾峰彇鎵�鏈�
@@ -490,8 +168,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity(
- [FromBody] MesInvItemOuts data)
+ public ResponseResult InsertReturnIdentity([FromBody] MesInvItemOuts data)
{
try
{
--
Gitblit v1.9.3