From 1b86f1120560fbfcad792606064a9bef15d42827 Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 02 九月 2024 08:24:34 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
Wms/Wms/Controllers/UpApiController.cs | 30 ++++
Wms/WMS.BLL/DataServer/StockInfoServer.cs | 2
Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs | 6 +
Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs | 7 +
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 56 ++++++++
Wms/WMS.BLL/DataServer/StockServer.cs | 2
Wms/Model/ModelDto/PdaDto/PdaSoDto.cs | 2
Wms/Wms/appsettings.json | 2
Pda/View/AsnSetting/productEnterQuantity.html | 68 ++++++++++
Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs | 3
Wms/Wms/Controllers/PdaSoController.cs | 13 ++
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 46 ++++++-
Pda/View/SoSetting/pingKuOut.html | 106 +++++++++++++----
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 1
14 files changed, 297 insertions(+), 47 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 7c7fc61..f72aa08 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -1273,6 +1273,68 @@
sendData(IP + "/PdaAsn/GetBindBoxInfos", param, 'post', function (res) {
BoxLevelVal = "0";
if (res.code == 0) { //鎴愬姛
+ //鍒ゆ柇鏄惁涓洪浂绠盉itBoxMark
+ if (res.data[0].BitBoxMark == '1') {
+ getFMBoxinfo();
+ } else {
+ var bl = false;
+ if (res.data.length == 0) {
+ layer.msg("鏈煡璇㈠埌姝ょ鐗╂枡淇℃伅锛岃鏍稿疄!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+
+ if (res.data[0].ASNNo != '' && res.data[0].ASNNo != null) {
+ $("#bar").empty()
+ $("#bar").append('<option value =>' + '</option>');
+ form.render('select');
+
+ $("#bar").append('<option value =' + res.data[0].ASNNo + ' selected>' + res.data[0].ASNNo + '</option>');
+
+ updateGoodList(res.data[0].SkuNo)
+ setOrderGoods();
+ } else {
+ if (asnDetails == '') {
+ layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗曟嵁!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ }
+ asnDetails.forEach(element => {
+ console.log(element);
+
+ if (element.SkuNo == res.data[0].SkuNo && element.LotNo == res.data[0].LotNo) {
+ var sel = 'dd[lay-value=' + element.id + ']';
+ $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this');
+ bl = true;
+ }
+ });
+ if (!bl) {
+ layer.msg("姝ょ鐗╂枡涓嶇鍚堣鍏ュ簱鍗曪紝璇锋牳瀹�!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ } else {
+ $("#BoxQty").val(res.data[0].Qty);
+ }
+ }
+ } else { //涓嶆垚鍔�
+ //绠辩爜涓嶅瓨鍦紝璋冪敤璧嬬爜鎺ュ彛鑾峰彇绠变俊鎭�
+ getFMBoxinfo();
+ }
+ });
+
+ }
+ function getFMBoxinfo(){
+ var param = {
+ "BoxNo": $("#BOXCODE").val(),
+ }
+ sendData(IP + "/UpApi/GetFMBindBoxInfos", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛//鏍规嵁瀵规帴鎺ュ彛瀹氫箟鍚勫瓧娈靛垽鏂潯浠�
var bl = false;
if (res.data.length == 0) {
layer.msg("鏈煡璇㈠埌姝ょ鐗╂枡淇℃伅锛岃鏍稿疄!", {
@@ -1317,15 +1379,13 @@
} else {
$("#BoxQty").val(res.data[0].Qty);
}
-
- } else { //涓嶆垚鍔�
+ } else {
layer.msg(res.msg, {
icon: 2,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
});
}
- });
-
+ })
}
diff --git a/Pda/View/SoSetting/pingKuOut.html b/Pda/View/SoSetting/pingKuOut.html
index 3f0cecb..92a28f8 100644
--- a/Pda/View/SoSetting/pingKuOut.html
+++ b/Pda/View/SoSetting/pingKuOut.html
@@ -110,19 +110,23 @@
<img src="/assets/fengexian.png">
</div>
- <div class="layout-tbl-paging" id="" style="display: none;">
+ <div class="layout-tbl-paging" id="" >
<table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
<tr>
+ <th lang>鎵樼洏鐮�</th>
<th lang>鐗╂枡鍙�</th>
<th lang>鐗╂枡鍚嶇О</th>
<th lang>鎵规鍙�</th>
+ <th lang>搴撲綅鍦板潃</th>
+
</tr>
<tr id="boxCell" style="display: none">
- <!-- <td name="PalletNo">鎵樼洏鐮�</td> -->
+ <td name="PalletNo">鎵樼洏鐮�</td>
<td name="SkuNo">鐗╂枡鍙�</td>
<td name="SkuName">鐗╂枡鍚嶇О</td>
<td name="LotNo">鎵规鍙�</td>
+ <td name="LocatNo">搴撲綅鍦板潃</td>
<!-- <td name="del">
<div id="" class="tbl-btn-del" lang>
鍒犻櫎
@@ -175,37 +179,81 @@
}
GetBoxInfo();
});
+
+ $("#selectDiv").click(function () {
+ var input = $('select[id="bar"]').next().find('.layui-select-title input')
+ var val = input.val()
+ //鍏堟洿鏂颁竴涓嬪嚭搴撳崟
+ updateBillList(function (data) {
+ $('select[id="bar"]').next().addClass('layui-form-selected')
+ $('select[id="bar"]').next().find('.layui-select-title input').val(val)
+ })
+ })
//鍒濆鍖栨覆鏌� 鍑哄簱鍗�
- function updateBillList() {
+ function updateBillList(callback) {
+ var input = $('select[id="bar"]').next().find('.layui-select-title input')
+ var val = input.val()
$("#bar").empty()
$("#bar").append('<option value =>' + '</option>');
form.render('select');
-
- var param = {
- PalletNo: $("#PalletNo").val(),
- Type: "1",
- };
- synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
- console.log(res);
-
- if (res.code == 0) { //鎴愬姛
- console.log(res.data);
- for (var i = 0; i < res.data.length; i++) {
- if (i == 0) {
- $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
- } else {
- $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ var PalletNo = $("#PalletNo").val();
+ if(PalletNo.length != 8){ //涓嬫媺妗嗚幏鍙栧钩搴撳嚭搴撳崟
+ var param = {
+ Type: "1",
+ };
+ synData(IP + "/PdaSo/GetRunNoticeList", param,'post', function (res) {
+ console.log(res);
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i]
+ +
+ '</option>');
}
- }
- form.render('select');
+ form.render('select');
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- });
- }
- });
+ if (!val) {
+ $('#bar').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
+ } else {
+ var sel = 'dd[lay-value=' + val + ']';
+ $('#bar').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ }
+
+ callback(res.data)
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ }else{//鏍规嵁鎵樼洏鍙疯幏鍙栧嚭搴撳崟
+ var param = {
+ PalletNo: $("#PalletNo").val(),
+ Type: "1",
+ };
+ synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
+ console.log(res);
+
+ if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
+ } else {
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ }
+ }
+ form.render('select');
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ }
}
//鑾峰彇鎵樼洏鐗╂枡鍚嶇粏
@@ -251,16 +299,18 @@
var arrTrs = new Array()
let idx = 0
for (var i in list) {
+ console.log("list[i].LocatN:"+list[i].LocatNo);
// list[i].BoxCode
var tr = $("#boxCell").eq(0).clone();
tr.appendTo("#tableBoxList");
// tr.attr('id', list[i].BoxCode)
idx++;
tr.attr('index', idx)
- // tr.find("td[name='PalletNo']").html(list[i].PalletNo);
+ tr.find("td[name='PalletNo']").html(list[i].PalletNo);
tr.find("td[name='SkuNo']").html(list[i].SkuNo);
tr.find("td[name='SkuName']").html(list[i].SkuName);
tr.find("td[name='LotNo']").html(list[i].LotNo);
+ tr.find("td[name='LocatNo']").html(list[i].LocatNo);
// var code = list[i].BoxCode
// //console.log("code is "+code)
diff --git a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
index 7171287..5eed2ee 100644
--- a/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
+++ b/Wms/Model/ModelDto/PdaDto/PdaSoDto.cs
@@ -18,9 +18,11 @@
{
public string BoxNo { get; set; } // 绠辩爜/鏀爜
public decimal? Qty { get; set; } // 绠卞唴鏁伴噺
+ public string PalletNo { get; set; }
public string SkuNo { get; set; } // 鐗╂枡缂栫爜
public string SkuName { get; set; } // 鐗╂枡鍚嶇О
public string LotNo { get; set; } // 鎵规
+ public string LocatNo { get; set; }
public decimal? PickedQty { get; set; } // 绠卞唴宸叉嫞鏁伴噺
}
public class DetailIdSkuLotNo
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 30adf61..0b6d63a 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -686,6 +686,7 @@
}
}
+
public List<BoxInfoDto> GetBoxInfoList(BoxInfoVm model, out int count)
{
try
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 89427b5..152ebb3 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1902,16 +1902,17 @@
BoxNo,
SkuNo,
SkuName,
- LotNo,
+ LotNo,
+ BitBoxMark,
SUM(Qty) as Qty
FROM BllBoxInfo
WHERE IsDel = '0'
AND Status='0'
AND BoxNo = '{model.BoxNo}'
- GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo; ";
+ GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
- if (models == null)
+ if (models.Count == 0 )
{
throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
}
@@ -1923,6 +1924,55 @@
throw ex;
}
}
+
+ /// <summary>
+ /// 鏍规嵁绠辩爜鍚戣拷婧郴缁熻姹傛爣绛剧鐮佷俊鎭�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public List<BoxInfoDto> GetFMBindBoxInfos(string boxno)
+ {
+ try
+ {
+ #region 绠辩爜璇锋眰鎺ュ彛锛屾寮忕郴缁熸斁寮�
+ /*var jsonData = JsonConvert.SerializeObject(boxno);
+
+ var response = HttpHelper.DoPost(url, jsonData, "绠辩爜淇℃伅璇锋眰", "FM");
+
+ var obj = JsonConvert.DeserializeObject<ErpModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ if (obj.Success != 0)
+ {
+ throw new Exception("璇锋眰澶辫触" + obj.Message);
+ }*/
+ #endregion
+ 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); // response
+
+ if (models.Count == 0)
+ {
+ throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
+ }
+
+ return models;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
// 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
public List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
{
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 5bd3412..4c54ba8 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -81,6 +81,24 @@
return allotList2;
}
+ //鑾峰彇鎵樼洏涓惈鏈夌殑鎵ц涓殑鍗曟嵁
+ public async Task<List<string>> GetRunNoticeList(string type)
+ {
+ 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();
+ return allotList;
+ }
+ //鑾峰彇鐘舵�佷负寰呮嫞璐ф垨鑰呴儴鍒嗘嫞璐х殑鍑哄簱鍗�
+ var allotList2 = await Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && (m.Status == "2" || m.Status == "3")).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToListAsync();
+
+ //var allotList = Db.Queryable<BllExportAllot>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).Select(m => m.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
+ //鑾峰彇鍑哄簱鍗曟嵁涓嶄负寰呮嫞璐� 鎵ц瀹屾瘯 璁㈠崟鍏抽棴 绛夊緟鎵ц鐨勫崟鎹�
+ //var export = Db.Queryable<BllExportNotice>().Where(a => a.IsDel == "0" && a.Status == "1" || a.Status == "2" || a.Status == "3").Select(a => a.SONo).Distinct().Where(m => !string.IsNullOrWhiteSpace(m)).ToList();
+
+ return allotList2;
+ }
+
//鑾峰彇鍑哄簱鎵樼洏涓婄殑鐗╂枡鎵规(鏍规嵁鎵樼洏鐮�)
public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(string palletNo, string soNo)
{
@@ -1176,18 +1194,34 @@
//鑾峰彇骞冲簱鎵樼洏淇℃伅
public async Task<List<BoxInfo>> GetPingKuInfoByPallet(string soNo, string palletNo)
{
- var info = Db.Queryable<BllExportAllot>().Where(m => m.SONo == soNo && m.PalletNo == palletNo && m.IsDel == "0");
+
+ var info = Db.Queryable<BllExportAllot>()
+ .LeftJoin<DataStockDetail>((a, b) => a.PalletNo == b.PalletNo)
+ .Where(a=>a.IsDel == "0" && (a.Status == "0"||a.Status =="1") && a.SONo == soNo)
+ .GroupBy((a,b) => new { a.SkuNo, a.SkuName, a.LotNo, a.PalletNo,b.LocatNo }).Select((a,b) => new BoxInfo()
+ {
+ PalletNo = a.PalletNo,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ LotNo = a.LotNo,
+ LocatNo = b.LocatNo
+ }).ToListAsync();
+ var data = await info;
+
+ /*var a = info.First().LocatNo;
+
if (await info.CountAsync() == 0)
{
throw Oops.Bah("鏈煡璇㈠埌鎵樼洏鍒嗛厤涓嬪彂鐨勪俊鎭�");
}
- var data = await info.GroupBy(m => new { m.SkuNo, m.SkuName, m.LotNo }).Select(m => new BoxInfo()
+ var data = await info.GroupBy(a => new { a.SkuNo, a.SkuName, a.LotNo,a.PalletNo }).Select(a => new BoxInfo()
{
- SkuNo = m.SkuNo,
- SkuName = m.SkuName,
- LotNo = m.LotNo
- }).ToListAsync();
+ PalletNo = a.PalletNo,
+ SkuNo = a.SkuNo,
+ SkuName = a.SkuName,
+ LotNo = a.LotNo
+ }).ToListAsync();*/
return data;
}
diff --git a/Wms/WMS.BLL/DataServer/StockInfoServer.cs b/Wms/WMS.BLL/DataServer/StockInfoServer.cs
index 2514636..b340c3a 100644
--- a/Wms/WMS.BLL/DataServer/StockInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockInfoServer.cs
@@ -382,7 +382,7 @@
//楠岃瘉鏄惁瀛樺湪閫変腑鏃堕棿 涓嶅瓨鍦ㄥ垯璧嬪�间粖鏃ユ椂闂�
if (string.IsNullOrEmpty(StartDate))
{
- StartDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ff");
+ StartDate = DateTime.Now.ToString("yyyy-MM-dd");
}
//鏍规嵁鏃堕棿鑾峰彇瀵瑰簲鏃ユ湡鐨勫簱瀛樹俊鎭�
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index bf573df..65e4416 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -581,7 +581,7 @@
try
{
string str = "select* from SysMaterials where SkuNo in (select a.SkuNo from BllArrivalNoticeDetail a " +
- "inner join BllExportNoticeDetail b on a.SkuNo = b.SkuNo";
+ "left join BllExportNoticeDetail b on a.SkuNo = b.SkuNo";
//鍒ゆ柇寮�濮嬫椂闂存槸鍚︿负绌�
if (!string.IsNullOrWhiteSpace(StartTime))
diff --git a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
index 0718c18..0c8a94d 100644
--- a/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
+++ b/Wms/WMS.Entity/BllSoEntity/BllExportAllot.cs
@@ -54,6 +54,12 @@
/// Nullable:True
/// </summary>
public string LotNo {get;set;}
+ /// <summary>
+ /// Desc:鍌ㄤ綅鍦板潃
+ /// Default:
+ /// Nullable:True
+ /// </summary>
+ public string LocatNo { get; set; }
/// <summary>
/// Desc:鎵规鎻忚堪
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
index 702e76c..e826d99 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -112,6 +112,9 @@
//骞冲簱纭鍏ュ簱
void ConfirmInStock(PalletBindVm model);
+ //鏍规嵁绠辩爜鍚戣拷婧郴缁熻姹傜淇℃伅
+ List<BoxInfoDto> GetFMBindBoxInfos(string boxno);
+
#region JC23鍙栨牱涓氬姟鎺ュ彛
/// <summary>
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
index 7d2dfe1..7d5b452 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaSoServer.cs
@@ -26,6 +26,13 @@
Task<List<string>> GetRunSoNoticeList(string palletNo, string type);
/// <summary>
+ /// 鑾峰彇鎵ц涓殑鍑哄簱鍗�
+ /// </summary>
+ /// <param name="type">绫诲瀷 鍖哄垎鏄惁鏄钩搴撳嚭搴撹幏鍙栧崟鎹�</param>
+ /// <returns></returns>
+ Task<List<string>> GetRunNoticeList(string type);
+
+ /// <summary>
/// 鑾峰彇鍑哄簱鎵樼洏涓婄殑鐗╂枡鎵规(鏍规嵁鎵樼洏鐮�)
/// </summary>
/// <param name="palletNo">鎵樼洏鐮�</param>
diff --git a/Wms/Wms/Controllers/PdaSoController.cs b/Wms/Wms/Controllers/PdaSoController.cs
index 3c63851..3702a21 100644
--- a/Wms/Wms/Controllers/PdaSoController.cs
+++ b/Wms/Wms/Controllers/PdaSoController.cs
@@ -48,7 +48,7 @@
}
/// <summary>
- /// 鑾峰彇鍗曟嵁鍒楄〃
+ /// 鏍规嵁鎵樼洏鍙疯幏鍙栧崟鎹垪琛�
/// </summary>
/// <param name="model">PalletNo:鎵樼洏鍙�</param>
/// <returns></returns>
@@ -59,6 +59,17 @@
}
/// <summary>
+ /// 鑾峰彇PDA骞冲簱鍑哄簱鍗曟嵁鍒楄〃
+ /// </summary>
+ /// <param name="type"></param>
+ /// <returns></returns>
+ [HttpPost]
+ public async Task<List<string>> GetRunNoticeList(PdaSoVm model)
+ {
+ return await _pdaSoSvc.GetRunNoticeList(model.Type);
+ }
+
+ /// <summary>
/// 鑾峰彇鐗╂枡-鎵规淇℃伅
/// </summary>
/// <param name="model">PalletNo:鎵樼洏鐮併�丼oNo:鍗曟嵁鍙�</param>
diff --git a/Wms/Wms/Controllers/UpApiController.cs b/Wms/Wms/Controllers/UpApiController.cs
index b966b0b..eefb118 100644
--- a/Wms/Wms/Controllers/UpApiController.cs
+++ b/Wms/Wms/Controllers/UpApiController.cs
@@ -22,6 +22,8 @@
using Newtonsoft.Json.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
+using WMS.BLL.BllPdaServer;
+using WMS.IBLL.IPdaServer;
namespace Wms.Controllers
{
@@ -38,13 +40,15 @@
private readonly IArrivalNoticeServer _arrivalNoticeSvc;
private readonly IStockCheckServer _stockCheckSvc;//鐩樼偣鍗昐vc
private readonly IProcurePlanServer _procurePlanSvc;//閲囪喘鍗昐vs
- public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc)
+ private readonly IPdaAsnServer _pdaAsnServer;// PDA
+ public UpApiController(IOptions<ApiUrlConfig> setting, IExportNoticeServer exNoticeSvc, IArrivalNoticeServer arrivalNoticeServer, IStockCheckServer stockCheckSvc, IProcurePlanServer procurePlanSvc, IPdaAsnServer pdaAsnServer)
{
_config = setting.Value;
_exNoticeSvc = exNoticeSvc;
_arrivalNoticeSvc = arrivalNoticeServer;
_stockCheckSvc = stockCheckSvc;
_procurePlanSvc = procurePlanSvc;
+ _pdaAsnServer = pdaAsnServer;
}
#endregion
@@ -249,8 +253,30 @@
}
}
- //绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (鎵鐮佸悜杩芥函瑕佷俊鎭�)
+ //
+ /// <summary>
+ /// 绠辩爜淇℃伅 鎵嬫寔缁勬墭鐢� (鎵鐮佸悜杩芥函瑕佷俊鎭�)
+ /// </summary>
+ /// <param name="model">BoxNo:绠卞彿</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult GetFMBindBoxInfos(string BoxNo)
+ {
+ try
+ {
+ if (string.IsNullOrWhiteSpace(BoxNo))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠璇锋眰绠辩爜淇℃伅" });
+ }
+ var models = _pdaAsnServer.GetFMBindBoxInfos(BoxNo);
+ return Ok(new { code = 0, msg = "鏍囩绠辩爜淇℃伅", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
#endregion
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 72dd5a9..b1357b1 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -47,7 +47,7 @@
},
"Quartz": {
"dbProviderName": "SqlServer",
- "connectionString": "Server=.;Database=QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
+ "connectionString": "Server=192.168.62.200;Database=QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
}
--
Gitblit v1.8.0