From 78279bd340545f8c07d1ff08764bd859ba404c83 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 19 十二月 2024 10:42:23 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 58 ++++++--
Wms/WMS.BLL/DataServer/StockDetailServer.cs | 153 ++++---------------------
Wms/Wms/Controllers/StatisticalController.cs | 4
HTML/views/StatisticalReport/BoxInfor.html | 122 ++++++++++++++------
Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs | 2
5 files changed, 155 insertions(+), 184 deletions(-)
diff --git a/HTML/views/StatisticalReport/BoxInfor.html b/HTML/views/StatisticalReport/BoxInfor.html
index 5dde6a5..4901114 100644
--- a/HTML/views/StatisticalReport/BoxInfor.html
+++ b/HTML/views/StatisticalReport/BoxInfor.html
@@ -32,7 +32,7 @@
<div class="layui-card">
<div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item" style="margin-bottom: 0px;">
- <div class="layui-inline zongdan" >
+ <!-- <div class="layui-inline zongdan" >
<label class="layui-form-label" style="width: 60px;">鐗╂枡缂栫爜</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="SkuNo" name="SkuNo" placeholder="鐗╂枡缂栫爜" autocomplete="off" class="layui-input">
@@ -43,9 +43,31 @@
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="SkuName" name="SkuName" placeholder="鐗╂枡鍚嶇О" autocomplete="off" class="layui-input">
</div>
+ </div> -->
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炰粨搴�</label>
+ <div class="layui-input-inline">
+ <select name="WareHouseNo" id="WareHouseNo" lay-filter="getWareHouseNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 60px;">鎵�灞炲尯鍩�</label>
+ <div class="layui-input-inline">
+ <select name="AreaNo" id="AreaNo" lay-filter="getAreaNo" lay-search>
+ <option value=""></option>
+ </select>
+ </div>
</div>
<div class="layui-inline zongdan" >
- <label class="layui-form-label" style="width: 60px;">鎵樼洏鍙�</label>
+ <label class="layui-form-label" style="width: 60px;">鍌ㄤ綅鍦板潃</label>
+ <div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
+ <input type="text" id="LocatNo" name="LocatNo" placeholder="鍌ㄤ綅鍦板潃" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline zongdan" >
+ <label class="layui-form-label" style="width: 60px;">妗跺彿</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<input type="text" id="PalletNo" name="PalletNo" placeholder="妗跺彿" autocomplete="off" class="layui-input">
</div>
@@ -124,19 +146,19 @@
</select>
</div>
</div> -->
- <div class="layui-inline zhijian">
+ <!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">璐ㄦ鐘舵��</label>
<div class="layui-input-inline" style="width: 170px; margin-right: 0px;">
<select name="InspectStatus" id="InspectStatus" lay-filter="InspectStatus"
lay-search>
<option value=""></option>
- <option value="0">寰呰川妫�</option><!-- 寰呮楠� -->
- <option value="1">妫�楠屽悎鏍�</option><!-- 鍚堟牸鍝� -->
- <option value="2">涓嶅悎鏍�</option><!-- 涓嶅悎鏍� -->
- <option value="3">鏀剧疆鏈�</option><!-- 涓嶅悎鏍� -->
+ <option value="0">寰呰川妫�</option>
+ <option value="1">妫�楠屽悎鏍�</option>
+ <option value="2">涓嶅悎鏍�</option>
+ <option value="3">鏀剧疆鏈�</option>
</select>
</div>
- </div>
+ </div> -->
<!-- <div class="layui-inline zhijian">
<label class="layui-form-label" style="width: 60px;">寮�濮嬫椂闂�</label>
@@ -394,7 +416,7 @@
var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
//鑾峰彇鎵樼洏鏄庣粏
- function refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime) {
+ function refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo) {
//#region 鑷畾涔夎〃澶�
var colsJson
var param1={
@@ -429,20 +451,12 @@
};
var param = {
- SkuNo:SkuNo, //鐗╂枡鍙�
- SkuName:SkuName, //鐗╂枡鍚嶇О
+ wareHouseName:WareHouseName,
+ areaName:AreaName,
+ locatNo:LocatNo,
palletNo:PalletNo, //鎵樼洏鍙�
LotNo:LotNo, //鎵规鍙�
- BoxNo:BoxNo, //绠辩爜
- Status:Status, //绠辨敮鐘舵��
- InspectMark:InspectMark, //妫�楠屾爣璁�
- BitPalletMark:BitPalletMark, //闆舵墭鏍囪
- BitBoxMark:BitBoxMark, //闆剁鏍囪
- InspectStatus:InspectStatus, //璐ㄩ噺鐘舵��
- OwnerNo:OwnerNo, //璐т富缂栫爜
- OwnerName:OwnerName, //璐т富鍚嶇О
- StartTime:StartTime, //寮�濮嬫椂闂�
- EndTime:EndTime, //缁撴潫鏃堕棿
+
};
sendData(IP + "/Statistical/GetBindList", param, 'get', function(res) {
console.log(res)
@@ -525,28 +539,60 @@
});
}
});
+ //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#WareHouseNo").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+
+ getAR("");
+ form.on('select(getWareHouseNo)', function(data) {
+ getAR(data.value);
+ });
+ function getAR(val) {
+ //鑾峰彇 鍖哄煙涓嬫媺妗�
+ sendData(IP + "/Sys/GetStorageAreaByHouseNo?wareHouseNo="+val, {}, 'get', function(res) {
+ $("#AreaNo").empty();
+ $("#AreaNo").append('<option value =""></option>');
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#AreaNo").append('<option value =' + res.data[i].AreaNo + '>' + res.data[i].AreaNo + '-' +
+ res.data[i].AreaName + '</option>');
+ }
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg('鑾峰彇鍖哄煙淇℃伅澶辫触', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {
+ //鍥炶皟
+ form.render('select');
+ });
+ }
+ });
+
+ };
//鐩戝惉鎼滅储
form.on('submit(LAY-app-contlist-search)', function(data) {
- var SkuNo = $("#SkuNo").val();
- var SkuName = $("#SkuName").val();
- var LotNo = $("#LotNo").val();
+
+ var WareHouseName = $("#WareHouseNo").val();
+ var AreaName = $("#AreaNo").val();
+ var LocatNo = $("#LocatNo").val();
var PalletNo = $("#PalletNo").val();
+ var LotNo = $("#LotNo").val();
- var BoxNo = $("#BoxNo").val();
- var Status = $("#Status").val();
- var InspectMark = $("#InspectMark").val();
- var BitPalletMark = $("#BitPalletMark").val();
- var BitBoxMark = $("#BitBoxMark").val();
- var InspectStatus = $("#InspectStatus").val();
-
- var OwnerNo = $("#OwnerNo").val();
- var OwnerName = $("#OwnerName").val();
-
- var StartTime = $("#StartTime").val();
- var EndTime = $("#EndTime").val();
-
- refreshTable(SkuNo,SkuName,PalletNo,LotNo,BoxNo,Status,InspectMark,BitPalletMark,BitBoxMark,InspectStatus,OwnerNo,OwnerName,StartTime,EndTime);
+ refreshTable(WareHouseName,AreaName,LocatNo,PalletNo,LotNo);
});
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 270b6ef..afa76e9 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -373,8 +373,9 @@
{
case "3"://娓呮礂璁惧鐢宠鍌ㄤ綅锛堝噣妗剁敵璇峰偍浣嶏級
//鏌ユ壘鍒拌杞﹂棿鍑�妗跺尯
- List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "0" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
+ //List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "0" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ //loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
+ loction = GetLocatModel(houseNo, "0");
if (loction == null)
{
throw new Exception("璇ヨ溅闂村噣妗跺尯鏆傛棤绌轰綑鍌ㄤ綅");
@@ -389,8 +390,9 @@
throw new Exception("鎵规鍙蜂负绌猴紒");
}
//鏌ユ壘鍒拌杞﹂棿棰勬贩鍖�
- List<string> areaNoList2 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "1" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList2.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
+ //List<string> areaNoList2 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "1" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ //loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList2.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
+ loction = GetLocatModel(houseNo, "1");
if (loction == null)
{
throw new Exception("璇ヨ溅闂撮娣峰尯鏆傛棤绌轰綑鍌ㄤ綅");
@@ -425,8 +427,9 @@
Db.Updateable(notice).ExecuteCommand();
//鏌ユ壘鍒拌杞﹂棿鍗婃垚鍝佸尯
- List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList3.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
+ //List<string> areaNoList3 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "2" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ //loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList3.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
+ loction = GetLocatModel(houseNo, "2");
if (loction == null)
{
throw new Exception("璇ヨ溅闂村崐鎴愬搧鍖烘殏鏃犵┖浣欏偍浣�");
@@ -436,8 +439,9 @@
break;
case "2"://涓嬫枡璁惧鐢宠鍌ㄤ綅锛堣剰妗剁敵璇峰偍浣嶏級
//鏌ユ壘鍒拌杞﹂棿鑴忔《鍖�
- List<string> areaNoList4 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "3" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
- loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList4.Contains(w.AreaNo)).OrderByDescending(o => o.CreateTime).First();
+ //List<string> areaNoList4 = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == "3" && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ //loction = storageLocat.Where(w => w.WareHouseNo == houseNo && areaNoList4.Contains(w.AreaNo) && w.Status == "0" && w.Flag == "0").OrderByDescending(o => o.CreateTime).First();
+ loction = GetLocatModel(houseNo, "3");
if (loction == null)
{
throw new Exception("璇ヨ溅闂磋剰妗跺尯鏆傛棤绌轰綑鍌ㄤ綅");
@@ -508,6 +512,33 @@
{
//鍥炴粴浜嬪姟
Db.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鑾峰彇绌哄偍浣�
+ /// </summary>
+ /// <param name="houseNo">杞﹂棿缂栧彿</param>
+ /// <param name="Type">绫诲埆 0:鍑�妗跺尯 1:棰勬贩鍖� 2:鍗婃垚鍝佸尯 3:鑴忔《鍖�</param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ private SysStorageLocat GetLocatModel(string houseNo,string type)
+ {
+ try
+ {
+ //閫氳繃绫诲埆鏌ユ壘杞﹂棿鍖哄煙
+ List<string> areaNoList = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Type == type && w.WareHouseNo == houseNo).Select(s => s.AreaNo).ToList();
+ //鏌ユ壘鍌ㄤ綅
+ var loctionModel = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.WareHouseNo == houseNo && areaNoList.Contains(w.AreaNo))
+ .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
+ if (loctionModel == null)
+ {
+ throw new Exception("璇ヨ溅闂村噣妗跺尯鏆傛棤绌轰綑鍌ㄤ綅");
+ }
+ return loctionModel;
+ }
+ catch (Exception ex)
+ {
throw new Exception(ex.Message);
}
}
@@ -943,8 +974,6 @@
bool result = false;
#region 鍛煎彨灏忚溅浠ｇ爜
- List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
-
List<PositionCodePath> pahtList = new List<PositionCodePath>();
//璧峰浣嶇疆
PositionCodePath path1 = new PositionCodePath();
@@ -977,7 +1006,7 @@
agvTask.reqCode = taskDetial.Taskno;//璇锋眰缂栧彿
agvTask.taskCode = taskDetial.Taskno;//浠诲姟鍙�
agvTask.ctnrCode = taskDetial.Pallno;//妗跺彿
- agvTask.ctnrTyp = "1";
+ agvTask.ctnrTyp = "1";// 1:妗� 3锛氭墭鐩�
agvTask.reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");//璇锋眰鏃堕棿
agvTask.wbCode = "";
agvTask.positionCodePath = pahtList;//灏忚溅璺緞
@@ -991,14 +1020,9 @@
{
agvTask.taskTyp = "Z4";//浠诲姟绫诲瀷 绾胯竟鍒版墭鐩樻敹闆嗗櫒 Z1锛� 鎵樼洏鍨涚敵璇峰叆搴� Z2
}
- agvTaskList.Add(agvTask);
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
- var list2 = agvTaskList.Select(m => m.reqCode).ToList();
- var jsonData = JsonConvert.SerializeObject(agvTaskList);
- jsonData = jsonData.Substring(1);
- jsonData = jsonData.Substring(0, jsonData.Length - 1);
-
+ var jsonData = JsonConvert.SerializeObject(agvTask);
string response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
//瑙ｆ瀽杩斿洖鏁版嵁
var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
diff --git a/Wms/WMS.BLL/DataServer/StockDetailServer.cs b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
index 9d629d2..f2f2563 100644
--- a/Wms/WMS.BLL/DataServer/StockDetailServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockDetailServer.cs
@@ -38,146 +38,47 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- public List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTime)
+ public List<StockDetailDto> GetBindList(string wareHouseName, string areaName, string locatNo, string palletNo, string lotNo)
{
- string str = "select detail.*,house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,area.AreaNo + '-' + area.AreaName as AreaName from DataStockDetail detail left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo left join SysStorageArea area on detail.AreaNo = area.AreaNo where detail.IsDel = @isdel";
- //鍒ゆ柇鐗╂枡鍙锋槸鍚︿负绌�
- if (!string.IsNullOrEmpty(skuNo))
+ string str = $@"select
+ detail.*,
+ house.WareHouseNo + '-' + house.WareHouseName as WareHouseName,
+ roadway.RoadwayNo + '-' + roadway.RoadwayName as RoadwayName,
+ area.AreaNo + '-' + area.AreaName as AreaName
+ from DataStockDetail detail
+ left join SysStorageRoadway roadway on detail.RoadwayNo = roadway.RoadwayNo
+ left join SysWareHouse house on detail.WareHouseNo = house.WareHouseNo
+ left join SysStorageArea area on detail.AreaNo = area.AreaNo
+ where detail.IsDel = '0'";
+
+ //鍒ゆ柇鎵�灞炰粨搴撴槸鍚︿负绌�
+ if (!string.IsNullOrEmpty(wareHouseName))
{
- str += " and detail.SkuNo like @skuno";
+ str += $" and (house.WareHouseNo like '%{wareHouseName}%' or house.WareHouseName like '%{wareHouseName}%')";
}
- //鍒ゆ柇鐗╂枡鍚嶇О鏄惁涓虹┖
- if (!string.IsNullOrEmpty(skuName))
+ //鍒ゆ柇鎵�灞炲尯鍩熸槸鍚︿负绌�
+ if (!string.IsNullOrEmpty(areaName))
{
- str += " and detail.SkuName like @skuname";
+ str += $" and (area.AreaNo like '%{areaName}%' or area.AreaName like '%{areaName}%')";
+ }
+ //鍒ゆ柇鎵�灞炲偍浣嶆槸鍚︿负绌�
+ if (!string.IsNullOrEmpty(locatNo))
+ {
+ str += $" and detail.LocatNo like '%{locatNo}%'";
}
//鍒ゆ柇鎵樼洏鍙锋槸鍚︿负绌�
if (!string.IsNullOrEmpty(palletNo))
{
- str += " and detail.PalletNo like @palletno";
+ str += $" and detail.PalletNo like '%{palletNo}%'";
}
//鍒ゆ柇鎵规鏄惁涓虹┖
if (!string.IsNullOrEmpty(lotNo))
{
- str += " and detail.LotNo like @lotno";
+ str += $" and detail.LotNo like '%{lotNo}%'";
}
- //鍒ゆ柇闆舵墭鏍囪鏄惁涓虹┖
- if (!string.IsNullOrEmpty(bitPalletMark))
- {
- str += " and detail.BitPalletMark = @bitpalletmark";
- }
- //鍒ゆ柇璐т富缂栫爜鏄惁涓虹┖
- if (!string.IsNullOrEmpty(ownerNo))
- {
- str += " and detail.OwnerNo like @ownerNo";
- }
- //鍒ゆ柇璐т富鍚嶇О鏄惁涓虹┖
- if (!string.IsNullOrEmpty(ownerName))
- {
- str += " and detail.OwnerName like @ownerName";
- }
- if (!string.IsNullOrEmpty(startTime))
- {
- str += $" and detail.CompleteTime >= '{startTime}'";
- }
- if (!string.IsNullOrEmpty(endTime))
- {
- endTime = Convert.ToDateTime(endTime).AddDays(1).ToString();
- str += $" and detail.CompleteTime < '{endTime}'";
- }
-
- int i = 0;
- //鍦ㄧ鐮佹槑缁嗕腑鑾峰彇鐩稿簲鏁版嵁
- string boxstr = "select StockDetailId from DataBoxInfo Where IsDel = @isdel";
- //鍒ゆ柇绠辩爜鏄惁涓虹┖
- if (!string.IsNullOrEmpty(boxNo))
- {
- boxstr += " and BoxNo like @boxno";
- i = 1;
- }
- //鍒ゆ柇绠辨敮鐘舵�佹槸鍚︿负绌�
- if (!string.IsNullOrEmpty(status))
- {
- boxstr += " and Status = @status";
- i = 1;
- }
- //鍒ゆ柇妫�楠屾爣璁版槸鍚︿负绌�
- if (!string.IsNullOrEmpty(inspectMark))
- {
- boxstr += " and InspectMark = @inspectmark";
- str += " and detail.InspectMark = @inspectmark";
- i = 1;
- }
- //鍒ゆ柇闆剁鏍囪鏄惁涓虹┖
- if (!string.IsNullOrEmpty(bitBoxMark))
- {
- boxstr += " and BitBoxMark = @bitboxmark";
- i = 1;
- }
- //鍒ゆ柇璐ㄩ噺鐘舵�佹槸鍚︿负绌�
- if (!string.IsNullOrEmpty(inspectStatus))
- {
- boxstr += " and InspectStatus = @inspectstatus";
- str += " and detail.InspectStatus = @inspectstatus";
- i = 1;
- }
- //灏嗙鐮佹暟鎹繘琛屾帓搴�
- boxstr += " order by StockDetailId";
- //鏌ュ嚭绠辩爜鏄庣粏涓俊鎭�
- List<int> stockDetailId = Db.Ado.SqlQuery<int>(boxstr, new
- {
- isdel = "0", //鏄惁鍒犻櫎
- boxno = "%" + boxNo + "%", //绠辩爜
- status, //绠辨敮鐘舵��
- inspectmark = inspectMark, //妫�楠屾爣璁�
- bitboxmark = bitBoxMark, //闆剁鏍囪
- inspectstatus = inspectStatus //璐ㄩ噺鐘舵��
- });
- //鍘婚噸
- // List<int> newArr = null;
- string arr = "";
- //鍒ゆ柇鏄惁鏈夋煡绠辩爜淇℃伅
- if (i == 1)
- {
- if (stockDetailId.Count > 0)
- {
- //鍘婚噸
- arr += stockDetailId[0].ToString();
-
- for (int a = 1; a < stockDetailId.Count; a++)
- {
- if (stockDetailId[a] != stockDetailId[a - 1])
- {
- arr += ',' + stockDetailId[a].ToString();
- }
- }
- }
- if (!string.IsNullOrEmpty(arr))
- {
- str += $" and Id in ({arr})";
- }
- else
- {
- str += " and Id = ''";
- }
- }
-
//鎺掑簭
- str += " order by PalletNo,SkuNo,LotNo";
- List<StockDetailDto> boxInforList = Db.Ado.SqlQuery<StockDetailDto>(str, new
- {
- isdel = "0", //鏄惁鍒犻櫎
- skuno = "%" + skuNo + "%", //鐗╂枡鍙�
- skuname = "%" + skuName + "%", //鐗╂枡鍚嶇О
- palletno = "%" + palletNo + "%", //鎵樼洏
- lotno = "%" + lotNo + "%", //鎵规鍙�
- bitpalletmark = bitPalletMark, //闆舵墭鏍囪
- inspectmark = inspectMark, //妫�楠屾爣璁�
- inspectstatus = inspectStatus, //璐ㄩ噺鐘舵��
- ownerNo = "%" + ownerNo + "%", //璐т富缂栫爜
- ownerName = "%" + ownerName + "%" //璐т富鍚嶇О
- //stockdetailid = "(" + arr + ")" //搴撳瓨鏄庣粏id
- });
+ str += " order by PalletNo";
+ List<StockDetailDto> boxInforList = Db.Ado.SqlQuery<StockDetailDto>(str).ToList();
return boxInforList;
}
diff --git a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
index 5ba9db4..f708f20 100644
--- a/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
+++ b/Wms/WMS.IBLL/IDataServer/IStockDetailServer.cs
@@ -23,7 +23,7 @@
/// <param name="bitBoxMark">闆剁鏍囪</param>
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
- List<StockDetailDto> GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName, string startTime, string endTIme);
+ List<StockDetailDto> GetBindList(string wareHouseName, string areaName, string locatNo, string palletNo, string lotNo);
/// <summary>
/// 瀵煎嚭鎵樼洏鏄庣粏
diff --git a/Wms/Wms/Controllers/StatisticalController.cs b/Wms/Wms/Controllers/StatisticalController.cs
index 02a57a7..484963d 100644
--- a/Wms/Wms/Controllers/StatisticalController.cs
+++ b/Wms/Wms/Controllers/StatisticalController.cs
@@ -98,11 +98,11 @@
/// <param name="inspectStatus">璐ㄩ噺鐘舵��</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetBindList(string skuNo, string skuName, string palletNo, string lotNo, string boxNo, string status, string inspectMark, string bitPalletMark, string bitBoxMark, string inspectStatus, string ownerNo, string ownerName,string startTime,string endTIme)
+ public IActionResult GetBindList(string wareHouseName,string areaName,string locatNo,string palletNo, string lotNo)
{
try
{
- List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(skuNo, skuName, palletNo, lotNo, boxNo, status, inspectMark, bitPalletMark, bitBoxMark, inspectStatus, ownerNo, ownerName, startTime, endTIme);
+ List<StockDetailDto> boxInfoList = _stockDetail.GetBindList(wareHouseName,areaName,locatNo,palletNo, lotNo);
return Ok(new { data = boxInfoList, code = 0, msg = "鑾峰彇鎵樼洏鏄庣粏鎴愬姛" });
}
catch (Exception e)
--
Gitblit v1.8.0