南骏 池
3 天以前 29c58a44a8f725637e7b18fbfc2dc826ba430561
1.委外领料申请(未完成)
2.物料分区
已修改3个文件
145 ■■■■■ 文件已修改
Controllers/Wom/WwGdController.cs 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Wom/WomdaaManager.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Wom/WwGdManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Controllers/Wom/WwGdController.cs
@@ -330,6 +330,67 @@
        }
    }
    /// <summary>
    /// 选取列表
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    /// <summary>
    /// 获取委外出库申请单号
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>
    [HttpPost("GetWWCKsq")]
    public ResponseResult GetWWCKsq([FromBody] dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetWWCKsq(query, RequestInfo);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     根据委外领料申请单获取明细
    /// </summary>
    /// <param name="query">工单号请求参数</param>
    /// <returns>ResponseResult对象,包含状态、消息和数据</returns>
    [HttpPost("GetItemsByWwckNo")]
    public ResponseResult GetItemsByWwckNo(WarehouseQuery query)
    {
        try
        {
            // 调用WwGdManager的GetItemsByDaa001方法获取代领物料明细
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemsByWwckNo(query, RequestInfo);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            // 如果发生异常,返回错误信息
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     获取所有
    /// </summary>
service/Wom/WomdaaManager.cs
@@ -50,12 +50,12 @@
        {
            new SugarParameter("@daa001", query.daa001),
            new SugarParameter("@pi_orgId",orgId),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP1", query.userName),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        };
        var womdabs = Db.Ado.SqlQuery<ItemDetailModel>("EXEC prc_pda_scll_detailList @daa001", parameters);
        var womdabs = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_detailList @daa001,@pi_orgId,@inP1", parameters);
        var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
        var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
@@ -69,7 +69,7 @@
            throw new Exception("该工单信息不存在,请核对!");
        }
        var dto = new ProductionPickDto
        var dto = new
        {
            daa001 = query.daa001,
            daaInfo = womdaa,
service/Wom/WwGdManager.cs
@@ -192,6 +192,33 @@
        return result;
    }
    /// <summary>
    /// 选取列表
    /// </summary>
    /// <param name="unity"></param>
    /// <param name="RequestInfo"></param>
    /// <returns></returns>
    public dynamic GetWWCKsq(dynamic unity, dynamic RequestInfo)
    {
        var orgId = RequestInfo.OrgId;
        var parameters = new List<SugarParameter>
        {
            new SugarParameter("@pi_selectKey", unity.selectKey),
            new SugarParameter("@pi_type", unity.type), // 可选参数
            new SugarParameter("@pi_orgId", orgId), // 可选参数
            new SugarParameter("@inP1", null), // 可选参数
            new SugarParameter("@inP2", null), // 可选参数
            new SugarParameter("@inP3", null), // 可选参数
            new SugarParameter("@inP4", null), // 可选参数
            // ...其他可选参数
        };
        var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_wwcksq_list @pi_selectKey, @pi_type, @pi_orgId , @inP1, @inP2, @inP3, @inP4", parameters);
        return result;
    }
    /// <summary>
    /// 列表明细
    /// </summary>
@@ -245,6 +272,57 @@
        }
    }
    /// <summary>
    /// 委外出库申请单号获取明细
    /// </summary>
    /// <param name="query"></param>
    /// <param name="RequestInfo"></param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    /// <exception cref="ArgumentNullException"></exception>
    /// <exception cref="ArgumentException"></exception>
    public dynamic GetItemsByWwckNo(WarehouseQuery query, dynamic RequestInfo)
    {
        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("请选工单号!");
        if (query == null)
            throw new ArgumentNullException(nameof(query), "参数对象不能为null");
        if (string.IsNullOrEmpty(query.daa001?.ToString()))
            throw new ArgumentException("工单号不存在", nameof(query.daa001));
        var orgId = RequestInfo.OrgId;
        if (orgId == null)
            throw new Exception("组织不存在!");
        var parameters = new[]
        {
            new SugarParameter("@daa001", query.daa001),
            new SugarParameter("@pi_orgId", orgId),
            new SugarParameter("@inP1", null),
            new SugarParameter("@inP2", null),
            new SugarParameter("@inP3", null),
            new SugarParameter("@inP4", null)
        };
        try
        {
            List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
                "EXEC prc_pda_wwll_detailList @daa001,@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();   // 已扫物料
            var planNo = blDetails.FirstOrDefault()?.ErpProductionOrderNo?.ToString();// 获取工单计划号
            return new
            {
                daa001 = query.daa001,
                PlanNo = planNo,
                items = items,
                ysitems = ysitems
            };
        }
        catch (Exception ex)
        {
            throw new Exception($"{ex.Message}");
        }
    }
    #region 委外退料
    /// <summary>