From 0aa8ecb1d414407a05beb54e7e0021d584c7e13a Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 29 八月 2024 18:52:11 +0800
Subject: [PATCH] 修改问题
---
Pda/View/AsnSetting/productEnterQuantity.html | 13 +++++--------
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 2 +-
Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs | 2 +-
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 25 +++++++++++++++++++++----
4 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/Pda/View/AsnSetting/productEnterQuantity.html b/Pda/View/AsnSetting/productEnterQuantity.html
index 223ec3a..01e96c1 100644
--- a/Pda/View/AsnSetting/productEnterQuantity.html
+++ b/Pda/View/AsnSetting/productEnterQuantity.html
@@ -586,14 +586,12 @@
form.render('select');
var param = {
- Type: "0,1,3"
+ Type: "0"
};
sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#bar").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
- .ASNNo +
- '</option>');
+ $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
}
form.render('select');
@@ -621,14 +619,13 @@
form.render('select');
var param = {
- Type: "1,2,3,4,5,6,7"
+ Type: "1"
};
sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
for (var i = 0; i < res.data.length; i++) {
- $("#bar1").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
- .ASNNo +
- '</option>');
+ $("#bar1").append('<option value =' + res.data[i] + '>' + res.data[i] +'</option>');
}
form.render('select');
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index 5020166..a23c682 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -202,7 +202,7 @@
}
Expression<Func<SysMaterials, bool>> item = Expressionable.Create<SysMaterials>()
- .AndIF(model.Type != "7", it => skuType.Contains(it.Type))
+ .AndIF(model.Type != "7", it => skuType.Contains(it.Type) && it.SkuNo != "100088")
.AndIF(model.Type == "7", it => it.SkuNo == "100088")
.AndIF(IsPack == 1, it => it.PackagNo != "")
.AndIF(IsPack == 2, it => it.PackagNo == "")
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 71607ea..2aa3b61 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -30,16 +30,33 @@
private static readonly SqlSugarScope Db = DataContext.Db;
// 鑾峰彇鍗曟嵁鍒楄〃
- public List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model)
+ public List<string> GetArrivalNotices(ArrivalNoticeVm model)
{
string sqlString = string.Empty;
try
{
// 鏈叧鍗曠殑鍗曟嵁
- sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and Status != '4' and IsDel='0' order by CreateTime;";
- var modelList = Db.Ado.SqlQuery<ArrivalNoticeDto>(sqlString);
+ //sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and Status != '4' and IsDel='0' order by CreateTime;";
+ //var modelList = Db.Ado.SqlQuery<ArrivalNoticeDto>(sqlString);
- return modelList;
+ //model.Type锛氬崟鎹被鍨� 鍦ㄨ繖閲屼唬琛ㄥ墠绔〉绛剧被鍨嬶細鍗虫爣绛鹃〉绛撅細璐存爣鐗╂枡锛� 鏁伴噺椤电锛氫笉璐磋〃鐗╂枡锛屽師鍥狅細鎳掑緱鍔犲弬鏁�
+ var data = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.Status != "3" && m.Status != "4").Select(m=>m.ASNNo).ToList();
+ var list = new List<string>();
+ if (model.Type == "0")//0璐存爣
+ {
+ list = Db.Queryable<BllArrivalNoticeDetail>().Where(m =>m.IsDel == "0" && data.Contains(m.ASNNo) && !string.IsNullOrWhiteSpace(m.PackagNo)).Select(m => m.ASNNo).Distinct().ToList();
+ }
+ else if(model.Type == "1")//1涓嶈创鏍�
+ {
+ list = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && data.Contains(m.ASNNo) && string.IsNullOrWhiteSpace(m.PackagNo)).Select(m=>m.ASNNo).Distinct().ToList();
+ }
+ else
+ {
+ throw new Exception("椤电绫诲瀷鍙傛暟閿欒");
+ }
+
+
+ return list;
}
catch (Exception ex)
{
diff --git a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
index d5b06b0..c3b18fd 100644
--- a/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
+++ b/Wms/WMS.IBLL/IPdaServer/IPdaAsnServer.cs
@@ -12,7 +12,7 @@
public interface IPdaAsnServer
{
// 鑾峰彇鍗曟嵁鍒楄〃
- List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model);
+ List<string> GetArrivalNotices(ArrivalNoticeVm model);
// 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
List<ArrivalNoticeDetailDto> GetArrivalNoticeDetails(ArrivalNoticeVm model);
--
Gitblit v1.8.0