南骏 池
2025-06-02 1be2fc056943ba8b9e62328430e15beee03e8a9f
1.生产补料优化
2.首检开发-v1
已修改4个文件
252 ■■■■■ 文件已修改
Controllers/QC/IpqcController.cs 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/MesQaItemsDetectDetail5.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/QC/IpqcService.cs 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Warehouse/MesItemBlManager.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Controllers/QC/IpqcController.cs
@@ -118,7 +118,9 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// 首检单据查询
    /// </summary>
    [HttpPost("createByWomdaa")]
    public ResponseResult CreateByWomdaa(dynamic query)
    {
@@ -138,7 +140,9 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// 获取表格配置
    /// </summary>
    [HttpPost("GetTableConfig")]
    public ResponseResult GetTableConfig([FromBody] dynamic query)
    {
@@ -169,7 +173,9 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// 保存表格配置
    /// </summary>
    [HttpPost("SaveTableConfig")]
    public ResponseResult SaveTableConfig([FromBody] dynamic query)
    {
@@ -201,6 +207,121 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// 获取认证信息列表
    /// </summary>
    [HttpPost("GetRzxxList")]
    public ResponseResult GetRzxxList([FromBody] dynamic query)
    {
        try
        {
            if (query.mxguid == null)
                throw new ArgumentException("检验项目GUID不能为空");
            var rzxxList = m.GetRzxxList(query.mxguid?.ToString());
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = rzxxList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// 更新认证信息_生产日期
    /// </summary>
    [HttpPost("updateScDate")]
    public ResponseResult UpdateScDate([FromBody] dynamic query)
    {
        try
        {
            if (query.mxguid == null)
                throw new ArgumentException("检验项目GUID不能为空");
            if (query.scDateValue == null)
                throw new ArgumentException("日期参数不能为空");
            var affectedRows = m.UpdateScDate(
                query.scDateValue?.ToString(),
                query.mxguid?.ToString()
            );
            return new ResponseResult
            {
                status = affectedRows > 0 ? 0 : 1,
                message = affectedRows > 0 ? "日期更新成功" : "无数据更新",
                data = new { updated = affectedRows }
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// 保存认证信息相关使用数量
    /// </summary>
    [HttpPost("saveIpqcrzxxNum")]
    public ResponseResult SaveIpqcrzxxNum([FromBody] dynamic query)
    {
        try
        {
            if (query.guid == null || query.ipqcrzxxNum == null)
                throw new ArgumentException("参数不能为空");
            var affectedRows = m.UpdateRzxxNum(
                query.ipqcrzxxNum?.ToString(),
                query.guid?.ToString()
            );
            return new ResponseResult
            {
                status = affectedRows > 0 ? 0 : 1,
                message = affectedRows > 0 ? "数量更新成功" : "无数据更新",
                data = new { updated = affectedRows }
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    /// 保存品水测试是否有异味
    /// </summary>
    [HttpPost("saveIpqCpscs")]
    public ResponseResult SaveIpqCpscs([FromBody] dynamic query)
    {
        try
        {
            if (query.guid == null || query.ipqCpscs == null)
                throw new ArgumentException("参数不能为空");
            var affectedRows = m.UpdateCpscs(
                query.ipqCpscs?.ToString(),
                query.guid?.ToString()
            );
            return new ResponseResult
            {
                status = affectedRows > 0 ? 0 : 1,
                message = affectedRows > 0 ? "是否有无异味更新成功" : "无数据更新",
                data = new { updated = affectedRows }
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    
}
entity/MesQaItemsDetectDetail5.cs
@@ -208,6 +208,49 @@
    [SugarColumn(ColumnName = "ipqc_rzxx")]
    public string? IPQCRZXX { get; set; }
    /// <summary>
    /// 认证信息_生产日期
    /// </summary>
    [SugarColumn(ColumnName = "ipqc_rzxx_date")]
    public string? IPQCRZXXDate { get; set; }
    /// <summary>
    /// 认证信息相关使用数量
    /// </summary>
    [SugarColumn(ColumnName = "ipqc_rzxx_num")]
    public int? IPQCRZXXNum { get; set; }
    /// <summary>
    /// 品水测试_是否有异味
    /// </summary>
    [SugarColumn(ColumnName = "ipqc_pscs")]
    public string? IPQCpscs { get; set; }
    /// <summary>
    /// 物料项目分组
    /// </summary>
    [SugarColumn(ColumnName = "FCHECK_TYPE")]
    public string? FcheckType { get; set; }
    /// <summary>
    /// 水温选择
    /// </summary>
    [SugarColumn(ColumnName = "ipqc_zrxn_sel1")]
    public string? IPQCZrxnSel1 { get; set; }
    /// <summary>
    /// 流量选择
    /// </summary>
    [SugarColumn(ColumnName = "ipqc_zrxn_sel2")]
    public string? IPQCZrxnSel2 { get; set; }
    /// <summary>
    /// 制热性能结果表格
    /// </summary>
    [SugarColumn(ColumnName = "ipqc_zrxn_table")]
    public string? IPQCZrxnTable { get; set; }
    /// <summary>
    ///     样本已录入数
    /// </summary>
service/QC/IpqcService.cs
@@ -87,7 +87,11 @@
                a.Order,
                a.Ybsl,
                a.ISRZXX,
                a.IPQCRZXX
                a.IPQCRZXX,
                a.IPQCRZXXDate,
                a.IPQCRZXXNum,
                a.IPQCpscs,
                a.FcheckType,
            }).Select((a, b) => new MesQaItemsDetectDetail5
            {
                Guid = a.Guid,
@@ -112,7 +116,11 @@
                Ybsl = a.Ybsl,
                YbslIn = Ybsl_In,
                ISRZXX = a.ISRZXX,
                IPQCRZXX = a.IPQCRZXX
                IPQCRZXX = a.IPQCRZXX,
                IPQCRZXXDate = a.IPQCRZXXDate.ToString(),
                IPQCRZXXNum = a.IPQCRZXXNum,
                IPQCpscs = a.IPQCpscs,
                FcheckType =a.FcheckType,
            }).OrderBy(a => a.Order)
            .ToList();
    }
@@ -259,4 +267,72 @@
        return result;
    }
    public List<dynamic> GetRzxxList(string mxguid)
    {
        var sqlParams = new List<SugarParameter> {
            new("@mxguid", mxguid)
        };
        var sql = @"SELECT a.s_type, a.defect_name
                    FROM [dbo].[MES_DEFECT_CODE] a
                    WHERE a.s_type = '认证信息'
                    AND a.pid = (
                        SELECT TOP 1 b.guid
                        FROM [dbo].[MES_DEFECT_CODE] b
                        INNER JOIN [dbo].[MES_QA_ITEMS_DETECT_DETAIL5] d
                            ON b.defect_name = d.fcheck_item
                        WHERE d.guid = @mxguid
                        ORDER BY b.guid
                    )";
        var result = Db.Ado.SqlQuery<dynamic>(sql, sqlParams);
        if (result == null || result.Count == 0)
            throw new Exception("未找到相关认证信息");
        return result;
    }
    public int UpdateScDate(string scDateValue, string mxguid)
    {
        var sqlParams = new List<SugarParameter> {
            new("@scDateValue", scDateValue),
            new("@mxguid", mxguid)
        };
        var sql = @"UPDATE MES_QA_ITEMS_DETECT_DETAIL5
                    SET ipqc_rzxx_date = @scDateValue
                    WHERE guid = @mxguid";
        return Db.Ado.ExecuteCommand(sql, sqlParams);
    }
    public int UpdateRzxxNum(string ipqcrzxxNum, string mxguid)
    {
        var sqlParams = new List<SugarParameter> {
            new("@ipqcrzxxNum", ipqcrzxxNum),
            new("@mxguid", mxguid)
        };
        var sql = @"UPDATE MES_QA_ITEMS_DETECT_DETAIL5
                    SET ipqc_rzxx_num = @ipqcrzxxNum
                    WHERE guid = @mxguid";
        return Db.Ado.ExecuteCommand(sql, sqlParams);
    }
    public int UpdateCpscs(string ipqCpscs, string mxguid)
    {
        var sqlParams = new List<SugarParameter> {
            new("@ipqCpscs", ipqCpscs),
            new("@mxguid", mxguid)
        };
        var sql = @"UPDATE MES_QA_ITEMS_DETECT_DETAIL5
                    SET ipqc_pscs = @ipqCpscs
                    WHERE guid = @mxguid";
        return Db.Ado.ExecuteCommand(sql, sqlParams);
    }
}
service/Warehouse/MesItemBlManager.cs
@@ -870,7 +870,7 @@
                PbillNo = query.billNo,
                ItemId = blDetail.Bld012,
                Unit = blDetail.Bld009,
                DepotId = (int)stockBarcode.DepotsId,
                DepotId = (int)stockBarcode.DepotId,
                Dabid = womdab.Guid,
            }).IgnoreColumns(true).ExecuteCommand();