点击提交检验才可将表单移动到已检验

xwt

2025-05-20 974e3af4e6316b59e761925b1a511a0470f2a365

点击提交检验才可将表单移动到已检验

 StandardInterface/MES.Service/service/QC/LljService.cs

@@ -294,8 +294,8 @@

                return commit;
            });

        var isNull = db.Queryable<MesQaItemsDetectDetail5>()
        //5.20xwt修改将更新主表检验结果字段放在IqcQaSubmit方法下
        /*var isNull = db.Queryable<MesQaItemsDetectDetail5>()
            .Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == null)
            .Count();

@@ -333,7 +333,7 @@
                .SetColumns(s => s.LastupdateDate == DateTime.Now)
                .Where(s => s.ReleaseNo == detail.ReleaseNo)
                .ExecuteCommand();
        });
        });*/
        //  if (FcheckResu.Equals("不合格"))
        //自动生成入库检异常对策
        ///     saveDetect02(detail.Id, detail.CreateBy);
@@ -559,6 +559,34 @@

            if ("1".Equals(resultValue)) throw new Exception(messageValue);

            var sum = db.Queryable<MesQaItemsDetectDetail5>()
            .Where(s => s.ReleaseNo == dto.releaseNo).Count();

            if (sum == 0) return true;

            var icount = db.Queryable<MesQaItemsDetectDetail5>()
                .Where(s => s.ReleaseNo == dto.releaseNo && s.FcheckResu == "合格")
                .Count();

            var FcheckResu = "不合格";

            if (sum == icount)
                FcheckResu = "合格";

            var sysUser = db.Queryable<SysUser>()
                .Where(s => s.Fcode == dto.userNo).First();

            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                return db.Updateable<MesQaItemsDetect01>()
                    .SetColumns(s => s.FcheckResu == FcheckResu)
                    .SetColumns(s => s.FcheckDate == DateTime.Now)
                    .SetColumns(s => s.FcheckBy == sysUser.Fname)
                    .SetColumns(s => s.LastupdateBy == dto.userNo)
                    .SetColumns(s => s.LastupdateDate == DateTime.Now)
                    .Where(s => s.ReleaseNo == dto.releaseNo)
                    .ExecuteCommand();
            });
            return true;
        }
        catch (Exception ex)

 StandardInterface/MESApplication/Controllers/Base/LoginController.cs

@@ -126,7 +126,7 @@
        try
        {
            HttpClient client = new();
            var requestUrl = $"http://192.168.1.104:8081/UpgradeInformation.json";
            var requestUrl = $"http://192.168.1.22:8088/UpgradeInformation.json";
            var response = await client.GetAsync(requestUrl);
            response.EnsureSuccessStatusCode(); // 检查HTTP状态码
            var responseContent = await response.Content.ReadAsStringAsync();