From 5ee576e2cd08ac783b064b5b550236d35f11533f Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期四, 21 三月 2024 17:01:08 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/BaseSetting/MaterialsForm.html | 1
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 4 +-
Pda/View/index.html | 2
Wms/WMS.BLL/DataServer/StockServer.cs | 63 ++++++++++++++++---------------
4 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index 98b3578..a6666d1 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -325,6 +325,7 @@
$("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 鏄惁鍏嶆
$("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected", "selected");// 鍗曚綅
$("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 鍖呰
+ $("#PackagNo").attr("disabled", "disabled")
$("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 瀛樺偍鐜
$("input[name='Weight']").val(res.data.Weight); // 鐞嗚閲嶉噺
$("input[name='Warranty']").val(res.data.Warranty); // 淇濊川鏈�
diff --git a/Pda/View/index.html b/Pda/View/index.html
index 39dd08c..5a1b7f7 100644
--- a/Pda/View/index.html
+++ b/Pda/View/index.html
@@ -101,7 +101,7 @@
<div id="" class="layout-sub-content">
<div id="menuList" class="menu">
<ul class="" style="text-align: center;">
- <li><a lang href="/pda_09/View/login.html">閲嶆柊鐧诲綍</a></li>
+ <li><a lang href="/View/login.html">閲嶆柊鐧诲綍</a></li>
</ul>
</div>
<div class="" >
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index afd992f..2485aa5 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1934,9 +1934,9 @@
}
//鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
- if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
+ if (stockDetail != null)// && !string.IsNullOrEmpty(stockDetail.WareHouseNo)
{
- throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳瀹烇紒");
+ throw new Exception("璇ユ墭鐩樺湪搴撳瓨宸叉湁淇℃伅锛岃鏍稿疄锛�");
}
// 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 6f7dbaf..90c2d75 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -40,7 +40,7 @@
"stock.LockQty,stock.FrozenQty,stock.OwnerNo,stock.OwnerName,(mate.Weight * stock.Qty) WeightSum " +
"from DataStock stock " +
"left join SysMaterials mate on stock.SkuNo = mate.SkuNo " +
- "Where stock.IsDel = @isdel";
+ "Where stock.IsDel = @isdel and mate.IsDel = 0 ";
//鍒ゆ柇鐗╂枡缂栫爜鏄惁涓虹┖
if (!string.IsNullOrEmpty(skuNo))
{
@@ -83,36 +83,37 @@
foreach (var item in StockList)
{
- //鍒ゆ柇搴撳瓨鎬婚噺鏄惁鎷ユ湁鐗╂枡
- if (StockListDto.Count > 0)
- {
- int i = 0;
- //foreach寰幆搴撳瓨鎬婚噺
- foreach (var dto in StockListDto)
- {
- //鍒ゆ柇鐗╂枡鍜屾壒娆℃槸鍚︾浉鍚�
- if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
- {
- 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;
- //鍒ゆ柇宸叉湁鐩稿悓鐗╂枡
- if (i == StockListDto.Count)
- {
- StockListDto.Add(item);
- break;
- }
- }
- }
- else
- {
- StockListDto.Add(item);
- continue;
- }
+ StockListDto.Add(item);
+ ////鍒ゆ柇搴撳瓨鎬婚噺鏄惁鎷ユ湁鐗╂枡
+ //if (StockListDto.Count > 0)
+ //{
+ // int i = 0;
+ // //foreach寰幆搴撳瓨鎬婚噺
+ // foreach (var dto in StockListDto)
+ // {
+ // //鍒ゆ柇鐗╂枡鍜屾壒娆℃槸鍚︾浉鍚�
+ // if (dto.SkuNo == item.SkuNo && dto.LotNo == item.LotNo)
+ // {
+ // 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;
+ // //鍒ゆ柇宸叉湁鐩稿悓鐗╂枡
+ // if (i == StockListDto.Count)
+ // {
+ // StockListDto.Add(item);
+ // break;
+ // }
+ // }
+ //}
+ //else
+ //{
+ // StockListDto.Add(item);
+ // continue;
+ //}
}
return StockListDto;
--
Gitblit v1.8.0