From e20046b65147ac087bd98214fa1aa7feed8b5f52 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期日, 04 二月 2024 15:23:32 +0800
Subject: [PATCH] 修改测出bug
---
HTML/views/ASNSetting/LabelBoxBuDa.html | 8 ++--
Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs | 7 +++
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 23 +++++++++++
Wms/Wms/Controllers/BllAsnController.cs | 19 +++++++++
HTML/views/ASNSetting/ArrivalNotice.html | 2
HTML/views/ASNSetting/LabelPrint.html | 2
HTML/views/ASNSetting/LabelPrintSelect.html | 23 +++++++++++
7 files changed, 78 insertions(+), 6 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 1b90afd..938ca98 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -1184,7 +1184,7 @@
layer.open({
type: 2,
title: '鐢熸垚鏍囩',
- content: 'LabelPrintSelect.html',
+ content: 'LabelPrintSelect.html?Id='+id,
maxmin: true,
area: ['480px', '615px'],
btn: ['纭畾','鍙栨秷'],
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index 2458c99..9ca6665 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -312,10 +312,10 @@
//$("#button").show();
$("#print2").addClass("hideCls");
- $("#LabelStream").val("");
- $("#EndBoxCode").val("");
- $("#LabelStream2").val("");
- $("#EndBoxCode2").val("");
+ // $("#LabelStream").val("");
+ // $("#EndBoxCode").val("");
+ // $("#LabelStream2").val("");
+ // $("#EndBoxCode2").val("");
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index a12a469..974caae 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -137,7 +137,7 @@
synData(IP + "/BllAsn/AddLabelBox", param , 'post', function (res) {
if (res.code == 0) { //鎴愬姛
layer.msg(res.msg, {
- icon: 2,
+ icon: 1,
time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
}, function () {
parent.location.reload();
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index 1b021e4..8e9281d 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -115,6 +115,22 @@
, format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
});
+ var id = getQueryString('Id');
+
+ var param = {
+ id: parseInt(id),
+ };
+
+ synData(IP + "/BllAsn/GetAsnDetailQtyList", param , 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ $("#arriveQty").val(res.data);
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
// form.on('select(levelFil)', function(data){
// console.log($("#type").val());
// var type = $("#type").val();
@@ -170,6 +186,13 @@
// }
// });
+ // 鑾峰彇浼犻�掑弬鏁�
+ function getQueryString(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ }
})
</script>
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 3cde474..ebbd1ce 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -124,6 +124,29 @@
throw ex;
}
}
+
+ //鑾峰彇鍏ュ簱鍗曟槑缁嗗墿浣欐墦鍗版暟閲�
+ public string GetAsnDetailQtyList(int id)
+ {
+ try
+ {
+ var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == id);
+ if (detail == null)
+ {
+ throw new Exception("鏈煡璇㈠埌鍏ュ簱鍗曟槑缁�");
+ }
+
+ var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m=>m.Qty);
+ var qty = detail.Qty-labelQty;
+
+ return qty.ToString();
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
//鑾峰彇鐗╂枡淇℃伅锛堟坊鍔犲叆搴撳崟鏄庣粏浣跨敤锛�
public List<MaterialsDto> GetMaterialsList(GetMaterialsVm model)
{
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
index 4121ac9..4429ee0 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IArrivalNoticeServer.cs
@@ -28,6 +28,13 @@
List<ArrivalNoticeDetailDto> GetArrivalNoticeDetailList(ArrivalNoticeDetailVm model, out int count);
/// <summary>
+ /// 鑾峰彇鍏ュ簱鍗曟槑缁嗗墿浣欐墦鍗版暟閲�
+ /// </summary>
+ /// <param name="id">id</param>
+ /// <returns></returns>
+ string GetAsnDetailQtyList(int id);
+
+ /// <summary>
/// 鑾峰彇鐗╂枡淇℃伅锛堟坊鍔犲叆搴撳崟鏄庣粏浣跨敤锛�
/// </summary>
/// <param name="model"></param>
diff --git a/Wms/Wms/Controllers/BllAsnController.cs b/Wms/Wms/Controllers/BllAsnController.cs
index 7d3679d..e07c1df 100644
--- a/Wms/Wms/Controllers/BllAsnController.cs
+++ b/Wms/Wms/Controllers/BllAsnController.cs
@@ -78,6 +78,25 @@
}
}
+ /// <summary>
+ /// 鑾峰彇鍏ュ簱鍗曟槑缁嗗墿浣欐墦鍗版暟閲�
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetAsnDetailQtyList(int id)
+ {
+ try
+ {
+ var models = _arrivalNoticeSvc.GetAsnDetailQtyList(id);
+
+ return Ok(new { code = 0, msg = "鍏ュ簱鍗曟槑缁嗕俊鎭�", data = models });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
[HttpPost]
public IActionResult GetMaterialsList(GetMaterialsVm model)
{
--
Gitblit v1.8.0