From 2ba5117206c152cece2e5ac40067a6232dfb2870 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebApi/Gs.Warehouse/Services/MesInvItemBarcodesManager.cs | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/WebApi/Gs.Warehouse/Services/MesInvItemBarcodesManager.cs b/WebApi/Gs.Warehouse/Services/MesInvItemBarcodesManager.cs
index 5c0af8c..f4077d9 100644
--- a/WebApi/Gs.Warehouse/Services/MesInvItemBarcodesManager.cs
+++ b/WebApi/Gs.Warehouse/Services/MesInvItemBarcodesManager.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Text;
-using Gs.Entity.BaseInfo;
+锘縰sing Gs.Entity.BaseInfo;
using Gs.Entity.Sys;
using Gs.Entity.Warehouse;
using Gs.Toolbox;
@@ -10,6 +9,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
+using System.Text;
namespace Gs.Warehouse.Services;
@@ -37,12 +37,11 @@
public ReturnDto<PageList<MesItems>> GetListPage(PageQuery query)
{
var _sbWhere = new StringBuilder(" 1=1" + query.keyWhere);
- var _sbBy = new StringBuilder(query.sortName + " " + query.sortOrder);
+ var _sbBy =new StringBuilder(query.sortName + " " + query.sortOrder);
var pageList = new PageList<MesItems>();
try
{
- var totalCount = GetPageTotalCount(null, query, out var itemsList,
- _sbWhere, _sbBy);
+ var totalCount = GetPageTotalCount(null, query, out var itemsList, _sbWhere, _sbBy);
pageList = new PageList<MesItems>(itemsList, totalCount,
query.everyPageSize);
return ReturnDto<PageList<MesItems>>.QuickReturn(pageList,
@@ -56,17 +55,16 @@
}
private int GetPageTotalCount(Guid? guid, PageQuery query,
- out List<MesItems> itemsList, StringBuilder _sbWhere,
- StringBuilder _sbBy)
+ out List<MesItems> itemsList,System.Text.StringBuilder _sbWhere, StringBuilder _sbBy)
{
var totalCount = 0;
- itemsList = Db
- .Queryable<MesItems, MesUnit, SysOrganization>((a, b, org) =>
- new object[]
- {
- JoinType.Left, a.Storeunit == b.Id.ToString(),
- JoinType.Left, a.FSubsidiary == org.Fid.ToString()
- })
+ itemsList = Db.Queryable<MesItems, MesUnit, SysOrganization>(
+ (a, b, org) =>
+ new object[]
+ {
+ JoinType.Left, a.Storeunit == b.Id.ToString(),
+ JoinType.Left, a.FSubsidiary == org.Fid.ToString()
+ })
.WhereIF(UtilityHelper.CheckGuid(guid),
(a, b, org) => a.Guid == guid)
.Select((a, b, org) => new MesItems
@@ -89,7 +87,7 @@
CreateDate1 = DateTime.Now.ToString("yyyy-MM-dd"),
Tc = "鍚�"
}).Where(_sbWhere.ToString())
- .OrderBy(_sbBy.ToString())
+ .OrderBy(_sbBy.ToString())
.ToPageList(query.currentPage, query.everyPageSize,
ref totalCount);
return totalCount;
@@ -110,11 +108,10 @@
currentPage = 1,
everyPageSize = 1
};
- var sb = new StringBuilder();
- var order = new StringBuilder();
+ System.Text.StringBuilder sb = new StringBuilder();
+ System.Text.StringBuilder order = new StringBuilder();
order.Append(" org.FNumber asc ,a.item_no asc");
- var pageTotalCount = GetPageTotalCount(model.Guid, query,
- out var itemsList, sb, order);
+ var pageTotalCount = GetPageTotalCount(model.Guid, query, out var itemsList, sb, order);
var barcode = new InitialBarcode();
@@ -142,15 +139,15 @@
private List<MesInvItemBarcodes> GetMesInvItemBarcodes(long? ItemId)
{
var result = Db
- .Queryable<MesInvItemBarcodes, MesInvItemStocks, MesDepots,
- MesSupplier>((b, c, d, e) => new object[]
- {
- JoinType.Left, b.ItemBarcode == c.ItemBarcode,
- JoinType.Left, c.DepotId == d.DepotId,
- JoinType.Left, e.Id.ToString() == b.SuppID
- })
+ .Queryable<MesInvItemBarcodes, MesInvItemStocks, MesDepots, MesSupplier>(
+ (b, c, d, e) => new object[]
+ {
+ JoinType.Left, b.ItemBarcode == c.ItemBarcode,
+ JoinType.Left, c.DepotId == d.DepotId,
+ JoinType.Left,e.Id.ToString()==b.SuppID
+ })
.Where((b, c, d) => b.ComeFlg == 0 && b.ItemId == ItemId)
- .OrderBy(b => b.ItemBarcode) //鍐橲elect鍓嶉潰鐢ㄦ硶锛屾甯搁兘杩欎箞鐢�
+ .OrderBy((b) => b.ItemBarcode)//鍐橲elect鍓嶉潰鐢ㄦ硶锛屾甯搁兘杩欎箞鐢�
.Select((b, c, d, e) => new MesInvItemBarcodes
{
Guid = b.Guid,
--
Gitblit v1.9.3