From 16a36b5f3e243b21b1b7690960f2dc4b2b665afc Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期四, 27 二月 2025 13:28:17 +0800
Subject: [PATCH] 提交最新
---
MES.Service/service/Warehouse/MesOutwareManager.cs | 14 ++-
MES.Service/Dto/webApi/ErpReturnWare.cs | 2
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/Modes/MesReturnware.cs | 2
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesOutware.cs | 2
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/Controllers/BasicData/MesReturnwareController.cs | 46 +++++++++++
MES.Service/Dto/webApi/ErpOutWare.cs | 2
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/Controllers/BasicData/MesOutwareController.cs | 44 +++++++++++
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/Dto/webApi/ErpOutWareDetails.cs | 6 +
MES.Service/Modes/MesOutwareDetails.cs | 18 +++
MES.Service/service/Warehouse/MesReturnwareManager.cs | 18 ++-
MES.Service/Modes/MesReturnwareDetails.cs | 28 ++++++
MES.Service/Dto/webApi/ErpReturnWareDetails.cs | 9 +
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
19 files changed, 164 insertions(+), 27 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpOutWare.cs b/MES.Service/Dto/webApi/ErpOutWare.cs
index 49e7d35..b345257 100644
--- a/MES.Service/Dto/webApi/ErpOutWare.cs
+++ b/MES.Service/Dto/webApi/ErpOutWare.cs
@@ -4,7 +4,7 @@
{
- public decimal OutType { get; set; }
+ public string OutType { get; set; }
public string OutNo { get; set; }
public DateTime? BillDate { get; set; }
public string? CustNo { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpOutWareDetails.cs b/MES.Service/Dto/webApi/ErpOutWareDetails.cs
index 4cd21e1..8f1b6d2 100644
--- a/MES.Service/Dto/webApi/ErpOutWareDetails.cs
+++ b/MES.Service/Dto/webApi/ErpOutWareDetails.cs
@@ -4,7 +4,7 @@
{
- public decimal OrderType { get; set; }
+ public string OrderType { get; set; }
public string OrderNumber { get; set; }
public string OrderNo { get; set; }
public string? ItemNo { get; set; }
@@ -13,13 +13,15 @@
public string? DepotCode { get; set; }
public decimal? Quantity { get; set; }
public decimal? OutQuantity { get; set; }
- public decimal OutType { get; set; }
+ public string OutType { get; set; }
public string OutNo { get; set; }
+ public string OutOrder { get; set; }
public string? Remarks { get; set; }
public string? Type { get; set; }
public decimal? ExpQuantity { get; set; }
public decimal? ActQuantity { get; set; }
public string? CustItemNo { get; set; }
+ public string? CustItemName { get; set; }
public string? CustItemModel { get; set; }
public string? CustBillNo { get; set; }
public string? MachineType { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpReturnWare.cs b/MES.Service/Dto/webApi/ErpReturnWare.cs
index 2eb201d..0e56e67 100644
--- a/MES.Service/Dto/webApi/ErpReturnWare.cs
+++ b/MES.Service/Dto/webApi/ErpReturnWare.cs
@@ -4,7 +4,7 @@
{
- public decimal ReturnType { get; set; }
+ public string ReturnType { get; set; }
public string ReturnNo { get; set; }
public string? CustNo { get; set; }
public DateTime? BillDate { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpReturnWareDetails.cs b/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
index 9bedb5f..8973e9d 100644
--- a/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
+++ b/MES.Service/Dto/webApi/ErpReturnWareDetails.cs
@@ -9,11 +9,14 @@
public decimal? Quantity { get; set; }
public string? Type { get; set; }
public string? DepotCode { get; set; }
- public decimal? ReturnType { get; set; }
+ public string? ReturnType { get; set; }
public string? ReturnNo { get; set; }
public string? ReturnOrder { get; set; }
- public decimal OrderType { get; set; }
+ public string OrderType { get; set; }
public string OrderNumber { get; set; }
public string OrderNo { get; set; }
-
+ public decimal? ActQuantity { get; set; }
+ public string? CustItemNo { get; set; }
+ public string? CustItemName { get; set; }
+ public string? CustItemModel { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesOutware.cs b/MES.Service/Modes/MesOutware.cs
index 840e433..c369ab5 100644
--- a/MES.Service/Modes/MesOutware.cs
+++ b/MES.Service/Modes/MesOutware.cs
@@ -19,7 +19,7 @@
/// 閿�鍞嚭璐у崟鍒�
///</summary>
[SugarColumn(ColumnName="OUTWARE_TYPE" )]
- public decimal? OutwareType { get; set; }
+ public string? OutwareType { get; set; }
/// <summary>
/// 閿�鍞嚭璐у崟鍙�
///</summary>
diff --git a/MES.Service/Modes/MesOutwareDetails.cs b/MES.Service/Modes/MesOutwareDetails.cs
index 4c71cf0..d2be315 100644
--- a/MES.Service/Modes/MesOutwareDetails.cs
+++ b/MES.Service/Modes/MesOutwareDetails.cs
@@ -24,7 +24,7 @@
/// 璁㈠崟鍗曞埆
///</summary>
[SugarColumn(ColumnName="ORDER_TYPE" )]
- public decimal? OrderType { get; set; }
+ public string? OrderType { get; set; }
/// <summary>
/// 璁㈠崟搴忓彿
///</summary>
@@ -69,16 +69,22 @@
/// 鍑鸿揣鍗曞埆
///</summary>
[SugarColumn(ColumnName="OUTWARE_TYPE" )]
- public decimal? OutwareType { get; set; }
+ public string? OutwareType { get; set; }
/// <summary>
/// 鍑鸿揣鍗曞彿
///</summary>
[SugarColumn(ColumnName="OUTWARE_NO" )]
public string? OutwareNo { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName = "OUTWARE_ORDER")]
+ public string? OutwareOrder { get; set; }
/// <summary>
/// 绫诲瀷
///</summary>
- [SugarColumn(ColumnName="TYPE" )]
+ [SugarColumn(ColumnName="TYPE" )]
public string? Type { get; set; }
/// <summary>
/// 澶囨敞
@@ -105,6 +111,12 @@
public string? CustItemNo { get; set; }
/// <summary>
+ /// 瀹㈡埛鍝佸悕
+ ///</summary>
+ [SugarColumn(ColumnName = "CUST_ITEM_NAME")]
+ public string? CustItemName { get; set; }
+
+ /// <summary>
/// 瀹㈡埛瑙勬牸
///</summary>
[SugarColumn(ColumnName = "CUST_ITEM_MODEL")]
diff --git a/MES.Service/Modes/MesReturnware.cs b/MES.Service/Modes/MesReturnware.cs
index cc5ba7c..c707af0 100644
--- a/MES.Service/Modes/MesReturnware.cs
+++ b/MES.Service/Modes/MesReturnware.cs
@@ -19,7 +19,7 @@
/// 閿�鍞��璐у崟鍒�
///</summary>
[SugarColumn(ColumnName="RETURN_TYPE" )]
- public decimal? ReturnType { get; set; }
+ public string ReturnType { get; set; }
/// <summary>
/// 閿�鍞��璐у崟鍙�
///</summary>
diff --git a/MES.Service/Modes/MesReturnwareDetails.cs b/MES.Service/Modes/MesReturnwareDetails.cs
index 69c5166..694d0ad 100644
--- a/MES.Service/Modes/MesReturnwareDetails.cs
+++ b/MES.Service/Modes/MesReturnwareDetails.cs
@@ -54,7 +54,7 @@
/// 閿�鍞��璐у崟鍒�
///</summary>
[SugarColumn(ColumnName="RETURN_TYPE" )]
- public decimal? ReturnType { get; set; }
+ public string? ReturnType { get; set; }
/// <summary>
/// 閿�鍞��璐у崟鍙�
///</summary>
@@ -69,7 +69,7 @@
/// 璁㈠崟鍗曞埆
///</summary>
[SugarColumn(ColumnName="ORDER_TYPE" )]
- public decimal? OrderType { get; set; }
+ public string? OrderType { get; set; }
/// <summary>
/// 璁㈠崟搴忓彿
///</summary>
@@ -80,5 +80,29 @@
///</summary>
[SugarColumn(ColumnName="ORDER_NO" )]
public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 璧犲搧閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "ACTUAL_QUANTITY")]
+ public decimal? ActualQuantity { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍝佸彿
+ ///</summary>
+ [SugarColumn(ColumnName = "CUST_ITEM_NO")]
+ public string? CustItemNo { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鍝佸悕
+ ///</summary>
+ [SugarColumn(ColumnName = "CUST_ITEM_NAME")]
+ public string? CustItemName { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛瑙勬牸
+ ///</summary>
+ [SugarColumn(ColumnName = "CUST_ITEM_MODEL")]
+ public string? CustItemModel { 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 9e8fcfc..8af5a30 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 deda8a8..d5df46b 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/MesOutwareManager.cs b/MES.Service/service/Warehouse/MesOutwareManager.cs
index 0d24acb..2befbdb 100644
--- a/MES.Service/service/Warehouse/MesOutwareManager.cs
+++ b/MES.Service/service/Warehouse/MesOutwareManager.cs
@@ -182,11 +182,13 @@
OutQuantity = dto.OutQuantity,
OutwareType = dto.OutType,
OutwareNo = dto.OutNo,
+ OutwareOrder = dto.OutOrder,
Type = dto.Type,
Remarks = dto.Remarks,
ExpectedQuantity = dto.ExpQuantity,
ActualQuantity = dto.ActQuantity,
CustItemNo = dto.CustItemNo,
+ CustItemName = dto.CustItemName,
CustItemModel = dto.CustItemModel,
CustBillNo = dto.CustBillNo,
MachineType = dto.MachineType
@@ -208,14 +210,14 @@
return UseTransaction(db =>
{
- var update = db.Deleteable<Womcaa>()
- .Where(it => it.Caa001 == data.FBillNo &&
- it.SrcBillType == data.FBillTypeID)
+ var update = db.Deleteable<MesOutware>()
+ .Where(it => it.OutwareNo == data.FBillNo &&
+ it.OutwareType == data.FBillTypeID)
.ExecuteCommand() > 0;
- var insertOrUpdate = db.Deleteable<Womcab>()
- .Where(it => it.Cab001 == data.FBillNo &&
- it.Cab002 == data.FBillTypeID)
+ var insertOrUpdate = db.Deleteable<MesOutwareDetails>()
+ .Where(it => it.OutwareNo == data.FBillNo &&
+ it.OutwareType == data.FBillTypeID)
.ExecuteCommand() > 0;
diff --git a/MES.Service/service/Warehouse/MesReturnwareManager.cs b/MES.Service/service/Warehouse/MesReturnwareManager.cs
index f74a81d..a656112 100644
--- a/MES.Service/service/Warehouse/MesReturnwareManager.cs
+++ b/MES.Service/service/Warehouse/MesReturnwareManager.cs
@@ -166,7 +166,11 @@
ReturnOrder = dto.ReturnOrder,
OrderType = dto.OrderType,
OrderNumber = dto.OrderNumber,
- OrderNo = dto.OrderNo
+ OrderNo = dto.OrderNo,
+ ActualQuantity = dto.ActQuantity,
+ CustItemNo = dto.CustItemNo,
+ CustItemName = dto.CustItemName,
+ CustItemModel = dto.CustItemModel
};
@@ -185,14 +189,14 @@
return UseTransaction(db =>
{
- var update = db.Deleteable<Womcaa>()
- .Where(it => it.Caa001 == data.FBillNo &&
- it.SrcBillType == data.FBillTypeID)
+ var update = db.Deleteable<MesReturnware>()
+ .Where(it => it.ReturnNo == data.FBillNo &&
+ it.ReturnType == data.FBillTypeID)
.ExecuteCommand() > 0;
- var insertOrUpdate = db.Deleteable<Womcab>()
- .Where(it => it.Cab001 == data.FBillNo &&
- it.Cab002 == data.FBillTypeID)
+ var insertOrUpdate = db.Deleteable<MesReturnwareDetails>()
+ .Where(it => it.ReturnNo == data.FBillNo &&
+ it.ReturnType == data.FBillTypeID)
.ExecuteCommand() > 0;
diff --git a/MESApplication/Controllers/BasicData/MesOutwareController.cs b/MESApplication/Controllers/BasicData/MesOutwareController.cs
index 156636d..b608ea7 100644
--- a/MESApplication/Controllers/BasicData/MesOutwareController.cs
+++ b/MESApplication/Controllers/BasicData/MesOutwareController.cs
@@ -124,7 +124,51 @@
}
}
+ [HttpPost("Delete")]
+ public ResponseResult Delete(YFDelete data)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Delete";
+ entity.Method = METHOD;
+ entity.PageName = data.FBillTypeID + "-" + data.FBillNo; //鍗曞埆鍜屽崟鍙风殑鎷兼帴
+ entity.Title = "閿�鍞嚭璐ч�氱煡鍗�";
+ entity.Data = JsonConvert.SerializeObject(data);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Delete(data);
+ 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);
+ }
+ }
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
diff --git a/MESApplication/Controllers/BasicData/MesReturnwareController.cs b/MESApplication/Controllers/BasicData/MesReturnwareController.cs
index ada18ed..1faa264 100644
--- a/MESApplication/Controllers/BasicData/MesReturnwareController.cs
+++ b/MESApplication/Controllers/BasicData/MesReturnwareController.cs
@@ -123,6 +123,52 @@
}
+ [HttpPost("Delete")]
+ public ResponseResult Delete(YFDelete data)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Delete";
+ entity.Method = METHOD;
+ entity.PageName = data.FBillTypeID + "-" + data.FBillNo; //鍗曞埆鍜屽崟鍙风殑鎷兼帴
+ entity.Title = "閿�鍞��璐ч�氱煡鍗�";
+ entity.Data = JsonConvert.SerializeObject(data);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Delete(data);
+
+ 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>
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 9e8fcfc..8af5a30 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 deda8a8..d5df46b 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 09384dd..ef08bb7 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 dad02c5..6ccdd0e 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 d166433..4924f3b 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3