From 78151cd9506cf730fee6f6d92b641774f0440c36 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 12 七月 2024 16:47:47 +0800
Subject: [PATCH] 出库单据页面接口方法更改，按照业务流程修改出库单据类型
---
HTML/views/SOSetting/ExportNoticeEditFrom.html | 26 +-------
HTML/views/SOSetting/ExportNoticeAddFrom.html | 25 +-------
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 29 ++++-----
Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs | 17 +++--
Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs | 4 +
Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs | 5 +
Wms/Wms/Controllers/BllSoController.cs | 34 ++++------
HTML/views/SOSetting/ExportNotice.html | 29 ++-------
8 files changed, 56 insertions(+), 113 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index b01f45e..0568bea 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -62,33 +62,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-search>
<option value=""></option>
- <!-- 23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
- <option value="1">闈炴爣閿�鍞嚭搴�</option>
- <option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
+ <option value="5">涓棿鍝佸嚭搴�</option>
+ <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
+ <option value="9">閲囪喘閫�璐у嚭搴�</option>
</select>
</div>
</div>
@@ -228,6 +209,8 @@
return "鍏朵粬鍑哄簱";
case "8":
return "瀵勫瓨鍑哄簱";
+ case "9":
+ return "閲囪喘閫�璐у嚭搴�";
default:
return "";
}
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 0a0b1f1..95df954 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -33,33 +33,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-verify="required" lay-search>
<!-- <option value=""></option> -->
- <!-- 23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鏍囧噯閿�鍞嚭搴�</option>
- <option value="1">闈炴爣閿�鍞嚭搴�</option>
- <option value="2">鏍囧噯璋冩嫧鍑哄簱</option>
- <option value="3">闈炴爣璋冩嫧鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
+ <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
+ <option value="9">閲囪喘閫�璐у嚭搴�</option>
</select>
</div>
</div>
diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index b6dc461..73e2f4d 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -26,34 +26,14 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-filter="Type" lay-verify="required" disabled lay-search>
<option value=""></option>
- <!-- 23 -->
+ <!--JC26-->
<option value="0">鎴愬搧鍑哄簱</option>
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <!-- 24 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">棰嗘枡鍑哄簱</option>
- <option value="2">鎶芥鍑哄簱</option>
- <option value="3">鐗╂枡鍙栨牱鍑哄簱</option>
- <option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
<option value="5">涓棿鍝佸嚭搴�</option>
- <option value="6">浠ｅ偍鍑哄簱</option>
- <option value="7">鍏朵粬鍑哄簱</option>
- <option value="8">瀵勫瓨鍑哄簱</option> -->
- <!-- 09 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熸枡鍑哄簱</option>
- <option value="2">鎴愬搧涓嶅悎鏍煎嚭搴�</option>
- <option value="3">鍘熸枡涓嶅悎鏍煎嚭搴�</option>
- <option value="4">璐ㄦ鍑哄簱</option> -->
- <!-- 08 -->
- <!-- <option value="0">鎴愬搧鍑哄簱</option>
- <option value="1">鍘熻緟鏂欏嚭搴�</option>
- <option value="2">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="3">鍙栨牱鍑哄簱</option> -->
+ <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
+ <option value="9">閲囪喘閫�璐у嚭搴�</option>
</select>
</div>
</div>
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
index 81b648e..f6f4fe9 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeDetailServer.cs
@@ -3,8 +3,10 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
+using System.Threading.Tasks;
using Dm;
using Model.ModelDto.BllSoDto;
+using Model.ModelVm.BllSoVm;
using SqlSugar;
using WMS.BLL.LogServer;
using WMS.DAL;
@@ -22,21 +24,21 @@
public ExportNoticeDetailServer():base(Db)
{
}
- public List<ExportNoticeDetailDto> GetExportNoticeDetailList(string soNo, int page, int limit, out int count)
+ public async Task<List<ExportNoticeDetailDto>> GetExportNoticeDetailList(GetExportNoticeDetailVm model, RefAsync<int> count)
{
try
{
- if (string.IsNullOrWhiteSpace(soNo))
+ if (string.IsNullOrWhiteSpace(model.SoNo))
{
throw new Exception("鍑哄簱鍗曞彿涓虹┖");
}
- var notice = DataContext.Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && m.SONo == soNo).ToList().FirstOrDefault();
+ var notice = DataContext.Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && m.SONo == model.SoNo).ToList().FirstOrDefault();
if (notice == null)
{
throw new Exception("鍑哄簱鍗曞彿涓虹┖");
}
- var total = 0;
- var data = GetAllWhereAsync(a=>a.SONo == soNo)
+
+ var data = await GetAllWhereAsync(a=>a.SONo == model.SoNo)
.LeftJoin<SysPackag>((a,b)=> a.PackagNo == b.PackagNo)
.LeftJoin<SysUserInfor>((a,b,c)=> a.CreateUser == c.Id)
.LeftJoin<SysUserInfor>((a,b,c,d)=> a.UpdateUser == d.Id)
@@ -69,9 +71,8 @@
UpdateUserName = d.RealName,
CreateTime = a.CreateTime,
UpdateTime = a.UpdateTime
- }).ToOffsetPage(page,limit,ref total);
- count = total;
-
+ }).ToPageListAsync(model.Page, model.Limit, count);
+
return data;
}
catch (Exception e)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 8726081..3f7e3e2 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -812,29 +812,29 @@
#region 鍩虹鍔熻兘
- public List<ExportNoticeDto> GetExportNoticeList(string no, string type, string status, string lotNo, int? logisticsId, string isWave, string isDespatch, string waveNo, int page, int limit, out int count)
+ public async Task<List<ExportNoticeDto>> GetExportNoticeList(GetExportNoticeVm model, RefAsync<int> count)
{
try
{
var strList = new List<string>();
- if (!string.IsNullOrWhiteSpace(lotNo))
+ if (!string.IsNullOrWhiteSpace(model.LotNo))
{
- var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.LotNo.Contains(lotNo.Trim())).Select(m => m.SONo).Distinct().ToList();
+ var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.LotNo.Contains(model.LotNo.Trim())).Select(m => m.SONo).Distinct().ToList();
strList = detailList;
}
Expression<Func<BllExportNotice, bool>> item = Expressionable.Create<BllExportNotice>()
- .AndIF(!string.IsNullOrWhiteSpace(no), it => it.SONo.Contains(no.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(type), it => it.Type == type)
- .AndIF(!string.IsNullOrWhiteSpace(status), it => it.Status == status)
- .AndIF(logisticsId != null, it => it.LogisticsId == logisticsId)
- .AndIF(!string.IsNullOrWhiteSpace(isWave), it => it.IsWave == isWave)
- .AndIF(!string.IsNullOrWhiteSpace(isDespatch), it => it.IsDespatch == isDespatch)
- .AndIF(!string.IsNullOrWhiteSpace(waveNo), it => it.WaveNo.Contains(waveNo.Trim()))
- .AndIF(!string.IsNullOrWhiteSpace(lotNo), it => strList.Contains(it.SONo))
+ .AndIF(!string.IsNullOrWhiteSpace(model.No), it => it.SONo.Contains(model.No.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.Type), it => it.Type == model.Type)
+ .AndIF(!string.IsNullOrWhiteSpace(model.Status), it => it.Status == model.Status)
+ .AndIF(model.LogisticsId != null, it => it.LogisticsId == model.LogisticsId)
+ .AndIF(!string.IsNullOrWhiteSpace(model.IsWave), it => it.IsWave == model.IsWave)
+ .AndIF(!string.IsNullOrWhiteSpace(model.IsDespatch), it => it.IsDespatch == model.IsDespatch)
+ .AndIF(!string.IsNullOrWhiteSpace(model.WaveNo), it => it.WaveNo.Contains(model.WaveNo.Trim()))
+ .AndIF(!string.IsNullOrWhiteSpace(model.LotNo), it => strList.Contains(it.SONo))
.ToExpression();//娉ㄦ剰 杩欎竴鍙� 涓嶈兘灏�
- var total = 0;
- var data = GetAllWhereAsync(item)
+
+ var data = await GetAllWhereAsync(item)
.LeftJoin<SysLogisticsInfo>((a, b) => a.LogisticsId == b.Id)
.LeftJoin<SysUserInfor>((a, b, c) => a.CreateUser == c.Id)
.LeftJoin<SysUserInfor>((a, b, c, d) => a.CreateUser == d.Id)
@@ -867,8 +867,7 @@
CheckTime = a.CheckTime
})
.OrderByDescending(a => a.CreateTime)
- .ToOffsetPage(page, limit, ref total);
- count = total;
+ .ToPageListAsync(model.Page, model.Limit, count);
return data;
}
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs
index 7ddd530..bf985ad 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeDetailServer.cs
@@ -1,7 +1,10 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using System.Threading.Tasks;
using Model.ModelDto.BllSoDto;
+using Model.ModelVm.BllSoVm;
+using SqlSugar;
namespace WMS.IBLL.IBllSoServer
{
@@ -15,7 +18,7 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<ExportNoticeDetailDto> GetExportNoticeDetailList(string soNo, int page, int limit, out int count);
+ Task<List<ExportNoticeDetailDto>> GetExportNoticeDetailList(GetExportNoticeDetailVm model, RefAsync<int> count);
/// <summary>
/// 鍒犻櫎鍑哄簱鍗曟槑缁�
diff --git a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
index c679920..870ddad 100644
--- a/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
+++ b/Wms/WMS.IBLL/IBllSoServer/IExportNoticeServer.cs
@@ -5,6 +5,8 @@
using WMS.Entity.DataEntity;
using System.Collections.Generic;
using System.Xml;
+using System.Threading.Tasks;
+using SqlSugar;
namespace WMS.IBLL.IBllSoServer
{
@@ -47,7 +49,7 @@
/// <param name="limit"></param>
/// <param name="count"></param>
/// <returns></returns>
- List<ExportNoticeDto> GetExportNoticeList(string no,string type, string status, string LotNo,int? logisticsId,string isWave, string isDespatch,string waveNo, int page, int limit, out int count);
+ Task<List<ExportNoticeDto>> GetExportNoticeList(GetExportNoticeVm model, RefAsync<int> count);
/// <summary>
/// 鑾峰彇娣诲姞鎴栦慨鏀瑰嚭搴撳崟鏄庣粏鎵�鏄剧ず鐨勫簱瀛樻暟鎹簮
diff --git a/Wms/Wms/Controllers/BllSoController.cs b/Wms/Wms/Controllers/BllSoController.cs
index 6e9040d..0b4b20c 100644
--- a/Wms/Wms/Controllers/BllSoController.cs
+++ b/Wms/Wms/Controllers/BllSoController.cs
@@ -13,6 +13,10 @@
using Newtonsoft.Json;
using Utility.Tools;
using Model.InterFaceModel;
+using SqlSugar;
+using Utility;
+using System.Threading.Tasks;
+using Model.ModelDto.BllSoDto;
namespace Wms.Controllers
{
@@ -53,18 +57,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetExportNoticeList(GetExportNoticeVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetExportNoticeList(GetExportNoticeVm model)
{
- try
- {
- var bolls = _exNoticeSvc.GetExportNoticeList(model.No, model.Type, model.Status,model.LotNo,model.LogisticsId,model.IsWave,model.IsDespatch,model.WaveNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _exNoticeSvc.GetExportNoticeList(model, count);
- return Ok(new { code = 0, count, msg = "鍑哄簱鍗曚俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
@@ -280,18 +279,13 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetExportNoticeDetailList(GetExportNoticeDetailVm model)
+ [ServiceFilter(typeof(ApiResponseActionFilter))]
+ public async Task<SqlSugarPagedList> GetExportNoticeDetailList(GetExportNoticeDetailVm model)
{
- try
- {
- var bolls = _exNoticeDetailSvc.GetExportNoticeDetailList(model.SoNo, model.Page, model.Limit, out int count);
+ RefAsync<int> count = new RefAsync<int>();
+ var bolls = await _exNoticeDetailSvc.GetExportNoticeDetailList(model, count);
- return Ok(new { code = 0, count, msg = "鍑哄簱鍗曟槑缁嗕俊鎭�", data = bolls });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
--
Gitblit v1.8.0