文件补充

cnf

7 天以前 1b3db8f5683373dd8e179b006e7314783dd1f9db

 WebApi/Gs.Warehouse/Services/MesInvItemBarcodesManager.cs

@@ -1,5 +1,4 @@
using System.Text;
using Gs.Entity.BaseInfo;
using 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) //写Select前面用法，正常都这么用
            .OrderBy((b) => b.ItemBarcode)//写Select前面用法，正常都这么用
            .Select((b, c, d, e) => new MesInvItemBarcodes
            {
                Guid = b.Guid,