From 05ec4c0c2558912a7e793bf629c62416b3872e84 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 22 七月 2024 17:00:04 +0800
Subject: [PATCH] 盘点调整
---
Pda/View/HouseDataSetting/stockCheck.html | 1
HTML/views/HouseWithinSetting/CRLogTask.html | 4 +
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 27 +++---
Wms/Wms/Controllers/BllCheckController.cs | 2
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 6
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 172 +++++++++++++++++++++---------------------
6 files changed, 109 insertions(+), 103 deletions(-)
diff --git a/HTML/views/HouseWithinSetting/CRLogTask.html b/HTML/views/HouseWithinSetting/CRLogTask.html
index 26d6a65..9fd6296 100644
--- a/HTML/views/HouseWithinSetting/CRLogTask.html
+++ b/HTML/views/HouseWithinSetting/CRLogTask.html
@@ -161,6 +161,10 @@
html = `<p>鐩樼偣鍗�</p>`;
} else if(d.OrderType=='3') {
html = `<p>绉诲簱鍗�</p>`;
+ }else if(d.OrderType=='4') {
+ html = `<p>鍙栨牱鍑哄簱鍗�</p>`;
+ }else if(d.OrderType=='6') {
+ html = `<p>瑙嗚鐩樼偣</p>`;
} else {
}
diff --git a/Pda/View/HouseDataSetting/stockCheck.html b/Pda/View/HouseDataSetting/stockCheck.html
index 1ce8639..82897ac 100644
--- a/Pda/View/HouseDataSetting/stockCheck.html
+++ b/Pda/View/HouseDataSetting/stockCheck.html
@@ -583,6 +583,7 @@
refreshTable()
GetOutInfo()
canPickBox = true
+ form.render('select')
});
} else { //涓嶆垚鍔�
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index ffc8278..283f9ed 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -97,9 +97,9 @@
throw new Exception("褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
}
}
-
-
-
+
+
+
#endregion
@@ -113,13 +113,13 @@
{
throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅锛岃鏍稿疄锛�");
}
-
-
-
+
+
+
#region 鍖呰
var package = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0");
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == model.SkuNo);
- SysPackag pack = null ;
+ SysPackag pack = null;
if (model.Type == "0")
{
pack = package.First(m => m.IsDel == "0" && m.PackagNo == detail.PackagNo); // liudl 鐢盨ku鍖呰缂栧彿鍙樻洿涓哄叆搴撳崟鏄庣粏鍖呰缂栧彿
@@ -128,7 +128,7 @@
{
pack = package.First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo); // liudl 鐢盨ku鍖呰缂栧彿鍙樻洿涓哄叆搴撳崟鏄庣粏鍖呰缂栧彿
}
-
+
var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
@@ -172,7 +172,7 @@
#region 楠岃瘉鏄惁鍏佽绔嬪簱鍚屾墭鐩樹笉鍚岀墿鏂欏叆搴撴垨鍚屾墭鐩樺悓鐗╂枡涓嶅悓鎵规鍏ュ簱
var list = model.Detail.GroupBy(m => new { m.SkuNo, m.LotNo }).ToList();
- if (list.Count>=2)
+ if (list.Count >= 2)
{
var funSetting = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetNo == "Fun045");
if (funSetting == null || funSetting.IsEnable == "OFF")
@@ -180,7 +180,7 @@
throw new Exception($"涓嶅厑璁哥珛搴撳悓鎵樼洏涓嶅悓鐗╂枡鍏ュ簱鎴栧悓鎵樼洏涓嶅悓鎵规鍏ュ簱锛�");
}
}
-
+
#endregion
//liudl && m.Status != "2" 缁勭洏鏃㈠叆搴撳畬鎴愭棤闇�鏍规嵁鎵樼洏鐘舵�佸垽鏂�
@@ -204,10 +204,10 @@
SupplierLot = model.SupplierLot,
//InspectMark = model.IsSample, //鏄惁鍙栨牱鎵樼洏 鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
//SamplingQty = 0, //鍙栨牱鏁伴噺 鍚庢湡涓氬姟寮�鍙戞椂 鎺ュ彛浼犲�奸渶娣诲姞瀵瑰簲瀛楁鍒ゆ柇
- BitPalletMark = model.Qty == pNum ? "0": "1",
+ BitPalletMark = model.Qty == pNum ? "0" : "1",
IsBale = "0",
IsBelt = "0",
- CreateUser = userId,
+ CreateUser = userId,
};
if (bind.FullQty < bind.Qty)
@@ -242,7 +242,7 @@
sd1 = Db.Queryable<DataStockDetail>()
.First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
}
-
+
var sdId1 = 0;
if (sd1 != null)
{
@@ -280,11 +280,11 @@
InspectMark = bind.InspectMark,
InspectStatus = sku.IsInspect,
BitPalletMark = bind.BitPalletMark,
- PackagNo = model.Type =="0"? detail.PackagNo : sku.PackagNo, //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�
+ PackagNo = model.Type == "0" ? detail.PackagNo : sku.PackagNo, //liudl 鐢眘ku鐨勫寘瑁呯紪鍙峰彉涓哄叆搴撳崟鏄庣粏鐨勫寘瑁呯紪鐮�
IsBale = bind.IsBale,
IsBelt = bind.IsBelt,
- OwnerNo = model.Type == "0" ? notice.CustomerNo: null,//璐т富缂栫爜
- OwnerName = model.Type == "0" ? notice.CustomerName :null,//璐т富鍚嶇О
+ OwnerNo = model.Type == "0" ? notice.CustomerNo : null,//璐т富缂栫爜
+ OwnerName = model.Type == "0" ? notice.CustomerName : null,//璐т富鍚嶇О
IsDel = "0",
CreateUser = 0,
CreateTime = comTime
@@ -357,8 +357,8 @@
CreateUser = userId,
CreateTime = comTime,
};
-
- boxInfoList.Add(boxInfo);
+
+ boxInfoList.Add(boxInfo);
factQty += box.Qty;
#region 搴撳瓨绠辩爜鏄庣粏
@@ -399,7 +399,7 @@
}
else if (model.Type == "0")//鐗╂枡鎵�
{
- if (model.Detail.Count(m=>m.OrderCode != detail.OrderDetailCode)>0)
+ if (model.Detail.Count(m => m.OrderCode != detail.OrderDetailCode) > 0)
{
throw new Exception($"鎵樼洏缁戝畾鏄庣粏涓紝鍚湁绠辩爜鐢熶骇宸ュ崟涓嶄竴鑷�");
}
@@ -486,19 +486,19 @@
throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
}
}
- }
-
+ }
+
Db.Insertable(boxInfoList).ExecuteCommand();
#endregion
-
-
+
+
if (factQty != bind.Qty)
{
throw new Exception("绠辩爜鏄庣粏鎬绘暟閲忎笉鍚屼簬鎵樼洏鎬绘暟閲忥紝璇锋牳瀹�");
}
#region 鍏ュ簱鍗曞強鏄庣粏
- if (model.Type =="0")
+ if (model.Type == "0")
{
detail.FactQty += factQty;//宸茬粍鏁伴噺
detail.CompleteQty += factQty;//瀹屾垚鏁伴噺
@@ -529,7 +529,7 @@
//鏇存柊鍏ュ簱鍗�
Db.Updateable(notice).ExecuteCommand();
}
-
+
#endregion
#region 搴撳瓨
@@ -537,7 +537,7 @@
if (dataStock != null)
{
dataStock.Qty += factQty;
-
+
if (bind.InspectMark == "1")
{
dataStock.IsSampling = bind.InspectMark;
@@ -573,7 +573,7 @@
Db.Insertable(stock).ExecuteCommand();
}
#endregion
-
+
// 鏇存敼鎵樼洏浣跨敤鐘舵��
var sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
//娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
@@ -712,7 +712,7 @@
{
BoxNo = a.BoxNo,
PalletNo = a.PalletNo,
- BindNo=a.BindNo,
+ BindNo = a.BindNo,
Qty = SqlFunc.AggregateSum(a.Qty),
SamplingQty = SqlFunc.AggregateSum(a.SamplingQty),
FullQty = a.FullQty,
@@ -743,7 +743,7 @@
/// <param name="boxNo">绠辩爜</param>
/// <param name="boxNo3">鏀爜</param>
/// <returns></returns>
- public List<BoxInfoDto> GetBoxInfoByBoxNo(string boxNo, string boxNo3,int bindNo)
+ public List<BoxInfoDto> GetBoxInfoByBoxNo(string boxNo, string boxNo3, int bindNo)
{
Expression<Func<BllBoxInfo, bool>> item = Expressionable.Create<BllBoxInfo>()
.AndIF(!string.IsNullOrWhiteSpace(boxNo), it => it.BoxNo == boxNo.Trim())
@@ -805,16 +805,16 @@
#region 楠岃瘉褰撳墠鎵樼洏淇℃伅鏄惁鍙垹闄�
// 鍒ゆ柇璁㈠崟鏄惁鍏抽棴
var asnData = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == bind.ASNNo);
- if (asnData != null)
+ if (asnData != null)
{
- if (asnData.Status == "3" ||asnData.Status == "4")
+ if (asnData.Status == "3" || asnData.Status == "4")
{
throw new Exception("鍗曟嵁宸插叧鍗曚笉鍙垹闄�");
}
}
// 鍒ゆ柇鏄惁宸叉湁宸烽亾鍜屽偍浣�
- if ( !string.IsNullOrWhiteSpace(bind.LocatNo) || !string.IsNullOrWhiteSpace(bind.RoadwayNo) )
+ if (!string.IsNullOrWhiteSpace(bind.LocatNo) || !string.IsNullOrWhiteSpace(bind.RoadwayNo))
{
throw new Exception("鎵樼洏宸蹭笂鏋朵笉鍙垹闄ょ粍鎵�");
}
@@ -827,9 +827,9 @@
{
throw new Exception("搴撳唴涓嶅瓨鍦ㄦ鎵樼洏!");
}
- else
+ else
{
- if (dataBindItem.Status != "0")
+ if (dataBindItem.Status != "0")
{
throw new Exception("鎵樼洏涓嶆槸寰呭垎閰嶇姸鎬侊紝涓嶅彲鍒犻櫎");
}
@@ -842,35 +842,35 @@
{
throw new Exception("搴撳唴涓嶅瓨鍦ㄦ鎵樼洏涓婄墿鏂欐壒娆′俊鎭�!");
}
- if (dataStocks.Qty - dataBindItem.Qty < dataStocks.LockQty)
+ if (dataStocks.Qty - dataBindItem.Qty < dataStocks.LockQty)
{
throw new Exception("鎵樼洏涓婅揣鐗╁凡琚攣瀹氫笉鍙垹闄�");
}
-
+
// 楠岃瘉搴撳唴鎵樼洏淇℃伅鍜岀粦瀹氭墭鐩樹俊鎭槸鍚︿竴鑷�
var bllboxItem = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BindNo == bind.Id).ToList();
var databoxItem = new List<DataBoxInfo>();
- if (bllboxItem.Count == 0)
+ if (bllboxItem.Count == 0)
{
// 鎸夋暟閲忕粍鎵橈紝娌℃湁绠辨敮鍏崇郴
if (dataBindItem.ASNDetailNo != bind.ASNDetailNo
|| dataBindItem.ASNNo != bind.ASNNo
- || dataBindItem.LotNo != bind.LotNo
- || dataBindItem.Qty != bind.Qty)
+ || dataBindItem.LotNo != bind.LotNo
+ || dataBindItem.Qty != bind.Qty)
{
throw new Exception("鎵樼洏涓婅揣鐗╁凡鍙樻洿涓嶅彲鍒犻櫎");
}
}
- else
+ else
{
// 寰幆瀵规瘮绠辨敮鍏崇郴鏄惁瀛樺湪
- foreach (BllBoxInfo box in bllboxItem)
+ foreach (BllBoxInfo box in bllboxItem)
{
var databox = Db.Queryable<DataBoxInfo>()
- .First(m => m.IsDel == "0" && m.BoxNo == box.BoxNo
+ .First(m => m.IsDel == "0" && m.BoxNo == box.BoxNo
&& m.BoxNo2 == box.BoxNo2 && m.BoxNo3 == box.BoxNo3);
- if (databox == null)
+ if (databox == null)
{
throw new Exception("鎵樼洏涓婅揣鐗╁凡鍙樻洿涓嶅彲鍒犻櫎");
}
@@ -882,13 +882,13 @@
// 楠岃瘉鏄惁宸叉湁鍏ュ簱浠诲姟
var taskitem = new LogTask();
- if (!string.IsNullOrWhiteSpace(bind.TaskNo))
+ if (!string.IsNullOrWhiteSpace(bind.TaskNo))
{
taskitem = Db.Queryable<LogTask>().First(m => m.TaskNo == bind.TaskNo);
- if (taskitem != null)
+ if (taskitem != null)
{
- if (taskitem.IsSuccess == 1)
+ if (taskitem.IsSuccess == 1)
{
throw new Exception("鎵樼洏鍏宠仈鐨勫叆搴撲换鍔″凡涓嬪彂涓嶅彲鍒犻櫎");
}
@@ -907,10 +907,10 @@
var time = DateTime.Now;
//鎵樼洏缁戝畾鐨勭鏀俊鎭泦鍚�
//var boxList = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BindNo == bind.Id).ToList();
- if (bllboxItem.Count != 0)
+ if (bllboxItem.Count != 0)
{
var ids = databoxItem.Select(m => m.StockDetailId).Distinct().ToList();
- var dataStockDetail = Db.Queryable<DataStockDetail>().Where(m=>m.IsDel == "0" && ids.Contains(m.Id)).ToList();
+ var dataStockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && ids.Contains(m.Id)).ToList();
var stockItem = new List<DataStock>();
foreach (var item in dataStockDetail)
{
@@ -920,10 +920,10 @@
stockItem.Add(dataStock);
}
}
-
+
foreach (var b in bllboxItem)
{
- b.IsDel = "0";
+ b.IsDel = "0";
b.PalletNo = "";
b.BindNo = null;
b.Status = "0";
@@ -936,7 +936,7 @@
throw new Exception($"{b.BoxNo}绠辩爜銆亄b.BoxNo3}鏀爜鍒犻櫎澶辫触");
}
//鍒犻櫎搴撳瓨绠辩爜鏄庣粏淇℃伅
- var box = databoxItem.FirstOrDefault(m=>m.BoxNo == b.BoxNo && m.BoxNo2 == b.BoxNo2 && m.BoxNo3 == b.BoxNo3);
+ var box = databoxItem.FirstOrDefault(m => m.BoxNo == b.BoxNo && m.BoxNo2 == b.BoxNo2 && m.BoxNo3 == b.BoxNo3);
if (box == null)
{
throw new Exception($"鏈煡璇㈠埌{b.BoxNo}绠辩爜銆亄b.BoxNo3}鏀爜鐨勫簱瀛樹俊鎭�");
@@ -948,8 +948,8 @@
throw new Exception($"鏈煡璇㈠埌{b.BoxNo}绠辩爜銆亄b.BoxNo3}鏀爜鐨勫簱瀛樻墭鐩樹俊鎭�");
}
stockDetail.Qty -= box.Qty;
-
- if (stockDetail.Qty<=0)
+
+ if (stockDetail.Qty <= 0)
{
Db.Deleteable(stockDetail).ExecuteCommand();
}
@@ -958,7 +958,7 @@
Db.Updateable(stockDetail).ExecuteCommand();
}
//鍒犻櫎/淇敼搴撳瓨鎬昏〃淇℃伅
- var stock = stockItem.FirstOrDefault(m=>m.SkuNo == b.SkuNo && m.LotNo == b.LotNo);
+ var stock = stockItem.FirstOrDefault(m => m.SkuNo == b.SkuNo && m.LotNo == b.LotNo);
if (stock == null)
{
throw new Exception($"鏈煡璇㈠埌{b.BoxNo}绠辩爜銆亄b.BoxNo3}鏀爜鐨勫簱瀛樻�讳俊鎭�");
@@ -981,7 +981,7 @@
{
//鍒犻櫎/淇敼搴撳瓨鎵樼洏鏄庣粏淇℃伅
var stockDetail = dataBindItem;
-
+
stockDetail.Qty -= bind.Qty;
if (stockDetail.Qty <= 0)
@@ -994,7 +994,7 @@
}
//鍒犻櫎/淇敼搴撳瓨鎬昏〃淇℃伅
var stock = dataStocks;
-
+
stock.Qty -= bind.Qty;
if (stock.Qty <= 0)
{
@@ -1006,7 +1006,7 @@
}
}
//鍒ゆ柇鏄惁鏈夋寚瀹氬偍浣�
- if (taskitem != null)
+ if (taskitem != null)
{
if (!string.IsNullOrWhiteSpace(taskitem.EndLocat))
{
@@ -1044,10 +1044,10 @@
{
throw new Exception("鏌ヨ鍒扮┖鎵樻湁鍗曟嵁淇℃伅锛岄敊璇��");
}
-
+
//淇敼鍏ュ簱鍗曟槑缁�
noticeDetail.FactQty -= bind.Qty;
- noticeDetail.CompleteQty -= bind.Qty;
+ noticeDetail.CompleteQty -= bind.Qty;
//鍒ゆ柇鍏ュ簱鍗曟槑缁嗙粍鎵樻暟閲忔槸鍚︿负0锛屾槸锛氫慨鏀规槑缁嗙姸鎬�
//鍏ュ簱鎬诲崟淇℃伅
var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == bind.ASNNo);
@@ -1147,7 +1147,7 @@
item.UpdateTime = time;
item.UpdateUser = userId;
qty += item.Qty;
- qty2 += item.SamplingQty == null? 0 : item.SamplingQty;
+ qty2 += item.SamplingQty == null ? 0 : item.SamplingQty;
}
Db.Updateable(boxInfos).ExecuteCommand();
@@ -1155,11 +1155,11 @@
//淇敼鎵樼洏缁戝畾淇℃伅
bind.Qty -= qty; // 鏁伴噺鍙樻洿
bind.BitPalletMark = "1"; // 闆舵墭鏍囪鍙樻洿
- if (bind.SamplingQty!= null)
+ if (bind.SamplingQty != null)
{
bind.SamplingQty -= qty2;
}
-
+
if (bind.Qty == 0)
{
//鍒ゆ柇鏄惁鏈夋寚瀹氬偍浣�
@@ -1361,7 +1361,7 @@
.AndIF(!string.IsNullOrWhiteSpace(layer), m => m.Layer == int.Parse(layer))
.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo.Contains(locateNo))
.And(m => m.IsDel == "0" && m.Status == "0" && m.Flag == "0" && m.WareHouseNo == houseNo)
- .And(m => m.AreaNo.Contains(categoryAreaNo))
+ .And(m => m.AreaNo == categoryAreaNo)
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
var total = 0;
var list = Db.Queryable<SysStorageLocat>().Where(item).OrderByDescending(a => a.Depth).OrderBy(a => a.Column)
@@ -1588,7 +1588,7 @@
{
throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
}
-
+
comDto = new OutCommandDto()
{
PalletNo = palletNo,//鎵樼洏鍙�
@@ -1607,7 +1607,7 @@
Db.Updateable(beingTask).ExecuteCommand();
}
return comDto;
-
+
}
if (haveLocate != null)
{
@@ -1661,7 +1661,7 @@
skuNo = stockDetail.First().SkuNo;
#region 鍒ゆ柇浠诲姟鏄惁宸茬粡瀛樺湪锛岃嫢瀛樺湪鐩存帴杩斿洖浠诲姟锛�
- var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
&& (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
if (beingTask != null)
{
@@ -1680,7 +1680,7 @@
if (beingTask.IsSuccess == 0)
{
beingTask.IsSuccess = 1;
- beingTask.Status = "1";
+ beingTask.Status = "1";
Db.Updateable(beingTask).ExecuteCommand();
}
@@ -1690,12 +1690,12 @@
#region 鍒ゆ柇璇ユ墭鐩橈紝鏄惁绗﹀悎鍥炲簱鍔熻兘璁惧畾鐨勫洖搴撹鍒�
//鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"
&& a.FunSetNo == "Fun041" && a.IsEnable == "NO");
if (function != null)
{
//鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
- var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"
+ var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"
&& a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
//楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
@@ -2104,13 +2104,13 @@
{
throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
}
- if (stockDetail.Count(m=>!string.IsNullOrWhiteSpace(m.LocatNo)) >0)
+ if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
{
throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
}
skuNo = stockDetail.First().SkuNo;
- var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
&& (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
if (beingTask != null)
{
@@ -2215,7 +2215,7 @@
Db.BeginTran();
try
{
-
+
if (isAddTask) // 姝ｅ父鍏ュ簱
{
var taskNo = new Common().GetMaxNo("TK");
@@ -2273,7 +2273,7 @@
Db.Updateable(oldTask).ExecuteCommand();
var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
- && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo );
+ && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo);
if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.LocatNo))
{
bindModel.TaskNo = oldTask.TaskNo;
@@ -2283,7 +2283,7 @@
Db.Updateable(bindModel).ExecuteCommand();
}
}
-
+
locate.Status = "2";
Db.Updateable(locate).ExecuteCommand();
if (palletBindList.Count >= 1)
@@ -2610,7 +2610,7 @@
// throw new Exception(e.Message);
// }
//}
-
+
#endregion
//鍏ュ簱瀹屾垚(wcs鍙嶉銆亀ms鎵嬪姩瀹屾垚)
@@ -2667,7 +2667,7 @@
item.UpdateUser = userId;
}
}
-
+
locate.Status = "1";
Db.Updateable(locate).ExecuteCommand();
Db.Updateable(stockDetail).ExecuteCommand();
@@ -2756,7 +2756,7 @@
InspectStatus = sku.IsInspect,
InspectMark = boxInfo.InspectMark,
BitBoxMark = boxInfo.BitBoxMark,
- ExpirationTime=boxInfo.ExpirationTime,
+ ExpirationTime = boxInfo.ExpirationTime,
CreateUser = 0,
CreateTime = comTime
@@ -2789,7 +2789,7 @@
Qty = item.Qty,
LockQty = 0,
FrozenQty = 0,
- IsSampling = item.InspectMark,
+ IsSampling = item.InspectMark,
IsDel = "0",
CreateUser = userId,
CreateTime = comTime
@@ -3251,7 +3251,7 @@
task.FinishDate = comTime;//瀹屾垚鏃堕棿
//鏇存柊浠诲姟淇℃伅
Db.Updateable(task).ExecuteCommand();
-
+
//鍒ゆ柇鏄惁鏄洖娴佸叆搴撳畬鎴�
if (stockDetail.Any())
{
@@ -3272,7 +3272,7 @@
Db.Updateable(locate).ExecuteCommand();
//鏇存柊搴撳瓨鏄庣粏淇℃伅
Db.Updateable(stockDetail).ExecuteCommand();
-
+
var bindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.TaskNo == taskNo && m.Status == "2").ToList();
foreach (var item in bindList)
{
@@ -3614,11 +3614,11 @@
if (!string.IsNullOrWhiteSpace(model.SkuNo) || !string.IsNullOrWhiteSpace(model.SkuName))
{
string sql = $"select Distinct Id from ArchivingArrivalNoticeDetail where IsDel='0' and SkuNo like '%{model.SkuNo}%' and SkuName like '{model.SkuName}'";
- var detailList= Db.Ado.SqlQuery<int>(sql);
-
+ var detailList = Db.Ado.SqlQuery<int>(sql);
+
strList = detailList;
}
- string strListStr= string.Join(",", strList);
+ string strListStr = string.Join(",", strList);
string sqlString = string.Empty;
string sqlCount = string.Empty;
@@ -3697,7 +3697,7 @@
item.SkuName = sku.SkuName;
}
}
-
+
return modelList;
}
catch (Exception ex)
@@ -3783,11 +3783,11 @@
sqlPub += "where tb1.IsDel = '0' ";
if (!string.IsNullOrEmpty(boxNo))
{
- sqlPub += $"AND tb1.BoxNo = '{ boxNo.Trim()}' ";
+ sqlPub += $"AND tb1.BoxNo = '{boxNo.Trim()}' ";
}
if (!string.IsNullOrEmpty(boxNo3))
{
- sqlPub += $"AND tb1.BoxNo3 = '{ boxNo3.Trim()}' ";
+ sqlPub += $"AND tb1.BoxNo3 = '{boxNo3.Trim()}' ";
}
sqlString += sqlPub;
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index a93d0a0..2b7ea82 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -1226,7 +1226,7 @@
return outDtoList;
#endregion
}
-
+
/// <summary>
/// 瑙嗚鐩樼偣
/// </summary>
@@ -1440,8 +1440,8 @@
IsFinish = 1,//鏄惁鍙畬鎴�
Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "4",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗� 4瑙嗚鐩樼偣
-
+ OrderType = "5",////0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗� 4 鍙栨牱鍑哄簱鍗� 5瑙嗚鐩樼偣
+ Msg = $"{locateNo}鐨勮瑙夌洏鐐逛换鍔�",
CreateTime = time
};
await Db.Insertable(exTask).ExecuteCommandAsync();
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index f2b8b13..f039dd7 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -5,6 +5,7 @@
using Model.ModelDto.BllCheckDto;
using Model.ModelDto.PdaDto;
using SqlSugar;
+using Utility;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -177,15 +178,15 @@
{
if (string.IsNullOrWhiteSpace(crNo))
{
- throw new Exception("鐩樼偣鍗曟嵁涓嶈兘涓虹┖");
+ throw Oops.Bah("鐩樼偣鍗曟嵁涓嶈兘涓虹┖");
}
if (string.IsNullOrWhiteSpace(crDetail))
{
- throw new Exception("鐗╂枡鎵规涓嶈兘涓虹┖");
+ throw Oops.Bah("鐗╂枡鎵规涓嶈兘涓虹┖");
}
if (string.IsNullOrWhiteSpace(palletNo))
{
- throw new Exception("鎵樼洏鐮佷笉鑳戒负绌�");
+ throw Oops.Bah("鎵樼洏鐮佷笉鑳戒负绌�");
}
//绠辩爜涓虹┖ 鏄暣鎵樿鐩樼偣鐨勯兘姝ｅ父
var detail = crDetail.Split("-");
@@ -196,7 +197,7 @@
m.IsDel == "0" && m.CRNo == crNo && m.PalletNo == palletNo && m.SkuNo == sku && m.LotNo == lotNo);
if (checkDetail == null)
{
- throw new Exception("鏈煡璇㈠埌鏈洏鐐圭殑鐩樼偣鏄庣粏淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鏈洏鐐圭殑鐩樼偣鏄庣粏淇℃伅");
}
//鐩樼偣璁板綍
var checkLog = Db.Queryable<BllStockCheckLog>().Where(m =>
@@ -216,7 +217,7 @@
if (checkLog.Count() == 0 && isContinue == "0")
{
- throw new Exception("鏈煡璇㈠埌鏈洏鐐圭殑绠辨敮淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌鏈洏鐐圭殑绠辨敮淇℃伅");
}
var list = checkLog.ToList();
@@ -232,7 +233,7 @@
l.CheckDate = time;
l.CheckUserId = userId;
- num += int.Parse(l.Qty.ToString());
+ num += Convert.ToInt32(l.Qty);
}
if (checkDetail.RealQty == null)
@@ -262,7 +263,7 @@
if (checkLog.Count() == 0 && isContinue == "0")
{
- throw new Exception("鏈煡璇㈠埌绠辨敮淇℃伅");
+ throw Oops.Bah("鏈煡璇㈠埌绠辨敮淇℃伅");
}
//
@@ -270,7 +271,7 @@
{
if (qty == null || qty <= 0)
{
- throw new Exception("鏁伴噺鐩樼偣鏃躲�佺洏浜忔暟閲忎笉鑳戒负绌轰笖闇�澶т簬0");
+ throw Oops.Bah("鏁伴噺鐩樼偣鏃躲�佺洏浜忔暟閲忎笉鑳戒负绌轰笖闇�澶т簬0");
}
}
@@ -283,7 +284,7 @@
l.CheckResult = 1;
l.CheckDate = time;
l.CheckUserId = userId;
- num -= int.Parse(l.RealQty.ToString());
+ num -= Convert.ToInt32(l.RealQty);
}
if (checkDetail.RealQty == null)
{
@@ -316,12 +317,12 @@
{
if (string.IsNullOrWhiteSpace(boxNo) || string.IsNullOrWhiteSpace(boxNo3))
{
- throw new Exception("鐩樼泩鏃剁鐮佷笌鏀爜涓嶈兘涓虹┖");
+ throw Oops.Bah("鐩樼泩鏃剁鐮佷笌鏀爜涓嶈兘涓虹┖");
}
}
if (qty == null || qty <= 0)
{
- throw new Exception("鐩樼泩鏃舵暟閲忎笉鑳戒负绌轰笖闇�澶т簬0");
+ throw Oops.Bah("鐩樼泩鏃舵暟閲忎笉鑳戒负绌轰笖闇�澶т簬0");
}
if (isContinue == "0")
{
@@ -331,7 +332,7 @@
.Count(m => m.IsDel == "0" && m.BoxNo == boxNo && m.BoxNo3 == boxNo3);
if (count > 0 || count2 > 0)
{
- throw new Exception("褰撳墠搴撳瓨涓凡瀛樺湪璇ョ鏀俊鎭�");
+ throw Oops.Bah("褰撳墠搴撳瓨涓凡瀛樺湪璇ョ鏀俊鎭�");
}
}
BllStockCheckLog crLog = new BllStockCheckLog();
@@ -395,7 +396,7 @@
else
{
Db.RollbackTran();
- throw new Exception("鐩樼偣缁撴灉涓嶇锛岃鏍稿疄锛�");
+ throw Oops.Bah("鐩樼偣缁撴灉涓嶇锛岃鏍稿疄锛�");
}
var checkLogNum = Db.Queryable<BllStockCheckLog>().Where(m => m.IsDel == "0" && m.CRNo == crNo && m.PalletNo == palletNo && m.SkuNo == sku && m.LotNo == lotNo);
if (checkLogNum.Count(m => m.CheckResult == null) == 0)
diff --git a/Wms/Wms/Controllers/BllCheckController.cs b/Wms/Wms/Controllers/BllCheckController.cs
index 5ac84ab..0954035 100644
--- a/Wms/Wms/Controllers/BllCheckController.cs
+++ b/Wms/Wms/Controllers/BllCheckController.cs
@@ -197,7 +197,7 @@
{
try
{
- var type = new List<string>() { "2", "3", "4" };
+ var type = new List<string>() { "2", "3", "4", "6" };
RefAsync<int> count = new RefAsync<int>();
var bolls = await _taskSvc.GetTaskList(type, model.Type, model.Status, model.TaskNo, model.IsSuccess, model.PalletNo, model.Msg, model.Page, model.Limit, count);
--
Gitblit v1.8.0