From a75d7e725df5686caf39cc1dade2d6fae11c3d40 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 13 十二月 2024 16:46:32 +0800
Subject: [PATCH] 更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/edabd823-9c10-4009-8e95-cb1d3217eb83.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs | 53 +++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ISupplierInfoService.cs | 6
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs | 6
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs | 149 +++++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a8d0b8fd-acc9-4a57-a8ad-394a2d0e11e0.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs | 76 +++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundOrderService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetail_HtyService.cs | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs | 14
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/SupplierInfoService.cs | 51 +++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs | 7
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs | 14
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrder_HtyService.cs | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/ERP/ErpController.cs | 192 ++----------
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 11
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs | 15
/dev/null | 27 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterielInfoService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/412af394-9dac-4306-95f6-39fd60896df6.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6698150-4fc6-4ad0-a0c8-f0d9b263a855.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs | 15
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.xml | 163 ++++++++++
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ce72d7b5-21c0-485a-b3a5-52df88bd7a47.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 22 +
34 files changed, 649 insertions(+), 197 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/14ef4958-5f37-43d7-b6b6-32b232fbb4bc.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/14ef4958-5f37-43d7-b6b6-32b232fbb4bc.vsidx"
deleted file mode 100644
index 88d9196..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/14ef4958-5f37-43d7-b6b6-32b232fbb4bc.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/412af394-9dac-4306-95f6-39fd60896df6.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/412af394-9dac-4306-95f6-39fd60896df6.vsidx"
new file mode 100644
index 0000000..d93638a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/412af394-9dac-4306-95f6-39fd60896df6.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a8d0b8fd-acc9-4a57-a8ad-394a2d0e11e0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a8d0b8fd-acc9-4a57-a8ad-394a2d0e11e0.vsidx"
new file mode 100644
index 0000000..972d9e2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/a8d0b8fd-acc9-4a57-a8ad-394a2d0e11e0.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6698150-4fc6-4ad0-a0c8-f0d9b263a855.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6698150-4fc6-4ad0-a0c8-f0d9b263a855.vsidx"
new file mode 100644
index 0000000..882b66c
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b6698150-4fc6-4ad0-a0c8-f0d9b263a855.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c9f3f4cc-1088-4f89-861d-e06654ee2ded.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c9f3f4cc-1088-4f89-861d-e06654ee2ded.vsidx"
deleted file mode 100644
index f791915..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c9f3f4cc-1088-4f89-861d-e06654ee2ded.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ca62f48d-432c-4d58-86d0-434723bd9fe0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ca62f48d-432c-4d58-86d0-434723bd9fe0.vsidx"
deleted file mode 100644
index bb2adee..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ca62f48d-432c-4d58-86d0-434723bd9fe0.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ce72d7b5-21c0-485a-b3a5-52df88bd7a47.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ce72d7b5-21c0-485a-b3a5-52df88bd7a47.vsidx"
new file mode 100644
index 0000000..ff19bd8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ce72d7b5-21c0-485a-b3a5-52df88bd7a47.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d98d9afe-9e7d-42bb-a74d-be4c0981ccda.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d98d9afe-9e7d-42bb-a74d-be4c0981ccda.vsidx"
deleted file mode 100644
index bdefe6a..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d98d9afe-9e7d-42bb-a74d-be4c0981ccda.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/df8c89a0-0422-4f14-9c5d-6b61ed92a257.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/df8c89a0-0422-4f14-9c5d-6b61ed92a257.vsidx"
deleted file mode 100644
index 269d480..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/df8c89a0-0422-4f14-9c5d-6b61ed92a257.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/edabd823-9c10-4009-8e95-cb1d3217eb83.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/edabd823-9c10-4009-8e95-cb1d3217eb83.vsidx"
new file mode 100644
index 0000000..574d1c2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/edabd823-9c10-4009-8e95-cb1d3217eb83.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
index 3e62230..c449ae2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
@@ -3,7 +3,12 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_BasicRepository;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.MaterielEnum;
+using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.Basic;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
@@ -36,5 +41,76 @@
{
return BaseDal.QueryData(x => materielCodes.Contains(x.MaterielCode));
}
+
+ public WebResponseContent ReceiveMaterial(MaterielInfoDTO model)
+ {
+ try
+ {
+ if (model.OperateType == 0)
+ {
+ Dt_MaterielInfo materielInfo = new Dt_MaterielInfo()
+ {
+ IsCheck = (WhetherEnum)model.IsCheck,
+ MaterielCode = model.Code,
+ MaterielInvOrgId = model.InvOrgId,
+ MaterielLength = model.Length,
+ MaterielModel = model.Model,
+ MaterielName = model.Name,
+ MaterielSize = model.Size,
+ MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType,
+ MaterielSpec = "model.",
+ MaterielState = (EnableEnum)model.State,
+ MaterielThickness = model.Thickness,
+ MaterielType = (MaterielTypeEnum)model.ItemType,
+ MaterielUnit = model.Unit,
+ MaterielVersion = model.MaterialVersion,
+ MaterielWide = model.Wide,
+ WarehouseId = model.WaId,
+ };
+ BaseDal.AddData(materielInfo);
+ }
+ else if (model.OperateType == 1)
+ {
+ Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欎俊鎭�");
+ }
+
+ materielInfo.IsCheck = (WhetherEnum)model.IsCheck;
+ materielInfo.MaterielCode = model.Code;
+ materielInfo.MaterielInvOrgId = model.InvOrgId;
+ materielInfo.MaterielLength = model.Length;
+ materielInfo.MaterielModel = model.Model;
+ materielInfo.MaterielName = model.Name;
+ materielInfo.MaterielSize = model.Size;
+ materielInfo.MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType;
+ materielInfo.MaterielSpec = model.StandType;
+ materielInfo.MaterielState = (EnableEnum)model.State;
+ materielInfo.MaterielThickness = model.Thickness;
+ materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType;
+ materielInfo.MaterielUnit = model.Unit;
+ materielInfo.MaterielVersion = model.MaterialVersion;
+ materielInfo.MaterielWide = model.Wide;
+ materielInfo.WarehouseId = model.WaId;
+ BaseDal.UpdateData(materielInfo);
+ }
+ else if (model.OperateType == 2)
+ {
+ Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欎俊鎭�");
+ }
+
+ BaseDal.DeleteData(materielInfo);
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/SupplierInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/SupplierInfoService.cs"
index 400844c..a99cfdd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/SupplierInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/SupplierInfoService.cs"
@@ -3,7 +3,10 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_BasicRepository;
+using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.Basic;
using WIDESEA_IBasicRepository;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
@@ -15,5 +18,53 @@
public SupplierInfoService(ISupplierInfoRepository BaseDal) : base(BaseDal)
{
}
+
+ public ISupplierInfoRepository Repository => BaseDal;
+
+ public WebResponseContent ReceiveSupplier(SupplierDTO model)
+ {
+ try
+ {
+ if (model.OperateType == "0")
+ {
+ Dt_SupplierInfo supplierInfo = new Dt_SupplierInfo()
+ {
+ Status = 1,
+ SupplierCode = model.Code,
+ SupplierName = model.Name,
+ SupplierShortName = model.ShortName
+ };
+
+ BaseDal.AddData(supplierInfo);
+ }
+ else if (model.OperateType == "1")
+ {
+ Dt_SupplierInfo supplierInfo = BaseDal.QueryFirst(x => x.SupplierCode == model.Code);
+ if (supplierInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌渚涘簲鍟嗕俊鎭�");
+ }
+ supplierInfo.Status = 1;
+ supplierInfo.SupplierCode = model.Code;
+ supplierInfo.SupplierName = model.Name;
+ supplierInfo.SupplierShortName = model.ShortName;
+ BaseDal.UpdateData(supplierInfo);
+ }
+ else if (model.OperateType == "2")
+ {
+ Dt_SupplierInfo supplierInfo = BaseDal.QueryFirst(x => x.SupplierCode == model.Code);
+ if (supplierInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌渚涘簲鍟嗕俊鎭�");
+ }
+ BaseDal.DeleteData(supplierInfo);
+ }
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs"
index c038bf7..426a86e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseController/ApiBaseController.cs"
@@ -23,48 +23,88 @@
Service = service;
}
+ /// <summary>
+ /// 鍒嗛〉鑾峰彇鏁版嵁
+ /// </summary>
+ /// <param name="options"></param>
+ /// <returns></returns>
[HttpPost, Route("GetPageData")]
public virtual ActionResult GetPageData([FromBody] PageDataOptions options)
{
return Json(InvokeService("GetPageData", new object[] { options }));
}
+ /// <summary>
+ /// 鍒嗛〉鑾峰彇鏄庣粏鏁版嵁
+ /// </summary>
+ /// <param name="pageData"></param>
+ /// <returns></returns>
[HttpPost, Route("GetDetailPage")]
public virtual ActionResult GetDetailPage([FromBody] PageDataOptions pageData)
{
return Json(InvokeService("GetDetailPage", new object[] { pageData }));
}
+ /// <summary>
+ /// 娣诲姞鏁版嵁
+ /// </summary>
+ /// <param name="options"></param>
+ /// <returns></returns>
[HttpPost, Route("AddData")]
public virtual ActionResult AddData([FromBody] TEntity options)
{
return Json(InvokeService("AddData", new object[] { options }));
}
+ /// <summary>
+ /// 娣诲姞鏁版嵁
+ /// </summary>
+ /// <param name="options"></param>
+ /// <returns></returns>
[HttpPost, Route("Add"), MethodParamsValidate]
public virtual ActionResult Add([FromBody] SaveModel options)
{
return Json(InvokeService("AddData", new object[] { options }));
}
+ /// <summary>
+ /// 淇敼鏁版嵁
+ /// </summary>
+ /// <param name="options"></param>
+ /// <returns></returns>
[HttpPost, Route("Update"), MethodParamsValidate]
public virtual ActionResult Update([FromBody] SaveModel options)
{
return Json(InvokeService("UpdateData", new object[] { options }));
}
+ /// <summary>
+ /// 淇敼鏁版嵁
+ /// </summary>
+ /// <param name="options"></param>
+ /// <returns></returns>
[HttpPost, Route("UpdateData")]
public virtual ActionResult UpdateData([FromBody] TEntity options)
{
return Json(InvokeService("UpdateData", new object[] { options }));
}
+ /// <summary>
+ /// 鍒犻櫎鏁版嵁
+ /// </summary>
+ /// <param name="key"></param>
+ /// <returns></returns>
[HttpPost, Route("Del")]
public virtual ActionResult Del([FromBody] object[] key)
{
return Json(InvokeService("DeleteData", new object[] { key }));
}
+ /// <summary>
+ /// 瀵煎嚭鏁版嵁
+ /// </summary>
+ /// <param name="loadData"></param>
+ /// <returns></returns>
[HttpPost, Route("Export")]
public virtual ActionResult Export([FromBody] PageDataOptions loadData)
{
@@ -78,6 +118,10 @@
return Json(result);
}
+ /// <summary>
+ /// 涓嬭浇瀵煎叆妯℃澘
+ /// </summary>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("DownLoadTemplate")]
public virtual ActionResult DownLoadTemplate()
{
@@ -91,12 +135,21 @@
return Json(result);
}
+ /// <summary>
+ /// 瀵煎叆鏁版嵁
+ /// </summary>
+ /// <param name="fileInput"></param>
+ /// <returns></returns>
[HttpPost, Route("Import")]
public virtual ActionResult Import(List<IFormFile> fileInput)
{
return Json(InvokeService("Import", new object[] { fileInput }));
}
+ /// <summary>
+ /// 瀵煎嚭绉嶅瓙鏁版嵁
+ /// </summary>
+ /// <returns></returns>
[HttpPost, Route("ExportSeedData"), AllowAnonymous]
public ActionResult ExportSeedData()
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
index 2785bea..264c52b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
@@ -27,7 +27,7 @@
{
if (services == null) throw new ArgumentNullException(nameof(services));
- var basePath = AppContext.BaseDirectory;
+ var basePath = AppDomain.CurrentDomain.BaseDirectory;
//var basePath2 = Microsoft.DotNet.PlatformAbstractions.ApplicationEnvironment.ApplicationBasePath;
var ApiName = AppSettings.Get(new string[] { "ApiName" });
@@ -50,14 +50,15 @@
c.UseInlineDefinitionsForEnums();
try
{
- //杩欎釜灏辨槸鍒氬垰閰嶇疆鐨剎ml鏂囦欢鍚�
- //var xmlPath = Path.Combine(basePath, "Blog.Core.xml");
+ var xmlPath = Path.Combine(basePath, "WIDESEA_WMSServer.xml");
//榛樿鐨勭浜屼釜鍙傛暟鏄痜alse锛岃繖涓槸controller鐨勬敞閲婏紝璁板緱淇敼
- //c.IncludeXmlComments(xmlPath, true);
+ c.IncludeXmlComments(xmlPath, true);
- //杩欎釜灏辨槸Model灞傜殑xml鏂囦欢鍚�
- //var xmlModelPath = Path.Combine(basePath, "Blog.Core.Model.xml");
- //c.IncludeXmlComments(xmlModelPath);
+ var xmlModelPath = Path.Combine(basePath, "WIDESEA_Model.xml");
+ c.IncludeXmlComments(xmlModelPath);
+
+ var xmlDTOPath = Path.Combine(basePath, "WIDESEA_DTO.xml");
+ c.IncludeXmlComments(xmlDTOPath);
}
catch (Exception ex)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterielInfoService.cs"
index 15acaf7..9553997 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterielInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/IMaterielInfoService.cs"
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.Basic;
using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;
@@ -22,5 +23,6 @@
List<Dt_MaterielInfo> GetMaterielInfos(List<string> materielCodes);
+ WebResponseContent ReceiveMaterial(MaterielInfoDTO model);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ISupplierInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ISupplierInfoService.cs"
index b37c267..77bf100 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ISupplierInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ISupplierInfoService.cs"
@@ -3,12 +3,18 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.Basic;
+using WIDESEA_IBasicRepository;
using WIDESEA_Model.Models;
namespace WIDESEA_IBasicService
{
public interface ISupplierInfoService : IService<Dt_SupplierInfo>
{
+ ISupplierInfoRepository Repository { get; }
+
+ WebResponseContent ReceiveSupplier(SupplierDTO model);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs"
index 733f4e7..4fb1fff 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IInboundService/IPurchaseOrderService.cs"
@@ -12,6 +12,6 @@
{
public interface IPurchaseOrderService : IService<Dt_PurchaseOrder>
{
- WebResponseContent ReceivePurchaseOrderSingle(PurchaseOrderModel model);
+ WebResponseContent ReceivePurchaseOrder(PurchaseOrderModel model);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundOrderService.cs"
index 1f9c2d3..c3e78d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundOrderService.cs"
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Inbound;
using WIDESEA_DTO.Outbound;
using WIDESEA_IOutboundRepository;
@@ -15,5 +16,7 @@
public interface IOutboundOrderService : IService<Dt_OutboundOrder>
{
IOutboundOrderRepository Repository { get; }
+
+ WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
index a3d2f5a..bdf2fad 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/PurchaseOrderService.cs"
@@ -28,7 +28,7 @@
_unitOfWorkManage = unitOfWorkManage;
}
- public WebResponseContent ReceivePurchaseOrderSingle(PurchaseOrderModel model)
+ public WebResponseContent ReceivePurchaseOrder(PurchaseOrderModel model)
{
try
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
index e0af58f..831d292 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
@@ -32,6 +32,9 @@
[SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏂瑰紡", IsOnlyIgnoreUpdate = true)]
public int CreateType { get; set; }
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠撳簱涓婚敭")]
+ public int WarehouseId { get; set; }
+
[SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs"
index 614f2ba..e1433c0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrderDetail.cs"
@@ -26,14 +26,17 @@
[SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鎵规鍙�")]
public string BatchNo { get; set; }
- [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "鍗曟嵁鏁伴噺")]
- public decimal OrderQuantity { get; set; }
+ [SugarColumn(IsNullable = false, ColumnDescription = "琛屽彿")]
+ public int RowNo { get; set; }
- [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "閿佸畾鏁伴噺", DefaultValue = "0")]
- public decimal LockQuantity { get; set; }
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鏁伴噺")]
+ public float OrderQuantity { get; set; }
- [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "宸插嚭鏁伴噺", DefaultValue = "0")]
- public decimal OverOutQuantity { get; set; }
+ [SugarColumn(IsNullable = false, ColumnDescription = "閿佸畾鏁伴噺", DefaultValue = "0")]
+ public float LockQuantity { get; set; }
+
+ [SugarColumn(IsNullable = false, ColumnDescription = "宸插嚭鏁伴噺", DefaultValue = "0")]
+ public float OverOutQuantity { get; set; }
[SugarColumn(IsNullable = false, ColumnDescription = "璁㈠崟鏄庣粏鐘舵��")]
public int OrderDetailStatus { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
deleted file mode 100644
index 153d7bb..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
+++ /dev/null
@@ -1,37 +0,0 @@
-锘縰sing AutoMapper;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common.OrderEnum;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Utilities;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_IBasicService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_OutboundService
-{
- public partial class OutboundOrderService : ServiceBase<Dt_OutboundOrder, IOutboundOrderRepository>, IOutboundOrderService
- {
- private readonly IMapper _mapper;
-
- public IOutboundOrderRepository Repository => BaseDal;
-
- public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper) : base(BaseDal)
- {
- _mapper = mapper;
- }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutStockLockInfoService.cs"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderDetailService.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetailService.cs"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderDetail_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetail_HtyService.cs"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderDetail_HtyService.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderDetail_HtyService.cs"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
new file mode 100644
index 0000000..fa29aa5
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs"
@@ -0,0 +1,149 @@
+锘縰sing AutoMapper;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Core;
+using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
+using WIDESEA_Core.Utilities;
+using WIDESEA_DTO.ERP;
+using WIDESEA_DTO.Inbound;
+using WIDESEA_DTO.Outbound;
+using WIDESEA_IBasicService;
+using WIDESEA_IOutboundRepository;
+using WIDESEA_IOutboundService;
+using WIDESEA_IStockService;
+using WIDESEA_Model.Models;
+
+namespace WIDESEA_OutboundService
+{
+ public class OutboundOrderService : ServiceBase<Dt_OutboundOrder, IOutboundOrderRepository>, IOutboundOrderService
+ {
+ private readonly IMapper _mapper;
+ private readonly IBasicService _basicService;
+ private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
+
+ public IOutboundOrderRepository Repository => BaseDal;
+
+ public OutboundOrderService(IOutboundOrderRepository BaseDal, IMapper mapper, IBasicService basicService, IOutboundOrderDetailRepository outboundOrderDetailRepository) : base(BaseDal)
+ {
+ _mapper = mapper;
+ _basicService = basicService;
+ _outboundOrderDetailRepository = outboundOrderDetailRepository;
+ }
+
+ public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO model)
+ {
+ try
+ {
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == model.MCode);
+ if (materielInfo == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鐗╂枡淇℃伅");
+ }
+
+ Dt_Warehouse warehouse = _basicService.WarehouseService.Repository.QueryFirst(x => x.WarehouseCode == model.WaId);
+ if (warehouse == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌浠撳簱淇℃伅");
+ }
+
+ Dt_OutboundOrder oldOutboundOrder = BaseDal.Db.Queryable<Dt_OutboundOrder>().Where(x => x.UpperOrderNo == model.OrderNo).Includes(x => x.Details).First();
+
+ if (model.Way == 1)
+ {
+ if (oldOutboundOrder != null)
+ {
+ if (oldOutboundOrder.Details.FirstOrDefault(x => x.RowNo == Convert.ToInt32(model.RowNo)) != null)
+ {
+ return WebResponseContent.Instance.Error($"璇ユ槑缁嗚鍙峰凡瀛樺湪");
+ }
+ if (oldOutboundOrder.WarehouseId != warehouse.WarehouseId)
+ {
+ return WebResponseContent.Instance.Error($"浠撳簱涓嶄竴鑷�");
+ }
+ else
+ {
+ Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
+ {
+ RowNo = Convert.ToInt32(model.RowNo),
+ BatchNo = model.MLot,
+ MaterielCode = model.MCode,
+ MaterielName = materielInfo.MaterielName,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ OrderQuantity = model.Qty,
+ OrderId = oldOutboundOrder.Id
+ };
+
+ _outboundOrderDetailRepository.AddData(outboundOrderDetail);
+ }
+ }
+ else
+ {
+ Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail()
+ {
+ RowNo = Convert.ToInt32(model.RowNo),
+ BatchNo = model.MLot,
+ MaterielCode = model.MCode,
+ MaterielName = materielInfo.MaterielName,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ OrderQuantity = model.Qty,
+ };
+
+ Dt_OutboundOrder outboundOrder = new Dt_OutboundOrder()
+ {
+ UpperOrderNo = model.OrderNo,
+ OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ OrderType = OutOrderTypeEnum.Issue.ObjToInt(),
+ CreateType = OrderCreateTypeEnum.UpperSystemPush.ObjToInt(),
+ WarehouseId = warehouse.WarehouseId,
+ Details = new List<Dt_OutboundOrderDetail> { outboundOrderDetail }
+ };
+
+ Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
+ }
+ }
+ else if (model.Way == 2)
+ {
+ if (oldOutboundOrder == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鍑哄簱鍗�");
+ }
+ Dt_OutboundOrderDetail? outboundOrderDetail = oldOutboundOrder.Details.FirstOrDefault(x => x.RowNo == Convert.ToInt32(model.RowNo));
+ if (outboundOrderDetail == null)
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒拌鏄庣粏琛屽彿淇℃伅");
+ }
+ if(outboundOrderDetail.OrderDetailStatus != OrderDetailStatusEnum.New.ObjToInt())
+ {
+ return WebResponseContent.Instance.Error($"璇ユ槑缁嗕笉鍙慨鏀�");
+ }
+ outboundOrderDetail = new Dt_OutboundOrderDetail()
+ {
+ RowNo = Convert.ToInt32(model.RowNo),
+ BatchNo = model.MLot,
+ MaterielCode = model.MCode,
+ MaterielName = materielInfo.MaterielName,
+ OrderDetailStatus = OrderDetailStatusEnum.New.ObjToInt(),
+ OrderQuantity = model.Qty,
+ };
+
+ _outboundOrderDetailRepository.UpdateData(outboundOrderDetail);
+ }
+
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrder_HtyService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrder_HtyService.cs"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrder_HtyService.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrder_HtyService.cs"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs"
deleted file mode 100644
index 3566725..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutStockLockInfoService.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_IOutboundService
-{
- public partial class OutStockLockInfoService : ServiceBase<Dt_OutStockLockInfo, IOutStockLockInfoRepository>, IOutStockLockInfoService
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderDetailService.cs"
deleted file mode 100644
index 2f89783..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderDetailService.cs"
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseRepository;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_DTO.Stock;
-using WIDESEA_IBasicRepository;
-using WIDESEA_IBasicService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IRecordService;
-using WIDESEA_IStockRepository;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-using WIDESEA_StockRepository;
-
-namespace WIDESEA_OutboundService
-{
- public partial class OutboundOrderDetailService : ServiceBase<Dt_OutboundOrderDetail, IOutboundOrderDetailRepository>, IOutboundOrderDetailService
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs"
deleted file mode 100644
index 8b50922..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Service/OutboundOrderService.cs"
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing AutoMapper;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Core.BaseServices;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_Core.Utilities;
-using WIDESEA_DTO.Inbound;
-using WIDESEA_DTO.Outbound;
-using WIDESEA_IBasicService;
-using WIDESEA_IOutboundRepository;
-using WIDESEA_IOutboundService;
-using WIDESEA_IStockService;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_OutboundService
-{
- public partial class OutboundOrderService : ServiceBase<Dt_OutboundOrder, IOutboundOrderRepository>, IOutboundOrderService
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
index ac7b02d..2433006 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Approval/ApprovalTaskController.cs"
@@ -25,18 +25,32 @@
_webSocketServer = webSocketServer;
}
+ /// <summary>
+ /// 鍚屾剰瀹℃壒
+ /// </summary>
+ /// <param name="sourceKey"></param>
+ /// <returns></returns>
[HttpGet, HttpPost, Route("AuditAgree")]
public WebResponseContent AuditAgree(int sourceKey)
{
return Service.AuditAgree(sourceKey);
}
+ /// <summary>
+ /// 椹冲洖瀹℃壒
+ /// </summary>
+ /// <param name="sourceKey"></param>
+ /// <returns></returns>
[HttpGet, HttpPost, Route("AuditReject")]
public WebResponseContent AuditReject(int sourceKey)
{
return Service.AuditReject(sourceKey);
}
+ /// <summary>
+ /// 鎺ㄩ�佹祴璇�
+ /// </summary>
+ /// <returns></returns>
[HttpGet, HttpPost, Route("PushTest"), AllowAnonymous]
public WebResponseContent PushTest()
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index 3b6853e..cb150fa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -24,23 +24,45 @@
_repository = repository;
}
+ /// <summary>
+ /// 鍒濆鍖栬揣浣�
+ /// </summary>
+ /// <param name="initializationLocationDTO"></param>
+ /// <returns></returns>
[HttpPost, Route("InitializationLocation"), AllowAnonymous]
public WebResponseContent InitializationLocation([FromBody] InitializationLocationDTO initializationLocationDTO)
{
return Service.InitializationLocation(initializationLocationDTO);
}
+ /// <summary>
+ /// 璐т綅鍒嗛厤
+ /// </summary>
+ /// <param name="roadwayNo"></param>
+ /// <param name="palletType"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("AssignLocation"), AllowAnonymous]
public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType)
{
return Service.AssignLocation(roadwayNo, palletType);
}
+ /// <summary>
+ /// 鍚敤璐т綅
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
[HttpPost, Route("LocationEnableStatus")]
public WebResponseContent LocationEnableStatus([FromBody] int[] keys)
{
return Service.LocationEnableStatus(keys); ;
}
+
+ /// <summary>
+ /// 绂佺敤璐т綅
+ /// </summary>
+ /// <param name="keys"></param>
+ /// <returns></returns>
[HttpPost, Route("LocationDisableStatus")]
public WebResponseContent LocationDisableStatus([FromBody] int[] keys)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs"
index 51449cb..0f02d08 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderController.cs"
@@ -15,6 +15,11 @@
{
}
+ /// <summary>
+ /// 鎻愪氦瀹℃牳
+ /// </summary>
+ /// <param name="checkOrderId"></param>
+ /// <returns></returns>
[HttpGet, HttpPost, Route("CommitAudit")]
public WebResponseContent CommitAudit(int checkOrderId)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
index f02e5b7..5316a4c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
@@ -14,6 +14,13 @@
public CheckOrderResultController(ICheckOrderResultService service) : base(service)
{
}
+
+ /// <summary>
+ /// 鎻愪氦璐ㄦ缁撴灉
+ /// </summary>
+ /// <param name="checkOrderId"></param>
+ /// <param name="checkResult"></param>
+ /// <returns></returns>
[HttpPost, Route("CommitCheckResult")]
public WebResponseContent CommitCheckResult(int checkOrderId, Dt_CheckOrderResult checkResult)
{
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 b9f3f59..3271fbf 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"
@@ -13,8 +13,10 @@
using WIDESEA_DTO.ERP;
using WIDESEA_External.ERPService;
using WIDESEA_IBasicRepository;
+using WIDESEA_IBasicService;
using WIDESEA_IInboundRepository;
using WIDESEA_IInboundService;
+using WIDESEA_IOutboundService;
using WIDESEA_Model.Models;
namespace WIDESEA_WMSServer.Controllers.ERP
@@ -25,179 +27,61 @@
{
private readonly IPurchaseOrderRepository _purchaseOrderRepository;
private readonly IPurchaseOrderService _purchaseOrderService;
- private readonly ISupplierInfoRepository _supplierInfoRepository;
- private readonly IMaterielInfoRepository _materielInfoRepository;
+ private readonly ISupplierInfoService _supplierInfoService;
+ private readonly IMaterielInfoService _materielInfoService;
+ private readonly IOutboundOrderService _outboundOrderService;
- public ErpController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoRepository supplierInfoRepository, IMaterielInfoRepository materielInfoRepository)
+ public ErpController(IPurchaseOrderRepository purchaseOrderRepository, IPurchaseOrderService purchaseOrderService, ISupplierInfoService supplierInfoService, IMaterielInfoService materielInfoService, IOutboundOrderService outboundOrderService)
{
_purchaseOrderRepository = purchaseOrderRepository;
_purchaseOrderService = purchaseOrderService;
- _supplierInfoRepository = supplierInfoRepository;
- _materielInfoRepository = materielInfoRepository;
+ _supplierInfoService = supplierInfoService;
+ _materielInfoService = materielInfoService;
+ _outboundOrderService = outboundOrderService;
}
- [HttpPost, Route("ReceivePurchaseOrder"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent ReceivePurchaseOrder([FromBody] Dt_PurchaseOrder model)
- {
- try
- {
- _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)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
-
+ /// <summary>
+ /// 鎺ユ敹ERP閲囪喘鍗曚俊鎭�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost, Route("ReceivePurchaseOrderSingle"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent ReceivePurchaseOrderSingle(PurchaseOrderModel model)
+ public WebResponseContent ReceivePurchaseOrder([FromBody] PurchaseOrderModel model)
{
- return _purchaseOrderService.ReceivePurchaseOrderSingle(model);
+ return _purchaseOrderService.ReceivePurchaseOrder(model);
}
+ /// <summary>
+ /// 鎺ユ敹ERP渚涘簲鍟嗕俊鎭�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost, Route("ReceiveSupplier"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent ReceiveSupplier(SupplierDTO model)
+ public WebResponseContent ReceiveSupplier([FromBody] SupplierDTO model)
{
- try
- {
- if (model.OperateType == "0")
- {
- Dt_SupplierInfo supplierInfo = new Dt_SupplierInfo()
- {
- Status = 1,
- SupplierCode = model.Code,
- SupplierName = model.Name,
- SupplierShortName = model.ShortName
- };
-
- _supplierInfoRepository.AddData(supplierInfo);
- }
- else if (model.OperateType == "1")
- {
- Dt_SupplierInfo supplierInfo = _supplierInfoRepository.QueryFirst(x => x.SupplierCode == model.Code);
- if (supplierInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌渚涘簲鍟嗕俊鎭�");
- }
- supplierInfo.Status = 1;
- supplierInfo.SupplierCode = model.Code;
- supplierInfo.SupplierName = model.Name;
- supplierInfo.SupplierShortName = model.ShortName;
- _supplierInfoRepository.UpdateData(supplierInfo);
- }
- else if (model.OperateType == "2")
- {
- Dt_SupplierInfo supplierInfo = _supplierInfoRepository.QueryFirst(x => x.SupplierCode == model.Code);
- if (supplierInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒拌渚涘簲鍟嗕俊鎭�");
- }
- _supplierInfoRepository.DeleteData(supplierInfo);
- }
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
+ return _supplierInfoService.ReceiveSupplier(model);
}
+ /// <summary>
+ /// 鎺ユ敹ERP鐗╂枡淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost, Route("ReceiveMaterial"), AllowAnonymous, MethodParamsValidate]
- public WebResponseContent ReceiveMaterial(MaterielInfoDTO model)
+ public WebResponseContent ReceiveMaterial([FromBody] MaterielInfoDTO model)
{
- try
- {
- if (model.OperateType == 0)
- {
- Dt_MaterielInfo materielInfo = new Dt_MaterielInfo()
- {
- IsCheck = (WhetherEnum)model.IsCheck,
- MaterielCode = model.Code,
- MaterielInvOrgId = model.InvOrgId,
- MaterielLength = model.Length,
- MaterielModel = model.Model,
- MaterielName = model.Name,
- MaterielSize = model.Size,
- MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType,
- MaterielSpec = "model.",
- MaterielState = (EnableEnum)model.State,
- MaterielThickness = model.Thickness,
- MaterielType = (MaterielTypeEnum)model.ItemType,
- MaterielUnit = model.Unit,
- MaterielVersion = model.MaterialVersion,
- MaterielWide = model.Wide,
- WarehouseId = model.WaId,
- };
- _materielInfoRepository.AddData(materielInfo);
- }
- else if (model.OperateType == 1)
- {
- Dt_MaterielInfo materielInfo = _materielInfoRepository.QueryFirst(x => x.MaterielCode == model.Code);
- if (materielInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欎俊鎭�");
- }
-
- materielInfo.IsCheck = (WhetherEnum)model.IsCheck;
- materielInfo.MaterielCode = model.Code;
- materielInfo.MaterielInvOrgId = model.InvOrgId;
- materielInfo.MaterielLength = model.Length;
- materielInfo.MaterielModel = model.Model;
- materielInfo.MaterielName = model.Name;
- materielInfo.MaterielSize = model.Size;
- materielInfo.MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType;
- materielInfo.MaterielSpec = model.StandType;
- materielInfo.MaterielState = (EnableEnum)model.State;
- materielInfo.MaterielThickness = model.Thickness;
- materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType;
- materielInfo.MaterielUnit = model.Unit;
- materielInfo.MaterielVersion = model.MaterialVersion;
- materielInfo.MaterielWide = model.Wide;
- materielInfo.WarehouseId = model.WaId;
- _materielInfoRepository.UpdateData(materielInfo);
- }
- else if (model.OperateType == 2)
- {
- Dt_MaterielInfo materielInfo = _materielInfoRepository.QueryFirst(x => x.MaterielCode == model.Code);
- if (materielInfo == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欎俊鎭�");
- }
-
- _materielInfoRepository.DeleteData(materielInfo);
- }
- return WebResponseContent.Instance.OK();
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
+ return _materielInfoService.ReceiveMaterial(model);
}
- public WebResponseContent ReceiveOutOrder(ErpOutOrderDTO erpOutOrder)
+ /// <summary>
+ /// 鎺ユ敹ERP鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ /// <param name="erpOutOrder"></param>
+ /// <returns></returns>
+ [HttpPost, Route("ReceiveOutOrder"), AllowAnonymous, MethodParamsValidate]
+ public WebResponseContent ReceiveOutOrder([FromBody] ErpOutOrderDTO erpOutOrder)
{
- try
- {
- return WebResponseContent.Instance.OK();
- }
- catch(Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
+ return _outboundOrderService.ReceiveOutOrder(erpOutOrder);
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
index 04442f9..2b21522 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/InboundOrderController.cs"
@@ -17,12 +17,26 @@
{
}
+ /// <summary>
+ /// 鍗曚釜鐗╂枡鐮佺粍鐩�
+ /// </summary>
+ /// <param name="inboundOrderId"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="serNum"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("MaterielGroupSingle")]
public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, string serNum)
{
return Service.MaterielGroup(inboundOrderId, palletCode, serNum);
}
+ /// <summary>
+ /// 澶氫釜鐗╂枡鐮佺粍鐩�
+ /// </summary>
+ /// <param name="inboundOrderId"></param>
+ /// <param name="palletCode"></param>
+ /// <param name="serNums"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("MaterielGroup")]
public WebResponseContent MaterielGroup(int inboundOrderId, string palletCode, List<string> serNums)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
index da54377..1a0463b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderController.cs"
@@ -15,6 +15,11 @@
{
}
+ /// <summary>
+ /// 鏍规嵁鏀惰揣鍗曞垱寤哄叆搴撳崟
+ /// </summary>
+ /// <param name="receiveOrderId"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("CreateInboundOrder")]
public WebResponseContent CreateInboundOrder(int receiveOrderId)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs"
index ccc8b88..c40426b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Inbound/ReceiveOrderDetailController.cs"
@@ -16,6 +16,12 @@
{
}
+ /// <summary>
+ /// 鍒涘缓鏀惰揣鍗曟槑缁�(PDA鎵爜鏀惰揣)
+ /// </summary>
+ /// <param name="serNum"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("AddReceiveOrderDetail")]
public WebResponseContent AddReceiveOrderDetail(string serNum, string orderNo)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 63e15e9..7eb00c9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -17,12 +17,23 @@
{
}
+ /// <summary>
+ /// 鐢宠鍏ュ簱浠诲姟
+ /// </summary>
+ /// <param name="palletCode"></param>
+ /// <param name="stationCode"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("RequestInboundTask")]
public WebResponseContent RequestInboundTask(string palletCode, string stationCode)
{
return Service.RequestInboundTask(palletCode, stationCode);
}
+ /// <summary>
+ /// 鍏ュ簱浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("InboundTaskCompleted")]
public WebResponseContent InboundTaskCompleted(int taskNum)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
index 2a23123..671db48 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
@@ -43,7 +43,7 @@
builder.Services.AddWebSocketSetup();
builder.Services.AddSqlsugarSetup();//SqlSugar 启动服务
builder.Services.AddDbSetup();//Db 启动服务
-//builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
+builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
builder.Services.AddHostedService<PermissionDataHostService>();//应用初始化服务注入
builder.Services.AddAutoMapperSetup();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
index 3fe5140..0fd9f48 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj"
@@ -5,6 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
+ <DocumentationFile></DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.xml" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.xml"
new file mode 100644
index 0000000..7f7e193
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.xml"
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<doc>
+ <assembly>
+ <name>WIDESEA_WMSServer</name>
+ </assembly>
+ <members>
+ <member name="M:WIDESEA_WMSServer.Controllers.Approval.ApprovalTaskController.AuditAgree(System.Int32)">
+ <summary>
+ 鍚屾剰瀹℃壒
+ </summary>
+ <param name="sourceKey"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Approval.ApprovalTaskController.AuditReject(System.Int32)">
+ <summary>
+ 椹冲洖瀹℃壒
+ </summary>
+ <param name="sourceKey"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Approval.ApprovalTaskController.PushTest">
+ <summary>
+ 鎺ㄩ�佹祴璇�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Basic.LocationInfoController.InitializationLocation(WIDESEA_DTO.Basic.InitializationLocationDTO)">
+ <summary>
+ 鍒濆鍖栬揣浣�
+ </summary>
+ <param name="initializationLocationDTO"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Basic.LocationInfoController.AssignLocation(System.String,WIDESEA_Common.CommonEnum.PalletTypeEnum)">
+ <summary>
+ 璐т綅鍒嗛厤
+ </summary>
+ <param name="roadwayNo"></param>
+ <param name="palletType"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Basic.LocationInfoController.LocationEnableStatus(System.Int32[])">
+ <summary>
+ 鍚敤璐т綅
+ </summary>
+ <param name="keys"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Basic.LocationInfoController.LocationDisableStatus(System.Int32[])">
+ <summary>
+ 绂佺敤璐т綅
+ </summary>
+ <param name="keys"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Check.CheckOrderController.CommitAudit(System.Int32)">
+ <summary>
+ 鎻愪氦瀹℃牳
+ </summary>
+ <param name="checkOrderId"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Check.CheckOrderResultController.CommitCheckResult(System.Int32,WIDESEA_Model.Models.Dt_CheckOrderResult)">
+ <summary>
+ 鎻愪氦璐ㄦ缁撴灉
+ </summary>
+ <param name="checkOrderId"></param>
+ <param name="checkResult"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.ERP.ErpController.ReceivePurchaseOrder(WIDESEA_DTO.PurchaseOrderModel)">
+ <summary>
+ 鎺ユ敹ERP閲囪喘鍗曚俊鎭�
+ </summary>
+ <param name="model"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.ERP.ErpController.ReceiveSupplier(WIDESEA_DTO.Basic.SupplierDTO)">
+ <summary>
+ 鎺ユ敹ERP渚涘簲鍟嗕俊鎭�
+ </summary>
+ <param name="model"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.ERP.ErpController.ReceiveMaterial(WIDESEA_DTO.Basic.MaterielInfoDTO)">
+ <summary>
+ 鎺ユ敹ERP鐗╂枡淇℃伅
+ </summary>
+ <param name="model"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.ERP.ErpController.ReceiveOutOrder(WIDESEA_DTO.ERP.ErpOutOrderDTO)">
+ <summary>
+ 鎺ユ敹ERP鍑哄簱鍗曚俊鎭�
+ </summary>
+ <param name="erpOutOrder"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Inbound.InboundOrderController.MaterielGroup(System.Int32,System.String,System.String)">
+ <summary>
+ 鍗曚釜鐗╂枡鐮佺粍鐩�
+ </summary>
+ <param name="inboundOrderId"></param>
+ <param name="palletCode"></param>
+ <param name="serNum"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Inbound.InboundOrderController.MaterielGroup(System.Int32,System.String,System.Collections.Generic.List{System.String})">
+ <summary>
+ 澶氫釜鐗╂枡鐮佺粍鐩�
+ </summary>
+ <param name="inboundOrderId"></param>
+ <param name="palletCode"></param>
+ <param name="serNums"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Inbound.ReceiveOrderController.CreateInboundOrder(System.Int32)">
+ <summary>
+ 鏍规嵁鏀惰揣鍗曞垱寤哄叆搴撳崟
+ </summary>
+ <param name="receiveOrderId"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.Inbound.ReceiveOrderDetailController.AddReceiveOrderDetail(System.String,System.String)">
+ <summary>
+ 鍒涘缓鏀惰揣鍗曟槑缁�(PDA鎵爜鏀惰揣)
+ </summary>
+ <param name="serNum"></param>
+ <param name="orderNo"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.TaskInfo.TaskController.RequestInboundTask(System.String,System.String)">
+ <summary>
+ 鐢宠鍏ュ簱浠诲姟
+ </summary>
+ <param name="palletCode"></param>
+ <param name="stationCode"></param>
+ <returns></returns>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Controllers.TaskInfo.TaskController.InboundTaskCompleted(System.Int32)">
+ <summary>
+ 鍏ュ簱浠诲姟瀹屾垚
+ </summary>
+ <param name="taskNum"></param>
+ <returns></returns>
+ </member>
+ <member name="T:WIDESEA_WMSServer.Filter.AutoMapperConfig">
+ <summary>
+ 闈欐�佸叏灞� AutoMapper 閰嶇疆鏂囦欢
+ </summary>
+ </member>
+ <member name="T:WIDESEA_WMSServer.Filter.AutoMapperSetup">
+ <summary>
+ Automapper 鍚姩鏈嶅姟
+ </summary>
+ </member>
+ <member name="M:WIDESEA_WMSServer.Filter.CustomProfile.#ctor">
+ <summary>
+ 閰嶇疆鏋勯�犲嚱鏁帮紝鐢ㄦ潵鍒涘缓鍏崇郴鏄犲皠
+ </summary>
+ </member>
+ </members>
+</doc>
--
Gitblit v1.9.3