1.现场收料 2.MES->OA优化 3.采购入库新增日志。

南骏 池

2025-05-06 671b60339271875c3d15357e7c792727d67e6c91

1.现场收料
2.MES->OA优化
3.采购入库新增日志。

 Controllers/Wom/WomdaaController.cs

@@ -427,7 +427,7 @@

    //GetItemsXcsl
    /// <summary>
    ///     根据工单号获取代领物料明细
    ///     根据工单号获取待收料物料明细
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetItemsXcsl")]
@@ -450,5 +450,31 @@
        }
    }


    //GetItemsXcsl
    /// <summary>
    ///     物料条码收料
    /// </summary>
    /// <returns></returns>
    [HttpPost("ScanXcsl")]
    public ResponseResult ScanXcsl(dynamic query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanXcsl(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    #endregion
}

 service/QC/OaApi.cs

@@ -112,7 +112,9 @@
    C.item_name AS jzmcwlmc,
    D.supp_name AS khgys,
    B.bill_no   AS dhdhmes,
    A.remark    AS bhgpqxms
    (SELECT  STRING_AGG(releaseNo+':' + mx.fng_desc+'\n', ',') AS OrderIDs
FROM [Mes_QC_Exceptional_Detail] mx  where mx.pGuid=a.guid
)     AS bhgpqxms
FROM Mes_QC_Exceptional A
LEFT JOIN MES_INV_ITEM_ARN B ON A.aboutGuid = b.guid
LEFT JOIN MES_ITEMS C ON A.itemId = c.item_id

 service/Warehouse/MesInvItemInCDetailsManager.cs

@@ -855,6 +855,11 @@
            if (mesInvItemInCDetails == null)
                throw new Exception("物料入库条码明细不存在"); // 抛出异常以供前台处理

            // 创建 插入日志
            var logService = new LogService();
            var LogMsg = "[PDA]采购入库。条码【" + entity.barcode + "】 入库单号【" + cBillNo + "】";
            logService.CreateLog(db, entity.userName, inventory.Guid.ToString(), "WW_GD", LogMsg, inventory.BillNo);

            return 1;
        });


 service/Wom/WomdaaManager.cs

