From cd93dd1fd57afa3437e43499236273c2e1df4423 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期五, 19 十二月 2025 14:55:50 +0800
Subject: [PATCH] 车间出库页面车间增加1003车间一楼备件库
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 110 +++++++++++++++++++++++++++++++------------------------
1 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 1bb1eb6..b318553 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1,29 +1,30 @@
-锘縰sing System;
-using System.Collections.Generic;
-using SqlSugar;
-using System.Linq;
-using System.Linq.Expressions;
-using Model.InterFaceModel;
+锘縰sing Model.InterFaceModel;
using Model.ModelDto;
-using SqlSugar.Extensions;
-using WMS.Entity.BllSoEntity;
-using WMS.Entity.Context;
-using WMS.Entity.DataEntity;
-using WMS.Entity.SysEntity;
-using WMS.IBLL.IPdaServer;
using Model.ModelVm;
using Model.ModelVm.PdaVm;
using Newtonsoft.Json;
+using SqlSugar;
+using SqlSugar.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading.Tasks;
+using System.Web;
+using Utility;
using Utility.Tools;
+using WMS.BLL.Logic;
using WMS.BLL.LogServer;
using WMS.DAL;
-using WMS.Entity.LogEntity;
-using WMS.Entity.BllQualityEntity;
using WMS.Entity.BllAsnEntity;
-using System.Threading.Tasks;
-using Utility;
-using WMS.BLL.Logic;
-using System.Web;
+using WMS.Entity.BllQualityEntity;
+using WMS.Entity.BllSoEntity;
+using WMS.Entity.Context;
+using WMS.Entity.DataEntity;
+using WMS.Entity.LogEntity;
+using WMS.Entity.SysEntity;
+using WMS.IBLL.IPdaServer;
namespace WMS.BLL.BllPdaServer
{
@@ -80,9 +81,15 @@
{
throw Oops.Bah("鏈煡璇㈠埌璇ュ嚭搴撳崟鐨勪俊鎭�");
}
- if (notice.Status != "3")
+ //if (notice.Status != "3")
+ //{
+ // throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+ //}
+ //2025骞�12鏈�05鏃ョ敳鏂硅姹傝秴鎹★紝鍑哄簱鍗曡皟鏁翠负鎵ц瀹屾瘯涔熷彲浠ヨ秴鎹�
+ List<string> statusList = new List<string>() { "3", "4" };
+ if (!statusList.Contains(notice.Status))
{
- throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�佷笉鏄鍦ㄦ墽琛岋紝涓嶈兘鎷ｈ揣");
+ throw Oops.Bah("鍑哄簱鍗曠殑鐘舵�侀潪姝ｅ湪鎵ц锛屼笉鑳芥嫞璐�");
}
//鍑哄簱鍗曟槑缁�
var noticeDetail = await Db.Queryable<BllExportNoticeDetail>().FirstAsync(m => m.IsDel == "0" && m.Id == int.Parse(soDetailId));
@@ -119,7 +126,6 @@
bool isNew = false;
var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
- //var pinStockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
if (pinStockDetail != null)
{
@@ -130,13 +136,12 @@
if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
{
- //var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew).ToList();
- //鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
- if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
- {
- throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
- }
+ ////鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
+ //if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
+ //{
+ // throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
+ //}
}
sdId = pinStockDetail.Id;
@@ -156,7 +161,7 @@
//鍙厑璁哥粦瀹氬悓涓�涓嚭搴撳崟涓嬬殑鐗╂枡
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
- throw Oops.Bah("涓�涓墭鐩樺彧鑳芥帴鍙椾竴涓嚭搴撳崟鎷兼墭锛�");
+ throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
}
}
else
@@ -608,7 +613,7 @@
#region 鎷兼墭淇℃伅
bool isNew = false;
var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.SkuNo == stockDetail.SkuNo && m.LotNo == stockDetail.LotNo);
- //var pinStockDetail = await Db.Queryable<DataStockDetail>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
+
if (pinStockDetail != null)
{
//淇敼鎵樼洏琛ㄧ姸鎬佽鎵樼洏琛ㄥ拰搴撳瓨鏄庣粏琛ㄤ繚鎸佷竴鑷�
@@ -618,19 +623,17 @@
if (palletNo != palletNoNew)//闈炴暣鎵樻嫞璐�
{
- //var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Id != pinStockDetail.Id).ToList();
var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew).ToList();
- if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
- {
- throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
- }
+ //if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
+ //{
+ // throw Oops.Bah("鎷兼墭鎵樼洏涓婂彧鑳芥斁鍚屼竴涓嚭搴撳崟涓嬬殑鐗╂枡锛�");
+ //}
}
}
else
{
isNew = true;
- //var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew && m.Status == "0");
var newPalletInfo = await Db.Queryable<SysPallets>().FirstAsync(m => m.IsDel == "0" && m.PalletNo == palletNoNew);
if (newPalletInfo == null)
{
@@ -638,7 +641,8 @@
}
if (newPalletInfo.Status == "0")
{
- var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo && m.LotNo != stockDetail.LotNo)).ToList();
+ //var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo && m.LotNo != stockDetail.LotNo)).ToList();
+ var pinStockDetails = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNoNew && (m.SkuNo != stockDetail.SkuNo || m.LotNo != stockDetail.LotNo)).ToList();
if (pinStockDetails.Count(m => m.SONo != notice.SONo) > 0)
{
throw Oops.Bah("鏂版墭鐩樹俊鎭笉瀛樺湪鎴栧凡琚娇鐢紒");
@@ -1561,9 +1565,12 @@
string skuNo = boxInfos.First().SkuNo;
string skuName = boxInfos.First().SkuName;
- // 楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
- var areaList = new List<string>() { "B06", "B07", "B09", "B24" };
- if (!areaList.Contains(stockDetail.AreaNo))
+ //楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
+ string areaNoSql = $@"select AreaNo from SysStorageArea where IsDel='0' and AreaType='1'";
+ DataTable areaNoDt = Db.Ado.GetDataTable(areaNoSql);
+ List<string> areaNoList = areaNoDt.Rows.Cast<DataRow>().Select(e => e["AreaNo"] + "").ToList();
+
+ if (!areaNoList.Contains(stockDetail.AreaNo))
{
throw Oops.Bah("鎵樼洏涓嶆槸杞﹂棿鎵樼洏锛�");
}
@@ -1719,9 +1726,12 @@
throw Oops.Bah("鏈煡璇㈠埌璇ユ墭鐩樹笂璐х墿鐨勫簱瀛樻槑缁嗕俊鎭紒");
}
- // 楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
- var areaList = new List<string>() { "B06", "B07", "B09", "B24" };
- if (!areaList.Contains(stockDetail.AreaNo))
+ //楠岃瘉鏄惁杞﹂棿绾胯竟浠撳簱
+ string areaNoSql = $@"select AreaNo from SysStorageArea where IsDel='0' and AreaType='1'";
+ DataTable areaNoDt = Db.Ado.GetDataTable(areaNoSql);
+ List<string> areaNoList = areaNoDt.Rows.Cast<DataRow>().Select(e => e["AreaNo"] + "").ToList();
+
+ if (!areaNoList.Contains(stockDetail.AreaNo))
{
throw Oops.Bah("鎵樼洏涓嶆槸杞﹂棿鎵樼洏锛�");
}
@@ -1918,10 +1928,12 @@
throw Oops.Bah("鍑哄簱鏄庣粏涓虹┖锛岃閫夋嫨鐗╂枡-鎵规");
}
- var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "0" && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId)).Select(m => m.PalletNo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ //var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.Status == "0" && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId)).Select(m => m.PalletNo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ //鑾峰彇鐘舵�佷负0寰呬笅鍙戙��1浠诲姟涓嬪彂銆�2寰呮嫞璐с��3閮ㄥ垎鎷ｈ揣鐨勫嚭搴撳崟
+ List<string> statusList = new List<string>() { "0", "1", "2", "3" };
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && statusList.Contains(m.Status) && m.SONo == soNo && m.SODetailNo == int.Parse(soDetailId)).Select(m => m.PalletNo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+
return allotList;
-
-
}
@@ -1931,7 +1943,8 @@
{
if (type == "1")//骞冲簱鍑哄簱鑾峰彇鍗曟嵁
{
- var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "1" || m.Status == "0")).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+ List<string> statusList = new List<string>() { "0", "1", "2", "3" };
+ var allotList = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && statusList.Contains(m.Status)).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
return allotList;
}
//鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
@@ -1951,8 +1964,9 @@
{
throw Oops.Bah("鍗曟嵁涓虹┖锛岃閫夋嫨鍗曟嵁");
}
- //鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
- var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && (m.Status == "0" || m.Status == "1"));
+ //鑾峰彇鐘舵�佷负0寰呬笅鍙戙��1浠诲姟涓嬪彂銆�2寰呮嫞璐с��3閮ㄥ垎鎷ｈ揣鐨勫嚭搴撳崟
+ List<string> statusList = new List<string>() { "0", "1", "2", "3" };
+ var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.SONo == soNo && (statusList.Contains(m.Status)));
var list = await allotList.GroupBy(m => new { m.SODetailNo, m.SkuNo, m.SkuName, m.LotNo }).Select(m => new DetailIdSkuLotNo()
{
--
Gitblit v1.8.0