From 5df8a085b6c9334a04ed8b90be110d1fbcd3bc89 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 04 9月 2025 16:46:02 +0800
Subject: [PATCH] 修复 不能分拣的问题
---
wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs | 126 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 120 insertions(+), 6 deletions(-)
diff --git a/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs b/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
index 9293210..f771a5e 100644
--- a/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
+++ b/wcs/yunneiWCS/yunneiWCS/wcf/yunneiWcf.cs
@@ -17,6 +17,8 @@
using yunneiWCS.Common;
using yunneiWCS.SystemInteraction.tianyong;
using yunneiWCS.Models;
+using iWareCommon.Utils;
+
namespace yunneiWCS.wcf
{
// 娉ㄦ剰: 浣跨敤鈥滈噸鏋勨�濊彍鍗曚笂鐨勨�滈噸鍛藉悕鈥濆懡浠わ紝鍙互鍚屾椂鏇存敼浠ｇ爜鍜岄厤缃枃浠朵腑鐨勭被鍚嶁�測unneiWcf鈥濄��
@@ -946,7 +948,7 @@
{
sql = sql + " and supplier like '%" + value.supplier + "%'";
}
- if (value.isSendToMes != null && value.isSendToMes != 0)
+ if (value.isSendToMes != null)
{
sql = sql + " and isSendToMes = '" + value.isSendToMes + "' ";
}
@@ -1021,6 +1023,111 @@
{
msg.msg = "鏌ヨ澶辫触";
WZ.Useful.Commons.LogTextHelper.WriteLine("IyunneiWcf", "findOutInStockRecord_V2_Mes", ex.ToString());
+ }
+
+ return msg;
+ }
+
+ /// <summary>鏌ユ壘鍑哄叆搴撹褰曟槑缁嗙粰MES [EditBy shaocx,2025-09-01]
+ ///
+ /// </summary>
+ /// <param name="page">鍒嗛〉</param>
+ /// <returns></returns>
+ public resMsg<Wms_outInStockRecord_Details_V2_Mes> findOutInStockRecord_Details_V2_Mes_Page(paging page, Wms_outInStockRecord_Details_V2_Mes value)
+ {
+ resMsg<Wms_outInStockRecord_Details_V2_Mes> msg = new resMsg<Wms_outInStockRecord_Details_V2_Mes>();
+ msg.status = 400;
+ try
+ {
+ using (dbmodel mod = new dbmodel())
+ {
+ string sql = "SELECT * FROM [LA20025].[dbo].[Wms_outInStockRecord_Details_V2_Mes] ";
+ sql = sql + " WHERE 1=1 ";
+
+ if (!string.IsNullOrEmpty(value.containerCode))//鎵樼洏鍙�
+ {
+ sql = sql + " and containerCode like '%" + value.containerCode + "%'";
+ }
+ if (!string.IsNullOrEmpty(value.productCode))//鐗╂枡缂栧彿
+ {
+ sql = sql + " and productCode like '%" + value.productCode + "%'";
+ }
+ if (!string.IsNullOrEmpty(value.productName))//鐗╂枡鍚嶇О
+ {
+ sql = sql + " and productName like '%" + value.productName + "%' ";
+ }
+ if (!string.IsNullOrEmpty(value.serialNumber))//娴佹按鍙�
+ {
+ sql = sql + " and serialNumber like '%" + value.serialNumber + "%' ";
+ }
+
+ if (page.startDateTime != DateTime.Parse("1900-01-01 0:00:00") && page.startDateTime != DateTime.Parse("0001-01-01 0:00:00"))//璧峰鏃堕棿
+ {
+ sql = sql + " and CreateTime >'" + page.startDateTime + "'";
+ }
+ if (page.endDateTime != DateTime.Parse("1900-01-01 0:00:00") && page.endDateTime != DateTime.Parse("0001-01-01 0:00:00"))//鎴鏃堕棿
+ {
+ sql = sql + " and CreateTime <'" + page.endDateTime + "'";
+ }
+
+ sql = sql + " order by CreateTime desc";
+ List<Wms_outInStockRecord_Details_V2_Mes> dataList = mod.Database.SqlQuery<Wms_outInStockRecord_Details_V2_Mes>(sql).ToList();
+
+ if (dataList.Count > 0)
+ {
+ //msg.quantity = (int)dataList.Sum(x => x.quantity);
+ msg.totalNum = dataList.Count;
+ msg.dateAll = dataList;
+ //鍒嗛〉璁＄畻
+ List<Wms_outInStockRecord_Details_V2_Mes> fenyeRerult = new List<Wms_outInStockRecord_Details_V2_Mes>();
+ msg.status = 200;
+
+ //鍋囧姣忛〉鏁伴噺 澶т簬鐩樼偣鏁版嵁
+ if (page.pagesize > dataList.Count)
+ {
+ msg.date = dataList;
+ msg.total = 1;
+ }
+ else
+ {
+ #region 鍒嗛〉璁＄畻
+ int a = page.pagesize;
+ int b = page.pagenum;
+ int c = (int)Math.Ceiling((double)dataList.Count / a);
+ msg.total = c;
+ int d = dataList.Count % a;
+ int e = 0;
+ int f = a * (b - 1);
+ if (d != 0 && b == c)
+ {
+ e = d + f;
+ }
+ else
+ {
+ e = a + f;
+ }
+ for (int i = f; i < e; i++)
+ {
+ fenyeRerult.Add(dataList[i]);
+ }
+
+ msg.date = fenyeRerult;
+ #endregion
+ }
+
+ }
+ else
+ {
+ msg.status = 200;
+ msg.msg = "鏌ユ壘鏁版嵁涓�0,璇锋洿鎹㈡煡璇㈡潯浠�";
+ }
+
+ }
+ }
+ catch (Exception ex)
+ {
+ msg.msg = "鏌ヨ澶辫触";
+ WZ.Useful.Commons.LogTextHelper.WriteLine("IyunneiWcf", "Wms_outInStockRecord_Details_V2_Mes", ex.ToString());
}
return msg;
@@ -1146,9 +1253,10 @@
msg.msg = "鑷冲皯鐣欎竴涓槑缁�";
}
}
- catch (Exception)
+ catch (Exception ex)
{
- msg.msg = "鎵ц閿欒";
+ msg.msg = "鎵ц閿欒:" + ex.Message;
+ Log4NetHelper.WriteErrorLog(LogType.OtherInfo, "modfiyInStockList:" + msg.msg, ex);
}
return msg;
}
@@ -2220,7 +2328,12 @@
preLog = "浜哄伐鍒嗘嫞";
}
- OutInStockRecord_V2_MesHandler.AddRecordForPersonDelete(mod, OutInFlag.鍑哄簱, "浜哄伐鍒犻櫎搴撳瓨:" + preLog, record_delteList, modfiyStock);//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
+ if (record_delteList?.Count > 0)
+ {
+ OutInStockRecord_V2_MesHandler.AddRecordForPersonDelete(mod, OutInFlag.鍑哄簱, "浜哄伐鍒犻櫎搴撳瓨:" + preLog,
+ record_delteList, modfiyStock, (currentStock != null ? currentStock.positionName : ""));//鍫嗗灈鏈轰换鍔″畬鎴愬悗鐨勫嚭搴�
+ }
+
int res = mod.SaveChanges();
if (res > 0)
@@ -2236,9 +2349,10 @@
msg.msg = "鑷冲皯鐣欎竴涓槑缁�";
}
}
- catch (Exception)
+ catch (Exception ex)
{
- msg.msg = "鎵ц閿欒";
+ msg.msg = "鎶ラ敊浜�:" + ex.Message;
+ Log4NetHelper.WriteErrorLog(LogType.OtherInfo, "modfiyStockList:" + msg.msg, ex);
}
return msg;
}
--
Gitblit v1.9.3