@@ -593,7 +593,7 @@


    //根据工单号返回产品型号和待领物料
    public ProductionPickDto GetItemsXcsl(WarehouseQuery query)
    public XcslResultDto GetItemsXcsl(WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("工单号为空");

@@ -605,63 +605,142 @@
            .Select((a, i) => new
            {
                a.Daa001,
                a.CaaGuid
                a.CaaGuid,
                a.Daa008
            }).First();

        if (womdaa?.Daa001 == null) throw new Exception("工单号不存在");

        var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
       dbo.F_QX_GETRECODEPOTSE(B.dab003) as RecoKw
    FROM WOMDAB B
    LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
    LEFT JOIN MES_ITEMS C ON  B.dab003 = C.item_id
    LEFT JOIN WOMCAB D ON B.erpid = D.ERPID
    WHERE daa001 = '{0}' AND ISSUE_TYPE = 1 ORDER BY DAB002", query.daa001);
        // 使用参数化查询防止SQL注入
        var sqlParams = new List<SugarParameter> { new("@daa001", query.daa001) };

        var womdabs = Db.Ado.SqlQuery<ItemDetailModel>(sql);
        var sql1 = @"SELECT A.item_out_no,
       SUM(B.QUANTITY) AS BL_Num,
       (SELECT ISNULL(SUM(B.QUANTITY), 0)
        FROM MES_INV_ITEM_OUTS A
                 LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
        WHERE out_type = '生产领料'
          AND A.task_no = @daa001
          AND ISNULL(IS_XCSL, '0') = 1) AS JS_Num,
       C.item_no,
       C.item_name,
       D.USER_NAME
FROM MES_INV_ITEM_OUTS A
         LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
         LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
         LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
WHERE out_type = '生产领料'
  AND A.task_no = @daa001
GROUP BY item_out_no, C.item_no, C.item_name, D.USER_NAME";

        var XcslItem = Db.Ado.SqlQuery<dynamic>(sql1, sqlParams);

        var sql2 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,A.create_date 
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
LEFT JOIN SYS_USER D ON A.create_by = D.ACCOUNT
WHERE out_type = '生产领料' 
AND A.task_no = @daa001 
AND ISNULL(IS_XCSL,'0') = 0";

        var XcslWjsBar = Db.Ado.SqlQuery<dynamic>(sql2, sqlParams);

        var sql3 = @"SELECT B.ITEM_BARCODE ,B.QUANTITY,C.item_no,C.item_name,D.USER_NAME,B.XCSL_CREATE_DATE 
FROM MES_INV_ITEM_OUTS A
LEFT JOIN MES_INV_ITEM_OUT_C_DETAILS B ON A.GUID = B.ITEM_OUT_ID
LEFT JOIN MES_ITEMS C ON B.ITEM_ID = C.item_id
LEFT JOIN SYS_USER D ON B.XCSL_CREATE_BY = D.ACCOUNT
WHERE out_type = '生产领料' 
AND A.task_no = @daa001  
AND ISNULL(IS_XCSL,'0') = 1";

        var XcslYjsBar = Db.Ado.SqlQuery<dynamic>(sql3, sqlParams);


        var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();

        var YS_list = womdabs.Where(s => s.SQty > 0).ToList();

        var mesInvItemOutCDetailsList = Db
            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
            ((a, b, c) =>
                new JoinQueryInfos(
                    JoinType.Inner, a.ItemId == b.Id,
                    JoinType.Inner, c.DepotId == a.DepotId
                ))
            .Where((a, b, c) => a.WorkNo == query.daa001)
            .Select((a, b, c) => new MesInvItemOutCDetails
        var dto = new XcslResultDto
            {
                ItemName = b.ItemName,
                ItemNo = b.ItemNo,
                ItemId = a.ItemId,
                DepotId = a.DepotId,
                WorkNo = a.WorkNo,
                DepotName = c.DepotName,
                Quantity = a.Quantity
            })
            .ToList();
            GD_Num = womdaa.Daa008,
            XcslItemList = XcslItem,
            XcslWjsBarList = XcslWjsBar,
            XcslYjsBarList = XcslYjsBar

        var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
            .First();

        if (womcaa == null)
        {
            throw new Exception("生产任务单不存在");
        }

        var dto = new ProductionPickDto
        {
            daa001 = womdaa.Daa001,
            PlanNo = womcaa.Caa020,
            items = DS_list,
            Ysitems = YS_list
            // yisao = mesInvItemOutCDetailsList
        };

        return dto;
    }

    // 现场收料展示列表
    public class XcslResultDto
    {
        public int? GD_Num { get; set; }
        public List<dynamic> XcslItemList { get; set; }
        public List<dynamic> XcslWjsBarList { get; set; }
        public List<dynamic> XcslYjsBarList { get; set; }
    }


    public dynamic ScanXcsl(dynamic query)
    {
        if (query == null) throw new ArgumentNullException(nameof(query), "参数对象不能为 null");

        // 参数校验（根据存储过程新增参数）
        if (string.IsNullOrEmpty(query.userAccount?.ToString()))
            throw new ArgumentException("用户名不允许为空", nameof(query.userAccount));

        if (string.IsNullOrEmpty(query.Bar?.ToString()))
            throw new ArgumentException("物料条码不允许为空", nameof(query.Bar));

        if (string.IsNullOrEmpty(query.DAA001?.ToString()))
            throw new ArgumentException("工单单号不允许为空", nameof(query.DAA001));

        var _strMsg = "";
        var _status = -1;
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd = new SqlCommand("prc_pda_ScanXcsl", conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    // 根据存储过程调整参数顺序和命名
                    SqlParameter[] parameters =
                    {
                        new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
                        new("@pi_barcode", SqlDbType.NVarChar, 100) { Value = query.Bar },
                        new("@pi_daa001", SqlDbType.NVarChar, 100) { Value = query.DAA001 },
                        new("@po_outMsg", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
                        new("@po_outStatus", SqlDbType.Int) { Direction = ParameterDirection.Output }
                    };

                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);

                    cmd.ExecuteNonQuery();

                    _strMsg = parameters[3].Value?.ToString() ?? "";
                    _status = Convert.ToInt32(parameters[4].Value ?? -1);

                    if (_status <= 0) throw new Exception(_strMsg);

                    return new
                    {
                        message = _strMsg,
                        status = _status,
                        daa001 = query.DAA001,
                        barCode = query.Bar
                    };
                }
                catch (Exception ex)
                {
                    throw new Exception($"产线收料失败：{ex.Message}");
                }
                finally
                {
                    conn.Close();
                }
            }
        }
    }
}