报工修改

kyy

3 天以前 fd8a1399090dd3a57b557a7c8d270362397bc21f

 service/Warehouse/MesXsthManager.cs

@@ -1,11 +1,16 @@
using System.Data;
using System.Data.SqlClient;
using Masuit.Tools;
using Masuit.Tools;
using MES.Service.Modes;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using OracleInternal.Sharding;
using SqlSugar;
using SqlSugar.Extensions;
using System.Data;
using System.Data.SqlClient;
using DbHelperSQL = NewPdaSqlServer.DB.DbHelperSQL;

namespace NewPdaSqlServer.service.Warehouse;

@@ -15,7 +20,7 @@
    ///     获取销售退货申请列表
    /// </summary>
    /// <returns>销售退货申请列表</returns>
    public dynamic GetXsthBillNo(WarehouseQuery query, dynamic RequestInfo)
    public dynamic GetXsthBillNo(WarehouseQuery query,dynamic RequestInfo)
    {
        var orgId = RequestInfo.OrgId;

@@ -25,18 +30,17 @@
        // 获取未完成的退料单号列表
        var parameters = new[]
        {
            new SugarParameter("@pi_orgId", orgId),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        new SugarParameter("@pi_orgId", orgId),
        new SugarParameter("@inP1", null),
        new SugarParameter("@inP2", null),
        new SugarParameter("@inP3", null),
        new SugarParameter("@inP4", null)
        };
        try
        {
            // 返回单号字符串列表
            var blDetails = Db.Ado.SqlQuery<string>(
                "EXEC prc_pda_xsth_list @pi_orgId,@inP1,@inP2,@inP3,@inP4",
                parameters);
                "EXEC prc_pda_xsth_list @pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
            return blDetails;
        }
        catch (Exception ex)
@@ -68,25 +72,24 @@

        // 获取未完成的销售退货明细
        var parameters = new[]
        {
            new SugarParameter("@billNo", query.billNo),
            new SugarParameter("@pi_orgId", orgId),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        };
{
        new SugarParameter("@billNo", query.billNo),
        new SugarParameter("@pi_orgId",orgId),
        new SugarParameter("@inP1", null),
        new SugarParameter("@inP2", null),
        new SugarParameter("@inP3", null),
        new SugarParameter("@inP4", null)
    };
        try
        {
            var blDetails = Db.Ado.SqlQuery<dynamic>(
                "EXEC prc_pda_xsth_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4",
                parameters);
            var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 待扫物料
            var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 已扫物料
            List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
                "EXEC prc_pda_xsth_detailList @billNo,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
            var items = blDetails.Where(x => x.DSQty > 0).ToList();    // 待扫物料
            var ysitems = blDetails.Where(x => x.SQty > 0).ToList();   // 已扫物料
            return new
            {
                items,
                ysitems,
                items = items,
                ysitems = ysitems,
                Count = items.Count + ysitems.Count
            };
        }
@@ -98,7 +101,7 @@
    }

    /// <summary>
    ///     销售退货入库
    /// 销售退货入库
    /// </summary>
    /// <param name="unity"></param>
    /// <returns></returns>
@@ -110,8 +113,7 @@
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            if (unity.userName.IsNullOrEmpty()) throw new Exception("用户名不允许为空");
            if (unity.sectionCode.IsNullOrEmpty())
                throw new Exception("库位编号不允许为空");
            if (unity.sectionCode.IsNullOrEmpty()) throw new Exception("库位编号不允许为空");
            if (unity.barcode.IsNullOrEmpty()) throw new Exception("条码不允许为空");
            if (unity.billNo.IsNullOrEmpty()) throw new Exception("申请单号不允许为空");

@@ -129,11 +131,12 @@
                        new("@pi_user", unity.userName),
                        new("@pi_barcode", unity.barcode),
                        new("@pi_sectionCode", unity.sectionCode),
                        new("@pi_billno", unity.billNo)
                        new("@pi_billno", unity.billNo),

                    };
                    parameters[0].Direction = ParameterDirection.Output;
                    parameters[1].Direction = ParameterDirection.Output;
                    // parameters[2].Direction = ParameterDirection.Output;
                   // parameters[2].Direction = ParameterDirection.Output;

                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
@@ -147,6 +150,7 @@
                    return _strMsg;

                    //return 0;

                }
                catch (Exception ex)
                {