From 22df00fd57f9e5a1f004ec6364d8f4db0e01efb7 Mon Sep 17 00:00:00 2001
From: ZONES <765289303@qq.com>
Date: Tue, 17 Jun 2025 09:58:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HSSE/HazardRegisterController.cs          | 11 +++-
 .../Controllers/MaterialsOutController.cs     | 61 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs b/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs
index de721df..c8bb967 100644
--- a/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs
+++ b/SGGL/WebAPI/Controllers/HSSE/HazardRegisterController.cs
@@ -176,7 +176,16 @@ namespace WebAPI.Controllers
             var responeData = new Model.ResponeData();
             try
             {
-                responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId, checkDate);
+
+                if(string.IsNullOrEmpty(projectId))
+                {
+                    responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(checkDate);
+                }
+                else
+                {
+                    responeData.data = APIHazardRegisterService.getHazardRegisterByProjectIdStates(projectId, checkDate);
+                }
+                
             }
             catch (Exception ex)
             {
diff --git a/SGGL/WebAPI/Controllers/MaterialsOutController.cs b/SGGL/WebAPI/Controllers/MaterialsOutController.cs
index fae37a5..374eb62 100644
--- a/SGGL/WebAPI/Controllers/MaterialsOutController.cs
+++ b/SGGL/WebAPI/Controllers/MaterialsOutController.cs
@@ -1,4 +1,5 @@
 using BLL;
+using Model;
 using System;
 using System.Linq;
 using System.Web.Http;
@@ -22,7 +23,8 @@ namespace WebAPI.Controllers
             {
                 using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
                 {
-                    int count = db.Cl_W_MaterialOutM.Where(x => x.UserTime == DateTime.Now).ToList().Count();
+                    var userTime = DateTime.Now;
+                    int count = db.Cl_W_MaterialOutM.Where(x => x.UserTime.Value.Year == userTime.Year&&x.UserTime.Value.Month==userTime.Month&&x.UserTime.Value.Day==userTime.Day).ToList().Count();
                     Model.Cl_W_MaterialOutM outm = new Model.Cl_W_MaterialOutM();
                     
                     outm.OutSheetMID = MaterialOutM.OutSheetMID;
@@ -85,9 +87,64 @@ namespace WebAPI.Controllers
                     outs.InstallationId = MaterialOutS.InstallationId;
                     outs.Shue = MaterialOutS.Shue;
                     outs.Bhsje = MaterialOutS.Bhsje;
-
+     
                     db.Cl_W_MaterialOutS.InsertOnSubmit(outs);
+
+                    var sourceData = db.Cl_W_MaterialOutS
+                        .Where(s => s.OutSheetMID == MaterialOutS.OutSheetMID)
+                        .Select(s => new  // 先投影到匿名对象
+                        {
+                            ProjectId = s.ProjectId,
+                            InstallationId = db.Cl_W_MaterialOutM
+                                .Where(m => m.OutSheetMID == s.OutSheetMID)
+                                .Select(m => m.InstallationId)
+                                .FirstOrDefault(),
+                            Ghfs = db.Cl_W_MaterialOutM
+                                .Where(m => m.OutSheetMID == s.OutSheetMID)
+                                .Select(m => m.YYPID)
+                                .FirstOrDefault(),
+                            FirstpartyCode = s.FirstpartyCode,
+                            MaterialID = s.MaterialID,
+                            OutSheetMID = s.OutSheetMID,
+                            OutSheetSID = s.OutSheetSID,
+                            OutQuantity = s.OutQuantity
+                        })
+                        .AsEnumerable()  // 切换到客户端评估
+                        .Select(x => new Model.Cl_w_comp  // 现在可以构造实体对象了
+                        {
+                            CompID = Guid.NewGuid().ToString(),
+                            ProjectId = x.ProjectId,
+                            InstallationId = x.InstallationId,
+                            Ghfs = x.Ghfs,
+                            TAreaMaterialMID = x.FirstpartyCode,
+                            TAreaMaterialSID = "",
+                            MaterialID = x.MaterialID,
+                            Aquantity = 0,
+                            PlanSheetMID = "",
+                            PlanSheetSID = "",
+                            Pquantity = 0,
+                            StorageSheetMID = "",
+                            StorageSheetSID = "",
+                            SQuantity = 0,
+                            StorageHJSID = "",
+                            StorageHJMID = "",
+                            HQuantity = 0,
+                            OutSheetMID = x.OutSheetMID,
+                            OutSheetSID = x.OutSheetSID,
+                            OQuantity = x.OutQuantity,
+                            ReturnSheetMid = "",
+                            ReturnSheetSID = "",
+                            RQuantity = 0
+                        });
+                    db.Cl_w_comp.InsertAllOnSubmit(sourceData);
+                    Model.Cl_W_MaterialOutM clw = db.Cl_W_MaterialOutM.FirstOrDefault(x => x.OutSheetMID == MaterialOutS.OutSheetMID);
+                    if(clw.IsOk != "1")
+                    {
+                        clw.IsOk = "1";
+                    }
+
                     db.SubmitChanges();
+                    
                     responeData.data = MaterialOutS.OutSheetSID;
                 }
             }