From b6ad312c9bc664a07c234dee0668e3c9d41e4293 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期二, 24 十二月 2024 15:21:07 +0800
Subject: [PATCH] 添加销售出货通知单、销售退货通知单
---
MES.Service/service/Warehouse/MesOutwareManager.cs | 229 ++++++++
MES.Service/Dto/webApi/ErpOut.cs | 7
MES.Service/service/Warehouse/MesOutwareDetailsManager.cs | 78 ++
MES.Service/Dto/webApi/ErpReturnWare.cs | 17
MES.Service/service/Warehouse/MesReturnwareDetailsManager.cs | 78 ++
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/Modes/MesReturnware.cs | 66 ++
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.xml | 72 ++
MES.Service/Modes/MesOutware.cs | 91 +++
MES.Service/Dto/webApi/ErpReturn.cs | 7
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/Controllers/BasicData/MesReturnwareController.cs | 272 +++++++++
MES.Service/Dto/webApi/ErpOutWare.cs | 22
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/Controllers/BasicData/MesOutwareController.cs | 275 +++++++++
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/Dto/webApi/ErpOutWareDetails.cs | 20
MES.Service/Modes/MesOutwareDetails.cs | 89 +++
MES.Service/service/Warehouse/MesReturnwareManager.cs | 209 +++++++
MES.Service/Modes/MesReturnwareDetails.cs | 84 +++
MES.Service/Dto/webApi/ErpReturnWareDetails.cs | 19
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
24 files changed, 1,635 insertions(+), 0 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpOut.cs b/MES.Service/Dto/webApi/ErpOut.cs
new file mode 100644
index 0000000..c375c33
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpOut.cs
@@ -0,0 +1,7 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpOut
+{
+ public ErpOutWare ErpOutWares { get; set; }
+ public List<ErpOutWareDetails> ErpOutWareDetailss { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpOutWare.cs b/MES.Service/Dto/webApi/ErpOutWare.cs
new file mode 100644
index 0000000..49e7d35
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpOutWare.cs
@@ -0,0 +1,22 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpOutWare
+{
+
+
+ public decimal OutType { get; set; }
+ public string OutNo { get; set; }
+ public DateTime? BillDate { get; set; }
+ public string? CustNo { get; set; }
+ public string? BusinessBy { get; set; }
+ public string? WorkCode { get; set; }
+ public string? DeliveryCust { get; set; }
+ public string? QuickNo { get; set; }
+ public string? DeliveryAddress { get; set; }
+ public string? CheckBy { get; set; }
+ public DateTime? CheckDate { get; set; }
+ public string? CreateBy { get; set; }
+ public DateTime? CreateDate { get; set; }
+ public string? Remarks { get; set; }
+ public string? Type { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpOutWareDetails.cs b/MES.Service/Dto/webApi/ErpOutWareDetails.cs
new file mode 100644
index 0000000..213bfc9
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpOutWareDetails.cs
@@ -0,0 +1,20 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpOutWareDetails
+{
+
+
+ public decimal OrderType { get; set; }
+ public string OrderNumber { get; set; }
+ public string OrderNo { get; set; }
+ public string? ItemNo { get; set; }
+ public string? ItemName { get; set; }
+ public string? ItemModel { get; set; }
+ public string? DepotCode { get; set; }
+ public decimal? Quantity { get; set; }
+ public decimal? OutQuantity { get; set; }
+ public decimal OutType { get; set; }
+ public string OutNo { get; set; }
+ public string? Remarks { get; set; }
+ public string? Type { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpReturn.cs b/MES.Service/Dto/webApi/ErpReturn.cs
new file mode 100644
index 0000000..b3571ab
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpReturn.cs
@@ -0,0 +1,7 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpReturn
+{
+ public ErpReturnWare ErpReturnWares { get; set; }
+ public List<ErpReturnWareDetails> ErpReturnWareDetailss { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpReturnWare.cs b/MES.Service/Dto/webApi/ErpReturnWare.cs
new file mode 100644
index 0000000..2eb201d
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpReturnWare.cs
@@ -0,0 +1,17 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpReturnWare
+{
+
+
+ public decimal ReturnType { get; set; }
+ public string ReturnNo { get; set; }
+ public string? CustNo { get; set; }
+ public DateTime? BillDate { get; set; }
+ public string? BusinessBy { get; set; }
+ public string? WorkCode { get; set; }
+ public string? Remarks { get; set; }
+ public string? CreateBy { get; set; }
+ public DateTime? CreateDate { get; set; }
+ public string? Type { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpReturnWareDetails.cs b/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
new file mode 100644
index 0000000..9bedb5f
--- /dev/null
+++ b/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
@@ -0,0 +1,19 @@
+锘縩amespace MES.Service.Dto.webApi;
+
+public class ErpReturnWareDetails
+{
+
+ public string? ItemNo { get; set; }
+ public string? ItemName { get; set; }
+ public string? ItemModel { get; set; }
+ public decimal? Quantity { get; set; }
+ public string? Type { get; set; }
+ public string? DepotCode { get; set; }
+ public decimal? ReturnType { get; set; }
+ public string? ReturnNo { get; set; }
+ public string? ReturnOrder { get; set; }
+ public decimal OrderType { get; set; }
+ public string OrderNumber { get; set; }
+ public string OrderNo { get; set; }
+
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesOutware.cs b/MES.Service/Modes/MesOutware.cs
new file mode 100644
index 0000000..840e433
--- /dev/null
+++ b/MES.Service/Modes/MesOutware.cs
@@ -0,0 +1,91 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 閿�鍞彂璐ч�氱煡涓昏〃
+ ///</summary>
+ [SugarTable("MES_OUTWARE")]
+ public class MesOutware
+ {
+ /// <summary>
+ /// 涓婚敭ID
+ ///</summary>
+ [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_BASEINFO_ID", IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 閿�鍞嚭璐у崟鍒�
+ ///</summary>
+ [SugarColumn(ColumnName="OUTWARE_TYPE" )]
+ public decimal? OutwareType { get; set; }
+ /// <summary>
+ /// 閿�鍞嚭璐у崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="OUTWARE_NO" )]
+ public string OutwareNo { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName="CUST_NO" )]
+ public string CustNo { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="BILL_DATE" )]
+ public DateTime? BillDate { get; set; }
+ /// <summary>
+ /// 涓氬姟浜哄憳
+ ///</summary>
+ [SugarColumn(ColumnName="BUSINESS_BY" )]
+ public string BusinessBy { get; set; }
+ /// <summary>
+ /// 閮ㄩ棬缂栫爜(宸ヤ綔涓績)
+ ///</summary>
+ [SugarColumn(ColumnName="WORKSHOP_CENTER_CODE" )]
+ public string WorkshopCenterCode { get; set; }
+ /// <summary>
+ /// 閫佽揣瀹㈡埛
+ ///</summary>
+ [SugarColumn(ColumnName="DELIVERY_CUST" )]
+ public string DeliveryCust { get; set; }
+ /// <summary>
+ /// 蹇嵎鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="QUICK_NO" )]
+ public string QuickNo { get; set; }
+ /// <summary>
+ /// 瀹℃牳鑰�
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_BY" )]
+ public string CheckBy { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_DATE" )]
+ public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_BY" )]
+ public string CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_DATE" )]
+ public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="REMARKS" )]
+ public string Remarks { get; set; }
+ /// <summary>
+ /// 閫佽揣鍦板潃
+ ///</summary>
+ [SugarColumn(ColumnName="DELIVERY_ADDRESS" )]
+ public string DeliveryAddress { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/MesOutwareDetails.cs b/MES.Service/Modes/MesOutwareDetails.cs
new file mode 100644
index 0000000..c6a0cbf
--- /dev/null
+++ b/MES.Service/Modes/MesOutwareDetails.cs
@@ -0,0 +1,89 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 閿�鍞嚭璐ч�氱煡鍗曞瓙琛�
+ ///</summary>
+ [SugarTable("MES_OUTWARE_DETAILS")]
+ public class MesOutwareDetails
+ {
+ /// <summary>
+ /// 涓婚敭ID
+ ///</summary>
+ [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_BASEINFO_ID", IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 涓昏〃ID
+ ///</summary>
+ [SugarColumn(ColumnName="PID" )]
+ public decimal? Pid { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍗曞埆
+ ///</summary>
+ [SugarColumn(ColumnName="ORDER_TYPE" )]
+ public decimal? OrderType { get; set; }
+ /// <summary>
+ /// 璁㈠崟搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName="ORDER_NUMBER" )]
+ public string OrderNumber { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="ORDER_NO" )]
+ public string OrderNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜(鍝佸彿)
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_NO" )]
+ public string ItemNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О(鍝佸悕)
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_NAME" )]
+ public string ItemName { get; set; }
+ /// <summary>
+ /// 瑙勬牸鍨嬪彿
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_MODEL" )]
+ public string ItemModel { get; set; }
+ /// <summary>
+ /// 浠撳簱
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_CODE" )]
+ public string DepotCode { get; set; }
+ /// <summary>
+ /// 棰勮鍑鸿揣鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="QUANTITY" )]
+ public decimal? Quantity { get; set; }
+ /// <summary>
+ /// 瀹為檯鍑鸿揣鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="OUT_QUANTITY" )]
+ public decimal? OutQuantity { get; set; }
+ /// <summary>
+ /// 鍑鸿揣鍗曞埆
+ ///</summary>
+ [SugarColumn(ColumnName="OUTWARE_TYPE" )]
+ public decimal? OutwareType { get; set; }
+ /// <summary>
+ /// 鍑鸿揣鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="OUTWARE_NO" )]
+ public string OutwareNo { get; set; }
+ /// <summary>
+ /// 绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="TYPE" )]
+ public string Type { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="REMARKS" )]
+ public string Remarks { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/MesReturnware.cs b/MES.Service/Modes/MesReturnware.cs
new file mode 100644
index 0000000..cc5ba7c
--- /dev/null
+++ b/MES.Service/Modes/MesReturnware.cs
@@ -0,0 +1,66 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 閿�鍞��璐ч�氱煡涓昏〃
+ ///</summary>
+ [SugarTable("MES_RETURNWARE")]
+ public class MesReturnware
+ {
+ /// <summary>
+ /// 涓婚敭ID
+ ///</summary>
+ [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_BASEINFO_ID", IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 閿�鍞��璐у崟鍒�
+ ///</summary>
+ [SugarColumn(ColumnName="RETURN_TYPE" )]
+ public decimal? ReturnType { get; set; }
+ /// <summary>
+ /// 閿�鍞��璐у崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="RETURN_NO" )]
+ public string ReturnNo { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName="CUST_NO" )]
+ public string CustNo { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="BILL_DATE" )]
+ public DateTime? BillDate { get; set; }
+ /// <summary>
+ /// 涓氬姟浜哄憳
+ ///</summary>
+ [SugarColumn(ColumnName="BUSINESS_BY" )]
+ public string BusinessBy { get; set; }
+ /// <summary>
+ /// 閮ㄩ棬缂栫爜(宸ヤ綔涓績)
+ ///</summary>
+ [SugarColumn(ColumnName="WORKSHOP_CENTER_CODE" )]
+ public string WorkshopCenterCode { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="REMARKS" )]
+ public string Remarks { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_BY" )]
+ public string CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_DATE" )]
+ public DateTime? CreateDate { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/MesReturnwareDetails.cs b/MES.Service/Modes/MesReturnwareDetails.cs
new file mode 100644
index 0000000..69c5166
--- /dev/null
+++ b/MES.Service/Modes/MesReturnwareDetails.cs
@@ -0,0 +1,84 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 閿�鍞��璐ч�氱煡鍗曞瓙琛�
+ ///</summary>
+ [SugarTable("MES_RETURNWARE_DETAILS")]
+ public class MesReturnwareDetails
+ {
+ /// <summary>
+ /// 涓婚敭ID
+ ///</summary>
+ [SugarColumn(ColumnName="ID" , OracleSequenceName = "SEQ_BASEINFO_ID", IsPrimaryKey = true )]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// 涓昏〃ID
+ ///</summary>
+ [SugarColumn(ColumnName="PID")]
+ public decimal? Pid { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜(鍝佸彿)
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_NO" )]
+ public string ItemNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О(鍝佸悕)
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_NAME" )]
+ public string ItemName { get; set; }
+ /// <summary>
+ /// 瑙勬牸鍨嬪彿
+ ///</summary>
+ [SugarColumn(ColumnName="ITEM_MODEL" )]
+ public string ItemModel { get; set; }
+ /// <summary>
+ /// 绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="TYPE" )]
+ public string Type { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
+ public decimal? Quantity { get; set; }
+ /// <summary>
+ /// 閫�璐т粨搴�
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_CODE" )]
+ public string DepotCode { get; set; }
+ /// <summary>
+ /// 閿�鍞��璐у崟鍒�
+ ///</summary>
+ [SugarColumn(ColumnName="RETURN_TYPE" )]
+ public decimal? ReturnType { get; set; }
+ /// <summary>
+ /// 閿�鍞��璐у崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="RETURN_NO" )]
+ public string ReturnNo { get; set; }
+ /// <summary>
+ /// 閿�鍞��璐у簭鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="RETURN_ORDER" )]
+ public string ReturnOrder { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍗曞埆
+ ///</summary>
+ [SugarColumn(ColumnName="ORDER_TYPE" )]
+ public decimal? OrderType { get; set; }
+ /// <summary>
+ /// 璁㈠崟搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName="ORDER_NUMBER" )]
+ public string OrderNumber { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="ORDER_NO" )]
+ public string OrderNo { get; set; }
+ }
+}
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 2858b84..6dd642c 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index e09f782..585e8b2 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/Warehouse/MesOutwareDetailsManager.cs b/MES.Service/service/Warehouse/MesOutwareDetailsManager.cs
new file mode 100644
index 0000000..88a92ea
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesOutwareDetailsManager.cs
@@ -0,0 +1,78 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+
+namespace MES.Service.service
+{
+public class MesOutwareDetailsManager : Repository<MesOutwareDetails>
+{
+
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesOutwareDetailsManager.cs
+
+
+ #region 鏁欏鏂规硶
+ /// <summary>
+ /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+ /// </summary>
+ public void Study()
+ {
+
+ /*********鏌ヨ*********/
+
+ var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
+ var data2 = base.GetList();//鏌ヨ鎵�鏈�
+ var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
+ //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
+
+ var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 鍒嗛〉鏌ヨ
+ var data5 = base.GetPageList(it => 1 == 1, p);
+ Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+
+ var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
+ Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+
+ List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+ conModels.Add(new ConditionalModel() { FieldName= typeof(MesOutwareDetails).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
+ var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+
+ base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+
+
+
+ /*********鎻掑叆*********/
+ var insertData = new MesOutwareDetails() { };//娴嬭瘯鍙傛暟
+ var insertArray = new MesOutwareDetails[] { insertData };
+ base.Insert(insertData);//鎻掑叆
+ base.InsertRange(insertArray);//鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
+ base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+
+
+
+ /*********鏇存柊*********/
+ var updateData = new MesOutwareDetails() { };//娴嬭瘯鍙傛暟
+ var updateArray = new MesOutwareDetails[] { updateData };//娴嬭瘯鍙傛暟
+ base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray);//鎵归噺鏇存柊
+ //base.Update(it => new MesOutwareDetails() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
+ base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+
+
+
+ /*********鍒犻櫎*********/
+ var deldata = new MesOutwareDetails() { };//娴嬭瘯鍙傛暟
+ base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
+ base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
+ base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+ base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
+ base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ }
+ #endregion
+
+
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesOutwareManager.cs b/MES.Service/service/Warehouse/MesOutwareManager.cs
new file mode 100644
index 0000000..d66e092
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesOutwareManager.cs
@@ -0,0 +1,229 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+using MES.Service.Dto.webApi;
+using System.Globalization;
+using MES.Service.service.BasicData;
+
+namespace MES.Service.service
+{
+ public class MesOutwareManager : Repository<MesOutware>
+ {
+
+
+ private readonly MesOutwareDetailsManager outwareDetailsManager = new();
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesOutwareManager.cs
+
+
+
+
+ public bool SaveList(List<ErpOut> OutWare)
+ {
+ var result = OutWare.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ public bool Save(ErpOut OutWare)
+ {
+ var OutWares = OutWare.ErpOutWares;
+ var mesOutWares = MapErptoMesOutware(OutWares);
+ var ErpOutWareDetails = MapErptoMesOutwareDetails(OutWare.ErpOutWareDetailss);
+
+ return UseTransaction(db =>
+ {
+ switch (OutWares.Type)
+ {
+ case "3":
+ return UpdateData(db, mesOutWares, ErpOutWareDetails) ? 1 : 0;
+ case "2":
+ case "4":
+ return SaveOrUpdateData(db, mesOutWares, ErpOutWareDetails)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{OutWares.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
+ }
+
+ private bool SaveOrUpdateData(SqlSugarScope db, MesOutware mesOutware,
+ List<MesOutwareDetails> mesOutwareDetails)
+ {
+
+
+ if (mesOutware.OutwareNo != null && mesOutware.OutwareType != null)
+ {
+
+ db.Deleteable<MesOutware>()
+ .Where(it => it.OutwareNo == mesOutware.OutwareNo &&
+ it.OutwareType == mesOutware.OutwareType)
+ .ExecuteCommand();
+
+ };
+
+
+ if (mesOutwareDetails.Count > 0)
+ {
+
+ // var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
+ var mesOutwareDetail = mesOutwareDetails.Select(s => new { OutwareNo = s.OutwareNo, OutwareType = s.OutwareType }).ToList();
+
+
+ /*db.Deleteable<Womcab>()
+ .Where(it => mesWomcab
+ .Any(p => p.CAB001 == it.Cab001
+ && p.CAB002 == it.Cab002
+ && p.CAB003 == it.Cab003))
+ .ExecuteCommand();*/
+ db.Deleteable<MesOutwareDetails>()
+ .Where(it => mesOutwareDetail
+ .Any(p => p.OutwareNo == it.OutwareNo
+ && p.OutwareType == it.OutwareType))
+ .ExecuteCommand();
+
+ };
+
+
+ // var orUpdate = db.Insertable(mesOutware).ExecuteCommand();
+ //var baOrUpdate = db.Insertable(mesOutwareDetails).ExecuteCommand();
+
+
+ var orUpdate = base.Insert(mesOutware);
+ var baOrUpdate = outwareDetailsManager.InsertRange(mesOutwareDetails);
+
+ if (orUpdate && baOrUpdate) return true;
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+
+
+ }
+
+ private bool UpdateData(SqlSugarScope db, MesOutware mesOutware,
+ List<MesOutwareDetails> mesOutwareDetails)
+ {
+ //鏍规嵁鍗曞埆鍜屽崟鍙疯繘琛屽垹闄�
+ var update = db.Deleteable<MesOutware>()
+ .Where(it => it.OutwareNo == mesOutware.OutwareNo &&
+ it.OutwareType == mesOutware.OutwareType)
+ .ExecuteCommand() > 0;
+
+
+ //var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
+ var mesOutwareDetail = mesOutwareDetails.Select(s => new { OutwareNo = s.OutwareNo, OutwareType = s.OutwareType }).ToList();
+
+
+
+ //var insertOrUpdate = db.Deleteable<Womcab>().Where(it => mesWomcab.Any(p => p.CAB001 == it.Cab001 && p.CAB002 == it.Cab002 && p.CAB003 == it.Cab003)).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<MesOutwareDetails>().Where(it => mesOutwareDetail.Any(p => p.OutwareNo == it.OutwareNo && p.OutwareType == it.OutwareType)).ExecuteCommand() > 0;
+
+
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ private MesOutware MapErptoMesOutware(ErpOutWare dto)
+ {
+
+
+
+ var entity = new MesOutware
+ {
+ OutwareType = dto.OutType,
+ OutwareNo = dto.OutNo,
+ CustNo = dto.CustNo,
+
+ BillDate = dto.BillDate,
+ BusinessBy = dto.BusinessBy,
+ WorkshopCenterCode = dto.WorkCode,
+
+ DeliveryCust = dto.DeliveryCust,
+ QuickNo = dto.QuickNo,
+ CheckBy = dto.CheckBy,
+
+ CheckDate = dto.CheckDate,
+ CreateBy = dto.CreateBy,
+ CreateDate = dto.CreateDate,
+
+ Remarks = dto.Remarks,
+
+ DeliveryAddress = dto.DeliveryAddress,
+ Type = dto.Type
+
+
+
+ };
+
+
+
+ return entity;
+ }
+
+ private List<MesOutwareDetails> MapErptoMesOutwareDetails(List<ErpOutWareDetails> dtoList)
+ {
+ var outwareList = new List<MesOutwareDetails>();
+
+ foreach (var dto in dtoList)
+ {
+ var OutwareDetails = new MesOutwareDetails
+ {
+
+ OrderType = dto.OrderType,
+ OrderNumber = dto.OrderNumber,
+ OrderNo = dto.OrderNo,
+ ItemNo = dto.ItemNo,
+ ItemName = dto.ItemName,
+ ItemModel = dto.ItemModel,
+ DepotCode = dto.DepotCode,
+ Quantity = dto.Quantity,
+ OutQuantity = dto.OutQuantity,
+ OutwareType = dto.OutType,
+ OutwareNo = dto.OutNo,
+ Type = dto.Type,
+ Remarks = dto.Remarks
+
+ };
+
+
+
+ outwareList.Add(OutwareDetails);
+ }
+
+ return outwareList;
+ }
+
+
+ public bool Delete(YFDelete data)
+ {
+
+
+ return UseTransaction(db =>
+ {
+ var update = db.Deleteable<Womcaa>()
+ .Where(it => it.Caa001 == data.FBillNo &&
+ it.SrcBillType == data.FBillTypeID)
+ .ExecuteCommand() > 0;
+
+ var insertOrUpdate = db.Deleteable<Womcab>()
+ .Where(it => it.Cab001 == data.FBillNo &&
+ it.Cab002 == data.FBillTypeID)
+ .ExecuteCommand() > 0;
+
+
+
+ if (update && insertOrUpdate) return 1;
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }) > 0;
+
+
+ }
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesReturnwareDetailsManager.cs b/MES.Service/service/Warehouse/MesReturnwareDetailsManager.cs
new file mode 100644
index 0000000..e64b55e
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesReturnwareDetailsManager.cs
@@ -0,0 +1,78 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+
+namespace MES.Service.service
+{
+public class MesReturnwareDetailsManager : Repository<MesReturnwareDetails>
+{
+
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesReturnwareDetailsManager.cs
+
+
+ #region 鏁欏鏂规硶
+ /// <summary>
+ /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+ /// </summary>
+ public void Study()
+ {
+
+ /*********鏌ヨ*********/
+
+ var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
+ var data2 = base.GetList();//鏌ヨ鎵�鏈�
+ var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
+ //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
+
+ var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 鍒嗛〉鏌ヨ
+ var data5 = base.GetPageList(it => 1 == 1, p);
+ Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+
+ var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
+ Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+
+ List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+ conModels.Add(new ConditionalModel() { FieldName= typeof(MesReturnwareDetails).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
+ var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+
+ base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+
+
+
+ /*********鎻掑叆*********/
+ var insertData = new MesReturnwareDetails() { };//娴嬭瘯鍙傛暟
+ var insertArray = new MesReturnwareDetails[] { insertData };
+ base.Insert(insertData);//鎻掑叆
+ base.InsertRange(insertArray);//鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
+ base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+
+
+
+ /*********鏇存柊*********/
+ var updateData = new MesReturnwareDetails() { };//娴嬭瘯鍙傛暟
+ var updateArray = new MesReturnwareDetails[] { updateData };//娴嬭瘯鍙傛暟
+ base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray);//鎵归噺鏇存柊
+ //base.Update(it => new MesReturnwareDetails() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
+ base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+
+
+
+ /*********鍒犻櫎*********/
+ var deldata = new MesReturnwareDetails() { };//娴嬭瘯鍙傛暟
+ base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
+ base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
+ base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+ base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
+ base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ }
+ #endregion
+
+
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesReturnwareManager.cs b/MES.Service/service/Warehouse/MesReturnwareManager.cs
new file mode 100644
index 0000000..f74a81d
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesReturnwareManager.cs
@@ -0,0 +1,209 @@
+锘縰sing SqlSugar;
+using System;
+using System.Collections.Generic;
+using MES.Service.DB;
+using MES.Service.Modes;
+using MES.Service.Dto.webApi;
+
+namespace MES.Service.service
+{
+public class MesReturnwareManager : Repository<MesReturnware>
+{
+
+
+ private readonly MesReturnwareDetailsManager ReturnwareDetailsManager = new();
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesReturnwareManager.cs
+
+
+ public bool SaveList(List<ErpReturn> ReturnWare)
+ {
+ var result = ReturnWare.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ public bool Save(ErpReturn ReturnWare)
+ {
+ var ReturnWares = ReturnWare.ErpReturnWares;
+ var mesReturnWares = MapErptoMesReturnware(ReturnWares);
+ var ErpReturnWareDetails = MapErptoMesReturnwareDetails(ReturnWare.ErpReturnWareDetailss);
+
+ return UseTransaction(db =>
+ {
+ switch (ReturnWares.Type)
+ {
+ case "3":
+ return UpdateData(db, mesReturnWares, ErpReturnWareDetails) ? 1 : 0;
+ case "2":
+ case "4":
+ return SaveOrUpdateData(db, mesReturnWares, ErpReturnWareDetails)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{ReturnWares.Type}杩欎釜绫诲瀷");
+ }
+ }) > 0;
+ }
+
+ private bool SaveOrUpdateData(SqlSugarScope db, MesReturnware mesReturnware,
+ List<MesReturnwareDetails> mesReturnwareDetails)
+ {
+
+
+ if (mesReturnware.ReturnNo != null && mesReturnware.ReturnType != null)
+ {
+
+ db.Deleteable<MesReturnware>()
+ .Where(it => it.ReturnNo == mesReturnware.ReturnNo &&
+ it.ReturnType == mesReturnware.ReturnType)
+ .ExecuteCommand();
+
+ };
+
+
+ if (mesReturnwareDetails.Count > 0)
+ {
+
+ // var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
+ var mesReturnwareDetail = mesReturnwareDetails.Select(s => new { ReturnwareNo = s.ReturnNo, ReturnwareType = s.ReturnType }).ToList();
+
+
+ /*db.Deleteable<Womcab>()
+ .Where(it => mesWomcab
+ .Any(p => p.CAB001 == it.Cab001
+ && p.CAB002 == it.Cab002
+ && p.CAB003 == it.Cab003))
+ .ExecuteCommand();*/
+ db.Deleteable<MesReturnwareDetails>()
+ .Where(it => mesReturnwareDetail
+ .Any(p => p.ReturnwareNo == it.ReturnNo
+ && p.ReturnwareType == it.ReturnType))
+ .ExecuteCommand();
+
+ };
+
+
+ // var orUpdate = db.Insertable(mesOutware).ExecuteCommand();
+ //var baOrUpdate = db.Insertable(mesOutwareDetails).ExecuteCommand();
+
+
+ var orUpdate = base.Insert(mesReturnware);
+ var baOrUpdate = ReturnwareDetailsManager.InsertRange(mesReturnwareDetails);
+
+ if (orUpdate && baOrUpdate) return true;
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+
+
+ }
+
+ private bool UpdateData(SqlSugarScope db, MesReturnware mesReturnware,
+ List<MesReturnwareDetails> mesReturnwareDetails)
+ {
+ //鏍规嵁鍗曞埆鍜屽崟鍙疯繘琛屽垹闄�
+ var update = db.Deleteable<MesReturnware>()
+ .Where(it => it.ReturnNo == mesReturnware.ReturnNo &&
+ it.ReturnType == mesReturnware.ReturnType)
+ .ExecuteCommand() > 0;
+
+
+ //var mesWomcab = mesWomcabs.Select(s => new { CAB001 = s.Cab001, CAB002 = s.Cab002, CAB003 = s.Cab003 }).ToList();
+ var mesReturnwareDetail = mesReturnwareDetails.Select(s => new { ReturnwareNo = s.ReturnNo, ReturnwareType = s.ReturnType }).ToList();
+
+
+
+ //var insertOrUpdate = db.Deleteable<Womcab>().Where(it => mesWomcab.Any(p => p.CAB001 == it.Cab001 && p.CAB002 == it.Cab002 && p.CAB003 == it.Cab003)).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<MesReturnwareDetails>().Where(it => mesReturnwareDetail.Any(p => p.ReturnwareNo == it.ReturnNo && p.ReturnwareType == it.ReturnType)).ExecuteCommand() > 0;
+
+
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ private MesReturnware MapErptoMesReturnware(ErpReturnWare dto)
+ {
+
+
+
+ var entity = new MesReturnware
+ {
+ ReturnType = dto.ReturnType,
+ ReturnNo = dto.ReturnNo,
+ CustNo = dto.CustNo,
+ BillDate = dto.BillDate,
+ BusinessBy = dto.BusinessBy,
+ WorkshopCenterCode = dto.WorkCode,
+ Remarks = dto.Remarks,
+ CreateBy = dto.CreateBy,
+ CreateDate = dto.CreateDate,
+ Type = dto.Type
+ };
+
+
+
+ return entity;
+ }
+
+ private List<MesReturnwareDetails> MapErptoMesReturnwareDetails(List<ErpReturnWareDetails> dtoList)
+ {
+ var returnwareList = new List<MesReturnwareDetails>();
+
+ foreach (var dto in dtoList)
+ {
+ var ReturnwareDetails = new MesReturnwareDetails
+ {
+
+
+ ItemNo = dto.ItemNo,
+ ItemName = dto.ItemName,
+ ItemModel = dto.ItemModel,
+ Quantity = dto.Quantity,
+ Type = dto.Type,
+ DepotCode = dto.DepotCode,
+ ReturnType = dto.ReturnType,
+ ReturnNo = dto.ReturnNo,
+ ReturnOrder = dto.ReturnOrder,
+ OrderType = dto.OrderType,
+ OrderNumber = dto.OrderNumber,
+ OrderNo = dto.OrderNo
+
+ };
+
+
+
+ returnwareList.Add(ReturnwareDetails);
+ }
+
+ return returnwareList;
+ }
+
+
+ public bool Delete(YFDelete data)
+ {
+
+
+ return UseTransaction(db =>
+ {
+ var update = db.Deleteable<Womcaa>()
+ .Where(it => it.Caa001 == data.FBillNo &&
+ it.SrcBillType == data.FBillTypeID)
+ .ExecuteCommand() > 0;
+
+ var insertOrUpdate = db.Deleteable<Womcab>()
+ .Where(it => it.Cab001 == data.FBillNo &&
+ it.Cab002 == data.FBillTypeID)
+ .ExecuteCommand() > 0;
+
+
+
+ if (update && insertOrUpdate) return 1;
+ throw new NotImplementedException("鍒犻櫎澶辫触");
+ }) > 0;
+
+
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesOutwareController.cs b/MESApplication/Controllers/BasicData/MesOutwareController.cs
new file mode 100644
index 0000000..156636d
--- /dev/null
+++ b/MESApplication/Controllers/BasicData/MesOutwareController.cs
@@ -0,0 +1,275 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Dynamic;
+using MES.Service.Modes;
+using MES.Service.service;
+using MES.Service.util;
+using MES.Service.Dto.webApi;
+using Newtonsoft.Json;
+
+namespace MESApplication.Controllers
+{
+ [ApiController]
+ [Route("api/[controller]")]
+ public class MesOutwareController : ControllerBase
+ {
+
+ private readonly MessageCenterManager _manager = new();
+ private MesOutwareManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "MES_OUTWARE";
+
+ private readonly string URL = "http://localhost:10054/api/MesOutware/";
+
+
+
+ //
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpOut OutWare)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.PageName = OutWare.ErpOutWares.OutType + "-" + OutWare.ErpOutWares.OutNo; //鍗曞埆鍜屽崟鍙风殑鎷兼帴
+ entity.Title = "閿�鍞嚭璐ч�氱煡鍗�";
+ entity.Data = JsonConvert.SerializeObject(OutWare);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(OutWare);
+
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ entity.DealWith = 0;
+ if (save)
+ {
+ entity.Result = 1;
+ entity.DealWith = 1;
+ }
+
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpOut> units)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(units);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(units);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] MesOutware data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] MesOutware data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] MesOutware data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ }
+}
diff --git a/MESApplication/Controllers/BasicData/MesReturnwareController.cs b/MESApplication/Controllers/BasicData/MesReturnwareController.cs
new file mode 100644
index 0000000..ada18ed
--- /dev/null
+++ b/MESApplication/Controllers/BasicData/MesReturnwareController.cs
@@ -0,0 +1,272 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Dynamic;
+using MES.Service.Modes;
+using MES.Service.service;
+using MES.Service.util;
+using MES.Service.Dto.webApi;
+using Newtonsoft.Json;
+
+namespace MESApplication.Controllers
+{
+ [ApiController]
+ [Route("api/[controller]")]
+ public class MesReturnwareController : ControllerBase
+ {
+
+ private readonly MessageCenterManager _manager = new();
+ private MesReturnwareManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "MES_RETURNWARE";
+
+ private readonly string URL = "http://localhost:10054/api/MesReturnware/";
+
+
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpReturn ReturnWare)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.PageName = ReturnWare.ErpReturnWares.ReturnType + "-" + ReturnWare.ErpReturnWares.ReturnNo; //鍗曞埆鍜屽崟鍙风殑鎷兼帴
+ entity.Title = "閿�鍞��璐ч�氱煡鍗�";
+ entity.Data = JsonConvert.SerializeObject(ReturnWare);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(ReturnWare);
+
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ entity.DealWith = 0;
+ if (save)
+ {
+ entity.Result = 1;
+ entity.DealWith = 1;
+ }
+
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpReturn> units)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(units);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(units);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] MesReturnware data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] MesReturnware data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] MesReturnware data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ }
+}
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 2858b84..6dd642c 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index e09f782..585e8b2 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 11295ae..db7f791 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index 2fa9b84..a21812f 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index a446250..cf2b6a8 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 84776e7..d3e5c89 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -750,6 +750,78 @@
</summary>
<returns></returns>
</member>
+ <member name="M:MESApplication.Controllers.MesOutwareController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesOutwareController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesOutwareController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesOutwareController.Add(MES.Service.Modes.MesOutware)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesOutwareController.InsertReturnIdentity(MES.Service.Modes.MesOutware)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesOutwareController.Update(MES.Service.Modes.MesOutware)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesReturnwareController.GetList">
+ <summary>
+ 鑾峰彇鎵�鏈�
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesReturnwareController.GetById(System.Int32)">
+ <summary>
+ 鏍规嵁涓婚敭鑾峰彇
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesReturnwareController.DeleteByIds(System.Object[])">
+ <summary>
+ 鏍规嵁涓婚敭鍒犻櫎
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesReturnwareController.Add(MES.Service.Modes.MesReturnware)">
+ <summary>
+ 娣诲姞
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesReturnwareController.InsertReturnIdentity(MES.Service.Modes.MesReturnware)">
+ <summary>
+ 娣诲姞杩斿洖鑷
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:MESApplication.Controllers.MesReturnwareController.Update(MES.Service.Modes.MesReturnware)">
+ <summary>
+ 淇敼
+ </summary>
+ <returns></returns>
+ </member>
<member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
<summary>
鑾峰彇鎵�鏈�
--
Gitblit v1.9.3