From 8d341db9d2d5699d527c88c935f0c4ce255a57a4 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期二, 10 十二月 2024 16:38:12 +0800
Subject: [PATCH] 代码提交
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
index 93eb1fa..3a1f79d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs"
@@ -1,10 +1,16 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.Attributes;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO;
+using WIDESEA_DTO.Basic;
using WIDESEA_External.ERPService;
-using WIDESEA_External.Model;
+using WIDESEA_IInboundRepository;
+using WIDESEA_IInboundService;
+using WIDESEA_Model.Models;
namespace WIDESEA_WMSServer.Controllers.ERP
{
@@ -12,23 +18,52 @@
[ApiController]
public class ErpController : ControllerBase
{
- private readonly IERPInvokeService _service;
- public ErpController(IERPInvokeService service)
+ private readonly IPurchaseOrderRepository _purchaseOrderRepository;
+ private readonly IPurchaseOrderService _purchaseOrderService;
+
+ public ErpController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService)
{
- _service = service;
+ _purchaseOrderRepository = purchaseOrderRepository;
+ _purchaseOrderService = purchaseOrderService;
}
- [HttpPost, Route("ReceivePurchaseOrder"), AllowAnonymous]
- public WebResponseContent ReceivePurchaseOrder([FromBody] PurchaseOrderModel model)
+ [HttpPost, Route("ReceivePurchaseOrder"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent ReceivePurchaseOrder([FromBody] Dt_PurchaseOrder model)
{
try
{
- return _service.ReceivePurchaseOrder(model);
+ _purchaseOrderRepository.AddData(model, x => x.Details);
+
+ foreach (var item in model.Details)
+ {
+ Dt_ReceiveOrder receiveOrder = new Dt_ReceiveOrder()
+ {
+ ReceiveOrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ WarehouseId = item.WarehouseId,
+ SuppliersId = model.SupplierCode,
+ ReceiveOrderType = InOrderTypeEnum.Purchase.ObjToInt(),
+ ReceiveDate = DateTime.Now,
+ };
+ }
+
+ return WebResponseContent.Instance.OK();
}
- catch (Exception ex)
+ catch (Exception ex)
{
return WebResponseContent.Instance.Error(ex.Message);
}
}
+
+ public WebResponseContent ReceivePurchaseOrderSingle(PurchaseOrderModel model)
+ {
+ return _purchaseOrderService.ReceivePurchaseOrderSingle(model);
+ }
+
+ [HttpPost, Route("Test"), AllowAnonymous]
+ public WebResponseContent Test(string str)
+ {
+ MatSerNumAnalysisModel model = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(WIDESEA_Core.CodeConfigEnum.AnalysisCodeEnum.MatSerNumAnalysis, str);
+ return WebResponseContent.Instance.OK(model.Serialize());
+ }
}
}
--
Gitblit v1.9.3