From 49bb2841cc45fea723667672e56c8c7510165ba8 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期四, 04 十二月 2025 16:36:15 +0800
Subject: [PATCH] 格式化代码
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 475 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 333 insertions(+), 142 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index f821c0b..66196cd 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -23,13 +23,14 @@
using ZXing.OneD;
using System.Threading.Tasks;
using System.Security.Policy;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
using Utility.Tools;
using Model.ModelDto.SysDto;
using Model.ModelVm.SysVm;
using System.Security.Cryptography.X509Certificates;
using AutoMapper.Configuration.Annotations;
using Utility;
+using System.Diagnostics.Metrics;
namespace WMS.BLL.BllPdaServer
{
@@ -51,7 +52,7 @@
{
#region 鍒ゆ柇
//0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 8锛氱敓浜ч��鏂欏叆搴�
-
+
if (string.IsNullOrEmpty(model.AsnNo))
{
@@ -111,17 +112,25 @@
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));
+ var detail = new BllArrivalNoticeDetail();
+ if (string.IsNullOrEmpty(model.LotNo))
+ {
+ detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo);
+ }
+ else
+ {
+ detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
+ }
if (detail == null)
{
throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
}
//鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
- var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
- if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
- {
- throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝涓嶅彲缁勬墭锛岃鏍稿疄锛�");
- }
+ //var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+ //if (stockDetail != null && !string.IsNullOrEmpty(stockDetail.WareHouseNo))
+ //{
+ // throw new Exception("璇ユ墭鐩樺凡鏈夊偍浣嶄俊鎭紝涓嶅彲缁勬墭锛岃鏍稿疄锛�");
+ //}
#endregion
@@ -133,13 +142,20 @@
#region 鍖呰
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
- var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo);
-
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ if (sku == null)
+ {
+ throw new Exception("褰撳墠鐗╂枡淇℃伅涓嶅瓨鍦紝璇锋牳瀹�!");
+ }
+ var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
+ if (pack == null)
+ {
+ throw new Exception("褰撳墠鐗╂枡鍖呰淇℃伅涓嶅瓨鍦紝璇锋牳瀹�!");
+ }
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
- new Common().GetPackQtyInfo(detail.PackagNo, ref pNum, ref bNum);
+ new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
#endregion
@@ -188,9 +204,9 @@
//缁戝畾绠辨�绘暟閲�
//model.SkuQty = boxInfoList.Sum(s => s.Qty);
//鍜岄�夋嫨鐨勬壒娆″悓鎵规鐨勭鐮佷俊鎭�
- var sameBoxInfoList = boxInfoList.Where(w => w.LotNo == model.LotNo && w.Status == "0").ToList();
+ var sameBoxInfoList = boxInfoList.Where(w => (w.LotNo ?? "") == model.LotNo && w.Status == "0").ToList();
//鍜岄�夋嫨鐨勬壒娆′笉鍚屾壒娆＄殑绠辩爜淇℃伅锛堟嫾绠辨壒娆★級
- var notBoxInfoList = boxInfoList.Where(w => w.LotNo != model.LotNo).ToList();
+ var notBoxInfoList = boxInfoList.Where(w => (w.LotNo ?? "") != model.LotNo).ToList();
#endregion
if (sameBoxInfoList.Count <= 0)
@@ -234,7 +250,7 @@
bindId = bind.Id;
bind.Qty += model.SkuQty;
}
-
+
#endregion
#region 搴撳瓨鏄庣粏鍜岃川妫�淇℃伅
@@ -256,20 +272,9 @@
}
// 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�
- var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo);
+ var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.LotNo == detail.LotNo && m.SkuNo == detail.SkuNo);// && m.ASNDetailNo == bind.ASNDetailNo
var sdId1 = 0;
- if (sd1 != null)
- {
- sdId1 = sd1.Id;
- // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
- sd1.Qty = bind.Qty;
- sd1.CompleteTime = comTime;
- sd1.UpdateUser = userId;
- sd1.UpdateTime = comTime;
-
- Db.Updateable(sd1).ExecuteCommand();
- }
- else
+ if (sd1 == null)
{
// 搴撳瓨涓嶅瓨鍦� 鎻掑叆鏁版嵁
sd1 = new DataStockDetail()
@@ -280,7 +285,7 @@
SkuNo = sku.SkuNo,
SkuName = sku.SkuName,
Standard = sku.Standard,
- Qty = bind.Qty,
+ Qty = 0,
LockQty = 0,
FrozenQty = 0,
InspectQty = 0,
@@ -301,7 +306,7 @@
InspectMark = bind.InspectMark,
InspectStatus = sku.IsInspect,
BitPalletMark = bind.BitPalletMark,
- PackagNo = detail.PackagNo, //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�
+ PackagNo = sku.PackagNo,
IsBale = bind.IsBale,
IsBelt = bind.IsBelt,
@@ -309,6 +314,22 @@
CreateUser = 0,
CreateTime = comTime
};
+ if (!string.IsNullOrEmpty(detail.Lot1))
+ {
+ sd1.ProductionTime = Convert.ToDateTime(detail.Lot1);//鐢熶骇鏃ユ湡
+ }
+ if (!string.IsNullOrEmpty(detail.Lot2))
+ {
+ sd1.ExpirationTime = Convert.ToDateTime(detail.Lot2);//鍒版湡鏃ユ湡
+ }
+ var palletData = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == sd1.PalletNo && !string.IsNullOrEmpty(w.LocatNo));
+ if (palletData != null)
+ {
+ sd1.WareHouseNo = palletData.WareHouseNo;
+ sd1.RoadwayNo = palletData.RoadwayNo;
+ sd1.AreaNo = palletData.AreaNo;
+ sd1.LocatNo = palletData.LocatNo;
+ }
//缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭� //0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")
@@ -326,20 +347,19 @@
//淇敼鍚堟牸涓嶅悎鏍兼暟閲�
if (quality.IsQualified == "1") //鍚堟牸
{
- //澧炲姞鍚堟牸鏁伴噺
- quality.PassQty += bind.Qty;
sd1.InspectStatus = "1";
}
else if (quality.IsQualified == "0") //涓嶅悎鏍�
{
- //澧炲姞涓嶅悎鏍兼暟閲�
- quality.FailQty += bind.Qty;
sd1.InspectStatus = "2";
}
- Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
}
//娣诲姞搴撳瓨鏄庣粏
sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+ }
+ else
+ {
+ sdId1 = sd1.Id;
}
#endregion
@@ -360,7 +380,7 @@
continue;
}
//绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
- if (box.SkuNo != detail.SkuNo || box.LotNo != model.LotNo)
+ if (box.SkuNo != detail.SkuNo || (box.LotNo ?? "") != model.LotNo)
{
throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
}
@@ -468,6 +488,10 @@
}
detail.UpdateUser = userId;
detail.UpdateTime = comTime;
+ if (notice.Type == "4" || notice.Type == "8")
+ {
+ detail.InspectStatus = "1";//杞﹂棿閫�鏂欓粯璁ゆ楠屽悎鏍�
+ }
//鏇存柊鍏ュ簱鍗曟槑缁�
Db.Updateable(detail).ExecuteCommand();
@@ -488,7 +512,13 @@
#endregion
#region 搴撳瓨鏄庣粏
- sd1.Qty = bind.Qty;
+
+ // 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
+ sd1.Qty += bind.Qty;
+ sd1.CompleteTime = comTime;
+ sd1.UpdateUser = userId;
+ sd1.UpdateTime = comTime;
+
//鏇存敼搴撳瓨鏄庣粏鏁伴噺
Db.Updateable(sd1).Where(m => m.Id == sdId1).ExecuteCommand();
#endregion
@@ -557,7 +587,7 @@
}
#endregion
}
-
+
//鎷肩
if (notBoxInfoList.Count > 0)
{
@@ -1106,7 +1136,7 @@
#region 鍒ゆ柇
//0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 8锛氱敓浜ч��鏂欏叆搴�
-
+
if (string.IsNullOrEmpty(model.AsnNo))
{
@@ -1157,7 +1187,15 @@
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));
+ var detail = new BllArrivalNoticeDetail();
+ if (string.IsNullOrEmpty(model.LotNo))
+ {
+ detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo);
+ }
+ else
+ {
+ detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo && m.LotNo.Contains(model.LotNo));
+ }
if (detail == null)
{
throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
@@ -1178,13 +1216,21 @@
#region 鍖呰
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
- //var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo); // liudl 鐢盨ku鍖呰缂栧彿鍙樻洿涓哄叆搴撳崟鏄庣粏鍖呰缂栧彿
+ if (sku == null)
+ {
+ throw new Exception("鏈煡璇㈠埌璇ョ墿鏂欎俊鎭紝璇锋牳瀹烇紒");
+ }
+ var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
+ if (pack == null)
+ {
+ throw new Exception("鏈煡璇㈠埌璇ョ墿鏂欏寘瑁呬俊鎭紝璇锋牳瀹烇紒");
+ }
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
- new Common().GetPackQtyInfo(detail.PackagNo, ref pNum, ref bNum);
-
+ new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
+
#endregion
@@ -1283,19 +1329,28 @@
//楠岃瘉搴撳瓨鎵樼洏鏄惁鏈夎创鏍囩墿鏂�
var skuStr = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0" && m.IsPasteCode == "1").Select(m => m.SkuNo).ToList();
var sdHave = Db.Queryable<DataStockDetail>().Count(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && skuStr.Contains(m.SkuNo));
- if (sdHave>0)
+ if (sdHave > 0)
{
throw new Exception("褰撳墠鎵樼洏鍚湁璐存爣鐗╂枡淇℃伅锛屼笉鑳界粍鎵�");
}
// 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�
- var sd1 = Db.Queryable<DataStockDetail>()
- .First(m => m.IsDel == "0" && m.ASNDetailNo == bind.ASNDetailNo && m.PalletNo == model.PalletNo && m.SkuNo == detail.SkuNo && m.LotNo == bind.LotNo);
+ var sd1 = new DataStockDetail();
+ if (!string.IsNullOrEmpty(bind.LotNo))
+ {
+ sd1 = Db.Queryable<DataStockDetail>()
+ .First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.SkuNo == detail.SkuNo && m.LotNo == bind.LotNo);//&& m.ASNDetailNo == bind.ASNDetailNo
+ }
+ else
+ {
+ sd1 = Db.Queryable<DataStockDetail>()
+ .First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo && m.SkuNo == detail.SkuNo);// && m.ASNDetailNo == bind.ASNDetailNo
+ }
var sdId1 = 0;
if (sd1 != null)
{
sdId1 = sd1.Id;
// 搴撳瓨宸插瓨鍦� 鏇存柊鏁版嵁
- sd1.Qty = bind.Qty;
+ sd1.Qty += bind.Qty;
sd1.CompleteTime = comTime;
sd1.UpdateUser = userId;
sd1.UpdateTime = comTime;
@@ -1340,7 +1395,7 @@
InspectMark = bind.InspectMark,
InspectStatus = inspectStatusStr,
BitPalletMark = bind.BitPalletMark,
- PackagNo = detail.PackagNo, //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�
+ PackagNo = sku.PackagNo, //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�
IsBale = bind.IsBale,
IsBelt = bind.IsBelt,
@@ -1555,10 +1610,10 @@
{
try
{
-
+
var modelList = Db.Queryable<BllArrivalNoticeDetail>()
- .LeftJoin<BllArrivalNotice>((tb1, tb2) => tb1.ASNNo == tb2.ASNNo )
- .LeftJoin<SysMaterials>((tb1, tb2, tb3) => tb1.SkuNo == tb3.SkuNo )
+ .LeftJoin<BllArrivalNotice>((tb1, tb2) => tb1.ASNNo == tb2.ASNNo)
+ .LeftJoin<SysMaterials>((tb1, tb2, tb3) => tb1.SkuNo == tb3.SkuNo)
.Where((tb1, tb2, tb3) => tb1.IsDel == "0" && tb2.IsDel == "0" && (tb2.Status == "0" || tb2.Status == "1") && tb3.IsDel == "0" && tb3.IsPasteCode == "1")
.Select((tb1, tb2, tb3) => tb1.ASNNo).Distinct().ToList();
@@ -1579,8 +1634,8 @@
{
var modelList = Db.Queryable<BllArrivalNoticeDetail>()
- .LeftJoin<BllArrivalNotice>((tb1, tb2) => tb1.ASNNo == tb2.ASNNo )
- .LeftJoin<SysMaterials>((tb1, tb2, tb3) => tb1.SkuNo == tb3.SkuNo )
+ .LeftJoin<BllArrivalNotice>((tb1, tb2) => tb1.ASNNo == tb2.ASNNo)
+ .LeftJoin<SysMaterials>((tb1, tb2, tb3) => tb1.SkuNo == tb3.SkuNo)
.Where((tb1, tb2, tb3) => tb1.IsDel == "0" && tb2.IsDel == "0" && (tb2.Status == "0" || tb2.Status == "1") && tb3.IsDel == "0" && tb3.IsPasteCode == "0")
.Select((tb1, tb2, tb3) => tb1.ASNNo).Distinct().ToList();
@@ -1591,7 +1646,7 @@
throw new Exception(e.Message);
}
}
-
+
/// <summary>
/// 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
/// </summary>
@@ -1737,7 +1792,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model,string url)
+ public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model, string url)
{
try
{
@@ -1798,7 +1853,7 @@
}
}
- else if (notice.Type == "1" || notice.Type == "4") //閲囪喘鍏ュ簱
+ else if (notice.Type == "1" || notice.Type == "4" || notice.Type == "8") //閲囪喘鍏ュ簱
{
string sqlString = $@"SELECT
ASNNo,
@@ -1922,8 +1977,8 @@
var addComBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allotId).ToList();
var addComList = addComBox.GroupBy(m => m.BoxNo).ToList();
var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == addComBox.First().SkuNo);
- var pNum = 0;
- var bNum = 0;
+ var pNum = 0m;
+ var bNum = 0m;
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
var boxList = new List<BllBoxInfo>();
foreach (var com in addComList)
@@ -2058,7 +2113,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url)
+ /*public List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url)
{
try
{
@@ -2161,6 +2216,133 @@
{
throw ex;
}
+ }*/
+
+ public List<BoxInfoDto> GetFMBindBoxInfos(string boxno, string url)
+ {
+ try
+ {
+ #region 绠辩爜璇锋眰鎺ュ彛锛屾寮忕郴缁熸斁寮�
+ var data = new
+ {
+ BoxNo = boxno
+ };
+ var jsonData = JsonConvert.SerializeObject(data);
+
+ var response = HttpHelper.DoPost(url, jsonData, "绠辩爜淇℃伅璇锋眰", "FM");
+
+ var obj = JsonConvert.DeserializeObject<FuMaPostModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.Success != true)
+ {
+ throw new Exception("璇锋眰澶辫触" + obj.Message);
+ }
+ #endregion
+
+ if (string.IsNullOrEmpty(obj.Data.SkuNo))
+ {
+ //娴嬭瘯鐢紝鍙戝竷姝ｅ紡鍓嶅垹闄ゆ娈典唬鐮�
+ //obj.Data.SkuNo = "50004632";
+ throw new Exception($"鐗╂枡缂栫爜涓嶈兘涓虹┖");
+ }
+
+ //鏌ユ壘鐗╂枡淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == obj.Data.SkuNo);
+ if (sku == null)
+ {
+ throw new Exception($"鏈煡璇㈠埌鐗╂枡{obj.Data.SkuNo}淇℃伅");
+ }
+
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
+ //鑾峰彇鍖呰淇℃伅
+ new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
+ if (pNum == 0 || bNum == 0)
+ {
+ throw new Exception($"{sku.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+ }
+
+ var boxList = new List<BllBoxInfo>();
+ var comTime = DateTime.Now;
+ //娣诲姞绠辩爜淇℃伅
+ foreach (var box in obj.Data.DetailList)
+ {
+ foreach (var box2 in box.DetailList2)
+ {
+ var boxInfo = new BllBoxInfo()
+ {
+ BoxNo = obj.Data.BoxNo,
+ BoxNo2 = box.BoxNo2,
+ BoxNo3 = box2.BoxNo3,
+ Qty = obj.Data.Qty,
+ BitBoxMark = obj.Data.BitBoxMark,
+
+ ASNNo = "",
+ //ASNDetailNo = noticeDetail.Id,
+ OrderCode = "",//notice.OrderCode
+ //BindNo = bindId,
+ //PalletNo = model.PallNo,
+ FullQty = bNum,
+ Status = "0",
+ SkuNo = sku.SkuNo,
+ SkuName = sku.SkuName,
+ LotNo = box2.LotNo,
+ LotText = obj.Data.LotNoBoxNum,
+ ProductionTime = DateTime.Parse(box2.ProductionTime),
+ ExpirationTime = DateTime.Parse(box2.ExpirationTime),
+ //CompleteTime = "",
+ InspectMark = "0",
+ InspectStatus = "0",
+ Origin = "璧嬬爜",
+ CreateTime = comTime,
+ CreateUser = 0
+ };
+ boxList.Add(boxInfo);
+ }
+ ;
+ }
+ try
+ {
+ //寮�鍚簨鍔�
+ Db.BeginTran();
+
+ Db.Fastest<BllBoxInfo>().BulkCopy(boxList);
+
+ //鎻愪氦浜嬪姟
+ Db.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ //鍥炴粴浜嬪姟
+ Db.RollbackTran();
+ throw new Exception("鎻掑叆绠辩爜澶辫触锛�" + ex.Message);
+ }
+
+ string sqlString = $@"SELECT
+ ASNNo,
+ BoxNo,
+ SkuNo,
+ SkuName,
+ LotNo,
+ BitBoxMark,
+ SUM(Qty) as Qty
+ FROM BllBoxInfo
+ WHERE IsDel = '0'
+ AND Status='0'
+ AND BoxNo = '{boxno}'
+ GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
+
+ var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+
+ if (models.Count == 0)
+ {
+ throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
+ }
+ return models;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
}
/// <summary>
@@ -2186,9 +2368,9 @@
{
if (models[0].Status == "1")
{
- var detail = Db.Queryable<DataStockDetail>().First(m=>m.PalletNo == palletNo );
-
- if (detail!= null && !string.IsNullOrWhiteSpace(detail.LocatNo))
+ var detail = Db.Queryable<DataStockDetail>().First(m => m.PalletNo == palletNo);
+
+ if (detail != null && !string.IsNullOrWhiteSpace(detail.LocatNo))
{
var pingAreaStr = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.AreaNo != "B06" && m.AreaNo != "B07").Select(m => m.AreaNo).ToList();
var pingLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == detail.LocatNo && pingAreaStr.Contains(m.AreaNo) && m.IsDel == "0");
@@ -2218,11 +2400,11 @@
/// <param name="asnNo">鍏ュ簱鍗�</param>
/// <param name="asnDetailId">鍏ュ簱鍗曟槑缁嗗彿</param>
/// <returns></returns>
- public BoxListInfoDto GetBoxCountByAsn(string asnNo,int? asnDetailId)
+ public BoxListInfoDto GetBoxCountByAsn(string asnNo, int? asnDetailId)
{
try
{
-
+
var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == asnDetailId);
if (detail == null)
{
@@ -2237,8 +2419,8 @@
};
//鑾峰彇鐘舵�佹槸鏈粍鎵樼殑鏍囩淇℃伅
var models = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNNo == asnNo && m.ASNDetailNo == asnDetailId && m.Status == "0")
- .GroupBy(m=> new { m.ProductionTime,m.ExpirationTime })
- .Select(m=>new { m.ProductionTime ,m.ExpirationTime}).OrderBy(m=>m.ProductionTime).ToList();//&& m.Status == "0"
+ .GroupBy(m => new { m.ProductionTime, m.ExpirationTime })
+ .Select(m => new { m.ProductionTime, m.ExpirationTime }).OrderBy(m => m.ProductionTime).ToList();//&& m.Status == "0"
foreach (var item in models)
{
var boxNoList = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.Status == "0" && m.ASNNo == asnNo && m.ASNDetailNo == asnDetailId && m.ProductionTime == item.ProductionTime).Select(m => m.BoxNo).ToList();
@@ -2272,7 +2454,7 @@
{
//鎵樼洏搴撳瓨淇℃伅
var stockDetailList = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();
- if (stockDetailList.Count(m=> string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+ if (stockDetailList.Count(m => string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
{
throw new Exception("鎵樼洏娌℃湁鍦ㄥ钩搴撳偍浣嶄笂");
}
@@ -2317,8 +2499,8 @@
{
var time = DateTime.Now;
//鍒ゆ柇褰撳墠鎵樼洏鏄惁瀛樺湪缁戝畾淇℃伅
- var task = Db.Queryable<LogTask>().First(m=> m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1") && m.OrderType == "0" && m.Type == "0");
-
+ var task = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1") && m.OrderType == "0" && m.Type == "0");
+
var upShelf = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
if (task != null)
{
@@ -2438,7 +2620,7 @@
{
throw new Exception("璇锋壂鎻忓绠辨潯鐮�!");
}
-
+
string sqlString = $@"SELECT BoxNo, SkuNo, SkuName, LotNo, BitBoxMark, SUM(Qty) as Qty FROM BllBoxInfo
WHERE IsDel = '0' and Status='0' and BoxNo = '{boxNo}'
GROUP BY BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
@@ -2452,7 +2634,7 @@
{
throw new Exception("娌℃湁鏌ヨ鍒扮鐮佷俊鎭�");
}
-
+
}
catch (Exception ex)
{
@@ -2461,7 +2643,7 @@
}
// 杞﹂棿缁戝畾鎵樼洏-璐存爣
- public void ChejianIn(string palletNo,string boxNo,decimal qty,string areaNo,int userId)
+ public void ChejianIn(string palletNo, string boxNo, decimal qty, string areaNo, int userId)
{
try
{
@@ -2475,7 +2657,7 @@
{
throw new Exception("绠卞彿涓嶈兘涓虹┖");
}
- if (qty<=0)
+ if (qty <= 0)
{
throw new Exception("鏁伴噺涓嶈兘灏忕瓑0");
}
@@ -2502,8 +2684,8 @@
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == boxInfoOne.SkuNo);
var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);
@@ -2513,7 +2695,7 @@
var msgStr = $"绠卞彿涓簕boxNo}";
var boxInfoList = new List<BllBoxInfo>();
-
+
boxInfoList.AddRange(boxInfo);
#region 搴撳瓨鏄庣粏
@@ -2523,15 +2705,15 @@
{
throw new Exception("鍏ュ簱鍖哄煙涓嶈兘涓虹┖");
}
-
+
var tags = "0";
-
+
// 鍒ゆ柇搴撳瓨鏄庣粏鏄惁宸叉湁姝ゆ墭鐩樹俊鎭�
- var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.SkuNo== boxInfoOne.SkuNo && m.LotNo == boxInfoOne.LotNo && m.PalletNo == palletNo);
+ var sd1 = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.SkuNo == boxInfoOne.SkuNo && m.LotNo == boxInfoOne.LotNo && m.PalletNo == palletNo);
var sdId1 = 0;
if (sd1 != null)
{
- if (sd1.AreaNo!= areaNo)
+ if (sd1.AreaNo != areaNo)
{
throw new Exception("閫夋嫨鐨勫尯鍩熶笌搴撳瓨涓嶅悓");
}
@@ -2547,7 +2729,7 @@
else
{
var sd2 = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo && m.IsDel == "0" && !string.IsNullOrWhiteSpace(m.AreaNo));
- if (sd2.Count(m=>m.AreaNo!= areaNo) > 0)
+ if (sd2.Count(m => m.AreaNo != areaNo) > 0)
{
throw new Exception("褰撳墠鎵樼洏浣嶇疆涓庨�夋嫨鐨勪笉鍚岋紝璇锋牳瀹�");
}
@@ -2576,7 +2758,7 @@
ExpirationTime = boxInfoOne.ExpirationTime,
Status = "0",
InspectMark = boxInfoOne.InspectMark,
- InspectStatus = sku.IsInspect,
+ InspectStatus = "1",//sku.IsInspect,//浠庤溅闂村叆搴撶殑璐ㄦ鐘舵�侀粯璁ゅ悎鏍�
BitPalletMark = "1",
PackagNo = sku.PackagNo,
@@ -2592,7 +2774,7 @@
// 鏇存敼绠辨敮鍏崇郴琛�
decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
-
+
//鏍囩缁勬墭
var boxGroup = boxInfo.GroupBy(m => m.BoxNo).ToList();
@@ -2605,11 +2787,11 @@
{
continue;
}
-
-
+
+
box.PalletNo = palletNo;
box.Status = "2";
-
+
box.CompleteTime = comTime;
box.UpdateTime = comTime;
box.UpdateUser = userId;
@@ -2619,7 +2801,7 @@
factQty += box.Qty;
boxFullQty += box.Qty;
-
+
#region 搴撳瓨绠辩爜鏄庣粏
var box2 = new DataBoxInfo()
{
@@ -2658,11 +2840,11 @@
{
Type = "0",//绫诲瀷锛�0锛氬叆搴� 1锛氬嚭搴�
PalletNo = palletNo,
- BoxNo=box.BoxNo,
- LotNo=box.LotNo,
- SkuNo=box.SkuNo,
- SkuName=box.SkuName,
- Qty=box.Qty
+ BoxNo = box.BoxNo,
+ LotNo = box.LotNo,
+ SkuNo = box.SkuNo,
+ SkuName = box.SkuName,
+ Qty = box.Qty
};
//娣诲姞搴撳瓨绠辩爜鏄庣粏
Db.Insertable(_log).ExecuteCommand();
@@ -2704,7 +2886,7 @@
}
#endregion
-
+
// 鏇存敼鎵樼洏浣跨敤鐘舵��
var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
////娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
@@ -2751,7 +2933,7 @@
if (skuInfo == null)
{
throw new Exception("鏈煡璇㈠埌鐗╂枡淇℃伅");
- }
+ }
var pall = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
if (pall == null)
{
@@ -2765,11 +2947,11 @@
var comTime = DateTime.Now;
#region 鍖呰
-
+
var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == skuInfo.PackagNo);
- var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
- var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
+ var pNum = 0m;//鎵樼洏鐗╁搧鏁伴噺
+ var bNum = 0m;//绠辩爜鐗╁搧鏁伴噺
//鍏叡鏂规硶鑾峰彇鍖呰鏁伴噺
new Common().GetPackQtyInfo(pack.PackagNo, ref pNum, ref bNum);
@@ -2833,7 +3015,7 @@
Status = "0",
InspectMark = "0",
InspectStatus = "1",
- BitPalletMark = qty >= pNum ?"0" :"1",
+ BitPalletMark = qty >= pNum ? "0" : "1",
PackagNo = skuInfo.PackagNo,
IsDel = "0",
@@ -3115,8 +3297,8 @@
}
//鑾峰彇鎵樼洏淇℃伅
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == "100099");
- var pNum = 0;
- var bNum = 0;
+ var pNum = 0m;
+ var bNum = 0m;
new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
@@ -4665,9 +4847,9 @@
}
#region 浜у搧缁勬墭
-
-
+
+
//鏍规嵁鐗╂枡鑾峰彇鏄惁瀛樺湪鍖呰淇℃伅
public string BySkuNoGetPackInfo(string skuNo)
{
@@ -6010,7 +6192,7 @@
#endregion
#region 璐ㄦ璇烽獙
- if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
+ if ((notice.Type == "1" || notice.Type == "4" || notice.Type == "5") && sku.IsInspect != "1" && sku.IsControlled != "1")
{
var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo && m.LotNo == bind.LotNo && m.SupplierLot == bind.SupplierLot);
if (qualityRequest == null)
@@ -6050,7 +6232,7 @@
}
}
-
+
#endregion
@@ -6091,7 +6273,7 @@
{
if (!string.IsNullOrEmpty(item.WareHouseNo) && !string.IsNullOrEmpty(item.AreaNo))
{
- if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09")
+ if (item.AreaNo != "B06" && item.AreaNo != "B07" && item.AreaNo != "B09")
{
throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳鏌�!");
}
@@ -6107,12 +6289,21 @@
{
throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨锛岃鏍告煡!");
}
+ if (storageLocat.WareHouseNo != "W04")
+ {
+ throw new Exception("璇ュ偍浣嶄笉鏄钩搴撳偍浣嶏紝璇锋鏌�!");
+ }
if (storageLocat.Status != "0")
- {
- var detailInfo=Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo);
+ {
+ var detailInfo = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.LocatNo == storageLocat.LocatNo);
if (detailInfo != null)
{
throw new Exception("鍌ㄤ綅涓嶆槸绌洪棽鐘舵�侊紝璇锋牳鏌�!");
+ }
+ var logIng = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.EndLocat == storageLocat.LocatNo && w.Status == "1" && w.PalletNo != model.PalletNo);
+ if (logIng != null)
+ {
+ throw new Exception("璇ュ偍浣嶆湁姝ｅ湪鎵ц鐨勫叆搴撲换鍔★紝璇锋牳鏌�!");
}
}
#endregion
@@ -6364,26 +6555,26 @@
Db.Updateable(bindInfo).ExecuteCommand();
#endregion
- /* #region 娣诲姞鎵樼洏涓婃灦璁板綍
- var upShelf = new BllPalletUpShelf()
- {
- TaskNo = exTask.TaskNo,
- TraceNo = bindInfo.ASNNo,
- PalletNo = bindInfo.PalletNo,
- SkuNo = stockModel.SkuNo,
- SkuName = stockModel.SkuName,
- LotNo = stockModel.LotNo,
- Status = "1",
+ /* #region 娣诲姞鎵樼洏涓婃灦璁板綍
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = bindInfo.ASNNo,
+ PalletNo = bindInfo.PalletNo,
+ SkuNo = stockModel.SkuNo,
+ SkuName = stockModel.SkuName,
+ LotNo = stockModel.LotNo,
+ Status = "1",
- WareHouseNo = bindInfo.WareHouseNo,
- RoadwayNo = bindInfo.RoadwayNo,
- AreaNo = "",
- LocatNo = "",
+ WareHouseNo = bindInfo.WareHouseNo,
+ RoadwayNo = bindInfo.RoadwayNo,
+ AreaNo = "",
+ LocatNo = "",
- CreateUser = 0,
- };
- Db.Insertable(upShelf).ExecuteCommand();
- #endregion*/
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ #endregion*/
#region 搴撳瓨绠辨敮鏄庣粏琛�
// 鎻掑叆鏂扮粍鐨勭鏀俊鎭�
@@ -6460,7 +6651,7 @@
//淇敼搴撳瓨鏄庣粏淇℃伅
Db.Updateable(item).ExecuteCommand();
}
-
+
#region 浠诲姟鍙婄粍鎵樹俊鎭�
//鍒涘缓浠诲姟淇℃伅
var taskNo = new Common().GetMaxNo("TK");
@@ -6485,7 +6676,7 @@
};
Db.Insertable(exTask).ExecuteCommand();
//鎵樼洏缁戝畾淇℃伅
- var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo
+ var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.PalletNo == model.PalletNo
&& w.Status == "2" && string.IsNullOrEmpty(w.LocatNo));
if (bindInfo != null)
{
@@ -6505,7 +6696,7 @@
var upShelf = new BllPalletUpShelf()
{
TaskNo = exTask.TaskNo,
- TraceNo = bindInfo== null? "": bindInfo.ASNNo,
+ TraceNo = bindInfo == null ? "" : bindInfo.ASNNo,
PalletNo = model.PalletNo,
SkuNo = palletupinfo.SkuNo,
SkuName = palletupinfo.SkuName,
@@ -6527,7 +6718,7 @@
//淇敼鍌ㄤ綅淇℃伅
Db.Updateable(storageLocat).ExecuteCommand();
- new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚",
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚",
$"鍦≒DA涓婂畬鎴愬崟鎹彿涓猴細{model.ASNNo}鐨勬墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳叆搴撴搷浣�", (int)model.CreateUser);
Db.CommitTran();
}
@@ -6544,7 +6735,7 @@
/// 浠撳簱纭鏀惰揣
/// </summary>
/// <param name="model"></param>
- public void ConfirmTakeOf(string palletNo,int userId)
+ public void ConfirmTakeOf(string palletNo, int userId)
{
try
{
@@ -6570,7 +6761,7 @@
//鑾峰彇搴撳瓨鏄庣粏淇℃伅
var stockDetailList = Db.Queryable<DataStockDetail>().Where(s => s.IsDel == "0" && s.PalletNo == palletNo).ToList();
//楠岃瘉搴撳瓨鏄庣粏淇℃伅鏄惁瀛樺湪
- if (stockDetailList.Count<=0)
+ if (stockDetailList.Count <= 0)
{
throw new Exception("搴撳瓨鏄庣粏涓嶅瓨鍦紝璇锋鏌ュ簱瀛樹俊鎭�!");
}
@@ -6609,7 +6800,7 @@
//鍒犻櫎搴撳瓨绠辩爜淇℃伅
Db.Deleteable(boxInfoList).ExecuteCommand();
}
-
+
//鍒犻櫎鎴栦慨鏀瑰簱瀛�
stock.Qty -= (decimal)item.Qty;
if (stock.Qty <= 0)
@@ -6976,7 +7167,7 @@
/// </summary>
/// <param name="model">缂栫爜 鍚嶇О</param>
/// <returns>鐗╂枡璇︾粏淇℃伅</returns>
- public MaterialsDto GetSkuInfo(GetMaterialsVm model)
+ public MaterialsDto GetSkuInfo(GetMaterialsVm model)
{
try
{
@@ -6985,8 +7176,8 @@
throw new Exception("璇疯緭鍏ョ墿鏂欑紪鐮佹垨鐗╂枡鍚嶇О!");
}
- var skuModels = Db.Queryable<SysMaterials>().Where(m => (m.SkuNo == model.SkuNo || m.SkuName == model.SkuName) && m.IsDel == "0").Select< MaterialsDto>().ToList();
- if (skuModels.Count <= 0)
+ var skuModels = Db.Queryable<SysMaterials>().Where(m => (m.SkuNo == model.SkuNo || m.SkuName == model.SkuName) && m.IsDel == "0").Select<MaterialsDto>().ToList();
+ if (skuModels.Count <= 0)
{
throw new Exception("鐗╂枡涓嶅瓨鍦紒");
}
@@ -7005,18 +7196,18 @@
/// <param name="model"></param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
- public List<BllBoxInfo> AddLabels(LabelsVm model)
+ public List<BllBoxInfo> AddLabels(LabelsVm model)
{
try
{
if (decimal.TryParse(model.SkuNum, out decimal skuQty))
{
- if (skuQty <= 0)
+ if (skuQty <= 0)
{
throw new Exception("绠卞唴鏁伴噺涓嶈兘灏忎簬绛変簬0");
}
}
- else
+ else
{
throw new Exception("绠卞唴鏁伴噺璇疯緭鍏ユ暟瀛楋紒");
}
@@ -7101,7 +7292,7 @@
if (packLevel == 1)
{
#region 涓�绾у寘瑁�
- int labelNum = 1;
+ int labelNum = 1;
labelNum = int.Parse(Math.Ceiling(skuQty / bNum).ToString());//鏍囩鏁伴噺
--
Gitblit v1.8.0