From 8fa52d01b1e7f067b2e7c7ded8facc4f9e22609c Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期六, 28 九月 2024 14:51:36 +0800
Subject: [PATCH] 修改下发空托出库接口

---
 Wms/WMS.BLL/DataServer/StockServer.cs |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 90c2d75..76b0595 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -380,7 +380,7 @@
                 "where bind.IsDel = '0' and notice.IsDel = '0' and bind.LotNo in (select LotNo from DataStock where IsDel = '0')   ";
             //鍑哄簱
             string cstr = "select notice.SONo,allot.LotNo,allot.TaskNo CTaskNo,allot.SkuNo,allot.SkuName,allot.PalletNo," +
-                "allot.CreateTime CCreateTime,allot.Qty CQty,allot.Qty CAllotQty,Allot.Qty CFactQty,Allot.CompleteQty CompleteQty," +
+                "allot.UpdateTime CCreateTime,allot.Qty CQty,allot.Qty CAllotQty,Allot.Qty CFactQty,Allot.CompleteQty CompleteQty," +
                 "allot.LotText,allot.SupplierLot " +
                 "from BllExportAllot allot left join BllExportNoticeDetail notice on allot.SODetailNo = notice.Id " +
                 "where allot.IsDel = '0' and notice.IsDel = '0' " +
@@ -571,7 +571,7 @@
                 {
                     EndTime = (Convert.ToDateTime(EndTime).AddDays(1)).ToString();
                 }
-                int countjie = 0; //缁熻缁撳瓨鏁伴噺
+                decimal countjie = 0; //缁熻缁撳瓨鏁伴噺
                 ////鍒ゆ柇搴撳瓨淇℃伅鏄惁涓虹┖
                 //if (stockInfo != null)
                 //{
@@ -596,10 +596,10 @@
                     }
 
                 //}
-                int yeara = 0; //骞村叆搴�
-                int years = 0; //骞村嚭搴�
-                int montha = 0; //鏈堝叆搴�
-                int months = 0; //鏈堝嚭搴�
+                decimal yeara = 0; //骞村叆搴�
+                decimal years = 0; //骞村嚭搴�
+                decimal montha = 0; //鏈堝叆搴�
+                decimal months = 0; //鏈堝嚭搴�
                 DateTime createTime = DateTime.Now.AddYears(-1000); //鏃堕棿
 
                 //鑾峰彇鏈夊灏戝勾
@@ -839,10 +839,12 @@
                         //鍒ゆ柇鐗╂枡鏄惁鐩稿悓
                         if (dto.SkuNo == item.SkuNo)
                         {
-                            dto.Qty = (Convert.ToInt32(dto.Qty) + Convert.ToInt32(item.Qty)).ToString();
-                            dto.FrozenQty = (Convert.ToInt32(dto.FrozenQty) + Convert.ToInt32(item.FrozenQty)).ToString();
-                            dto.LockQty = (Convert.ToInt32(dto.LockQty) + Convert.ToInt32(item.LockQty)).ToString();
-                            dto.ResidueQty = (Convert.ToInt32(dto.ResidueQty) + Convert.ToInt32(item.ResidueQty)).ToString();
+                            var s = Convert.ToDecimal(dto.Qty) ;
+                            var ss = Convert.ToDecimal(item.Qty);
+                            dto.Qty = (Convert.ToDecimal(dto.Qty) + Convert.ToDecimal(item.Qty)).ToString();
+                            dto.FrozenQty = (Convert.ToDecimal(dto.FrozenQty) + Convert.ToDecimal(item.FrozenQty)).ToString();
+                            dto.LockQty = (Convert.ToDecimal(dto.LockQty) + Convert.ToDecimal(item.LockQty)).ToString();
+                            dto.ResidueQty = (Convert.ToDecimal(dto.ResidueQty) + Convert.ToDecimal(item.ResidueQty)).ToString();
                             break;
                         }
                         i += 1;

--
Gitblit v1.8.0