From 8827ee945f313bdafbe9fdab481c0a0660c551bd Mon Sep 17 00:00:00 2001
From: fcx <2246384483@qq.com>
Date: 星期二, 16 十二月 2025 09:53:05 +0800
Subject: [PATCH] 1.巡检新增提交审核标识判断逻辑

---
 StandardPda/MES.Service/Modes/QsQaItemXj.cs               |   14 +
 StandardPda/MES.Service/service/QC/SJService.cs           |    6 
 StandardPda/MESApplication/Controllers/QC/SJController.cs |   85 ++++-----
 StandardPda/MES.Service/Modes/QsQaItemXj01.cs             |    7 
 StandardPda/MESApplication/Controllers/QC/XJController.cs |    3 
 StandardPda/MES.Service/service/QC/XJService.cs           |  305 ++++++++++++++++++++++++++++++++------
 StandardPda/MES.Service/Modes/MesQualityStandard.cs       |   12 +
 7 files changed, 335 insertions(+), 97 deletions(-)

diff --git a/StandardPda/MES.Service/Modes/MesQualityStandard.cs b/StandardPda/MES.Service/Modes/MesQualityStandard.cs
index 632a644..614185a 100644
--- a/StandardPda/MES.Service/Modes/MesQualityStandard.cs
+++ b/StandardPda/MES.Service/Modes/MesQualityStandard.cs
@@ -20,6 +20,18 @@
     public decimal Id { get; set; }
 
     /// <summary>
+    ///     宸ュ簭
+    /// </summary>
+    [SugarColumn(ColumnName = "PROCESS")]
+    public string? PROCESS { get; set; }
+
+
+
+
+
+
+
+    /// <summary>
     ///     鍒涘缓浜�
     /// </summary>
     [Column("CREATE_BY")]
diff --git a/StandardPda/MES.Service/Modes/QsQaItemXj.cs b/StandardPda/MES.Service/Modes/QsQaItemXj.cs
index 28c435a..95f6ba3 100644
--- a/StandardPda/MES.Service/Modes/QsQaItemXj.cs
+++ b/StandardPda/MES.Service/Modes/QsQaItemXj.cs
@@ -108,9 +108,15 @@
     public DateTime? FsubmitDate { get; set; }
 
     /// <summary>
+    /// 鎻愪氦鏍囪瘑
     /// </summary>
     [SugarColumn(ColumnName = "FSUBMIT")]
     public decimal? Fsubmit { get; set; }
+    /// <summary>
+    /// 瀹℃牳鏍囪瘑
+    /// </summary>
+    [SugarColumn(ColumnName = "FSUBMIT1")]
+    public decimal? Fsubmit1 { get; set; }
 
     /// <summary>
     ///     澶囨敞
@@ -124,6 +130,14 @@
     [SugarColumn(ColumnName = "ITEM_ID")]
     public decimal? ItemId { get; set; }
 
+
+    /// <summary>
+    ///     鐗╂枡宸ュ簭
+    /// </summary>
+    [SugarColumn(ColumnName = "PROCESS_LIST")]
+    public string? PROCESS_LIST { get; set; }
+
+
     [SugarColumn(IsIgnore = true)] public string? Daa020 { get; set; }
     [SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }
 
diff --git a/StandardPda/MES.Service/Modes/QsQaItemXj01.cs b/StandardPda/MES.Service/Modes/QsQaItemXj01.cs
index 95a65e9..f924ba8 100644
--- a/StandardPda/MES.Service/Modes/QsQaItemXj01.cs
+++ b/StandardPda/MES.Service/Modes/QsQaItemXj01.cs
@@ -139,6 +139,13 @@
     [SugarColumn(IsIgnore = true)]
     public int? isCheck { get; set; }
 
+    ///<summary>
+    ///  鏂板鏄惁蹇呴』涓婁紶鍥剧墖
+    ///</summary>
+    [SugarColumn(ColumnName = "UP_FILE")]
+   public decimal? UP_FILE { get; set; }
+
+
     /// <summary>
     ///     鍥剧墖鍦板潃
     /// </summary>
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index cc4c58a..cf35419 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -4,6 +4,7 @@
 using MES.Service.util;
 using SqlSugar;
 using System.Data;
+using System.Runtime.InteropServices.JavaScript;
 
 namespace MES.Service.service.QC;
 
@@ -292,7 +293,8 @@
                     Picture = b.Picture,
                     Picturename = b.Picturename,
                     result = "鏈娴�",
-                    isCheck = 0,UP_FILE=b.UP_FILE
+                    isCheck = 0,
+                    UP_FILE=b.UP_FILE
                 }).ToList();
     }
 
@@ -412,7 +414,7 @@
 
             // 2. 鏌ユ壘 MesQa 瀵瑰簲涓昏〃ID锛堥�氳繃 item.ItemNo锛�
             var mesQa = db.Queryable<MesQa>()
-                .Where(q => q.ItemNo == item.ItemNo)
+                .Where(q => q.ItemNo == item.ItemNo && q.QsType== "1")
                 .Select(q => new { q.Id })
                 .First();
 
diff --git a/StandardPda/MES.Service/service/QC/XJService.cs b/StandardPda/MES.Service/service/QC/XJService.cs
index 87d9c7b..dc1a173 100644
--- a/StandardPda/MES.Service/service/QC/XJService.cs
+++ b/StandardPda/MES.Service/service/QC/XJService.cs
@@ -251,7 +251,7 @@
 
             var sql = string.Format(
                 @"UPDATE QS_QA_ITEM_XJ
-              SET FSUBMIT = 1,
+              SET FSUBMIT = 1,FSUBMIT1 = 1,
                   FCHECK_RESU = '鎵嬪姩鍏抽棴'
               WHERE ID = '{0}'",
                 dto.id);
@@ -284,57 +284,266 @@
 
 
 
-    public bool XJQaSubmit(LLJDto rkjDto)
-    {
-        var useTransactionWithOracle =
-            SqlSugarHelper.UseTransactionWithOracle(db =>
-            {
-                return db.Updateable<QsQaItemXj>()
-                    .SetColumns(s => s.Fsubmit == 1)
-                    .SetColumns(s => s.FsubmitBy == rkjDto.userNo)
-                    .SetColumns(s => s.FsubmitDate == DateTime.Now)
-                    .Where(s => s.Id == rkjDto.gid)
-                    .ExecuteCommand();
-            });
+    //public bool XJQaSubmit(LLJDto rkjDto)
+    //{
+    //    var useTransactionWithOracle =
+    //        SqlSugarHelper.UseTransactionWithOracle(db =>
+    //        {
+    //            return db.Updateable<QsQaItemXj>()
+    //                .SetColumns(s => s.Fsubmit == 1)
+    //                .SetColumns(s => s.FsubmitBy == rkjDto.userNo)
+    //                .SetColumns(s => s.FsubmitDate == DateTime.Now)
+    //                .Where(s => s.Id == rkjDto.gid)
+    //                .ExecuteCommand();
+    //        });
 
-        return useTransactionWithOracle > 0;
+    //    return useTransactionWithOracle > 0;
+    //}
+
+
+    public ResponseResult XJQaSubmit(LLJDto rkjDto)
+    {
+        try
+        {
+            //------------------ 涓嶅悎鏍煎浘鐗囨槸鍚︿笂浼犳牎楠� ------------------
+            var sql2 =
+                @"select A.id, A.PROJ_NAME, B.id as id2
+                  from QS_QA_ITEM_XJ01 A
+                  left join MES_QS_IMAGE B on 666 || A.ID = B.FID
+                  where A.PID = '" + rkjDto.gid + @"' 
+                    and B.id is null 
+                    and IS_PASS = 0";
+
+            var dt2 = SQLHelper.ExecuteQuery(sql2);
+            if (dt2.Rows.Count > 0)
+            {
+                string err = "";
+                for (int i = 0; i < dt2.Rows.Count; i++)
+                {
+                    err += "銆�" + dt2.Rows[i]["PROJ_NAME"].ToString() + "銆�";
+                }
+
+                return new ResponseResult
+                {
+                    status = 1,
+                    message = err + "涓嶅悎鏍煎浘鐗囨湭涓婁紶锛�",
+                    data = ""
+                };
+            }
+            //------------------ 蹇呭~椤瑰浘鐗囨槸鍚︿笂浼犳牎楠� ------------------
+            var sql3 =
+                @"select A.id, A.PROJ_NAME, B.id as id2
+                  from QS_QA_ITEM_XJ01 A
+                  left join MES_QS_IMAGE B on 666 || A.ID = B.FID
+                  where A.PID = '" + rkjDto.gid + @"'
+                    and B.id is null
+                    and UP_FILE = 1";
+
+            var dt3 = SQLHelper.ExecuteQuery(sql3);
+            if (dt3.Rows.Count > 0)
+            {
+                string err = "";
+                for (int i = 0; i < dt3.Rows.Count; i++)
+                {
+                    err += "銆�" + dt3.Rows[i]["PROJ_NAME"].ToString() + "銆�";
+                }
+
+                return new ResponseResult
+                {
+                    status = 1,
+                    message = err + "蹇呭~椤瑰浘鐗囨湭涓婁紶锛�",
+                    data = ""
+                };
+            }
+
+            //------------------ 鏂板鏍¢獙锛氭鏌ユ槸鍚﹀瓨鍦ㄦ湭瀹屾垚锛圛S_PASS is null锛� ------------------
+            var sqlPass =
+                @"select ID, PROJ_NAME 
+                  from QS_QA_ITEM_XJ01
+                  where PID = '" + rkjDto.gid + @"'
+                    and IS_PASS is null";
+
+            var dtPass = SQLHelper.ExecuteQuery(sqlPass);
+            if (dtPass.Rows.Count > 0)
+            {
+                string err = "";
+                for (int i = 0; i < dtPass.Rows.Count; i++)
+                {
+                    err += "銆�" + dtPass.Rows[i]["PROJ_NAME"].ToString() + "銆�";
+                }
+
+                return new ResponseResult
+                {
+                    status = 1,
+                    message = "",
+                    data = err + "椤圭洰鏈畬鎴愶紝涓嶅厑璁告彁浜ゆ楠岋紒"
+                };
+            }
+            var sqlPass1 =
+     @"select FCHECK_RESU
+      from QS_QA_ITEM_XJ
+      where ID = '" + rkjDto.gid + "'";
+            var dt = SQLHelper.ExecuteQuery(sqlPass1);
+
+
+
+            if (dt.Rows.Count > 0)
+            {
+                var resu = dt.Rows[0]["FCHECK_RESU"]?.ToString();
+
+                var fsubmit1 = resu == "鍚堟牸" ? 1 : 0;
+
+                var sqlUpdate =
+                    @"update QS_QA_ITEM_XJ
+          set FSUBMIT1 = " + fsubmit1 + @"
+          where ID = '" + rkjDto.gid + "'";
+                SQLHelper.ExecuteNonQuery(sqlUpdate);
+            }
+
+            var useTransactionWithOracle =
+                SqlSugarHelper.UseTransactionWithOracle(db =>
+                {
+                    return db.Updateable<QsQaItemXj>()
+                        .SetColumns(s => s.Fsubmit == 1)
+                        .SetColumns(s => s.FsubmitBy == rkjDto.userNo)
+                        .SetColumns(s => s.FsubmitDate == DateTime.Now)
+                        .Where(s => s.Id == rkjDto.gid)
+                        .ExecuteCommand();
+                });
+            return new ResponseResult
+            {
+                status = 0,
+                message = "鎻愪氦鎴愬姛",
+                data = useTransactionWithOracle
+            };
+        }
+        catch (Exception ex)
+        {
+            return ResponseResult.ResponseError(ex);
+        }
     }
 
-    public List<QsQaItemXj01> setJYItem(string itemNo)
+
+
+
+
+
+
+
+
+
+
+    //public List<QsQaItemXj01> setJYItem(string itemNo,string releaseNo)
+    //{
+    //    var db = SqlSugarHelper.GetInstance();
+
+    //    var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
+    //        && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+
+    //    if (count <= 0) return new List<QsQaItemXj01>();
+
+    //    return db
+    //        .Queryable<MesQualityStandard>()
+    //        .Where(b => b.QsType == "2"
+    //                    && b.ItemNo == itemNo).Select(b => new QsQaItemXj01
+    //        {
+    //            ProjName = b.ProjName,
+    //            ItemMod = b.ItemMod,
+    //            InspectionMethod = b.InspectionMethod,
+    //            UsingInstruments = b.UsingInstruments,
+    //            LevelNum = SqlFunc.IsNull(
+    //                SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
+    //                b.InspectionLevel),
+    //            MaxValue = b.MaxValue,
+    //            StandardValue = b.StandardValue,
+    //            MinValue = b.MinValue,
+    //            Notes = b.Notes,
+    //            FcheckLevel = b.FcheckLevel,
+    //            FacLevel = b.FacLevel,
+    //            QsCode = b.QsCode,
+    //            QsName = b.QsName,
+    //            result = "鏈娴�",
+    //            isCheck = 0,
+    //            Picture = b.Picture,
+    //            Picturename = b.Picturename
+    //        }).ToList();
+    //}
+
+
+
+    public List<QsQaItemXj01> setJYItem(string itemNo, string releaseNo)
+{
+    var db = SqlSugarHelper.GetInstance();
+
+    var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
+        && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+
+    if (count <= 0) return new List<QsQaItemXj01>();
+
+    // 鏍规嵁宸℃鍗曞彿鍜岀墿鏂欑紪鐮佽幏鍙朠ROCESS_LIST
+    var processListQuery = db.Queryable<QsQaItemXj>()
+        .Where(xj => xj.ReleaseNo == releaseNo && xj.ItemNo == itemNo)
+        .Select(xj => xj.PROCESS_LIST)
+        .ToList();
+
+    // 濡傛灉娌℃湁鎵惧埌瀵瑰簲鐨凱ROCESS_LIST,杩斿洖绌哄垪琛�
+    if (processListQuery == null || processListQuery.Count == 0)
     {
-        var db = SqlSugarHelper.GetInstance();
-
-        var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
-            && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
-
-        if (count <= 0) return new List<QsQaItemXj01>();
-
-        return db
-            .Queryable<MesQualityStandard>()
-            .Where(b => b.QsType == "2"
-                        && b.ItemNo == itemNo).Select(b => new QsQaItemXj01
-            {
-                ProjName = b.ProjName,
-                ItemMod = b.ItemMod,
-                InspectionMethod = b.InspectionMethod,
-                UsingInstruments = b.UsingInstruments,
-                LevelNum = SqlFunc.IsNull(
-                    SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
-                    b.InspectionLevel),
-                MaxValue = b.MaxValue,
-                StandardValue = b.StandardValue,
-                MinValue = b.MinValue,
-                Notes = b.Notes,
-                FcheckLevel = b.FcheckLevel,
-                FacLevel = b.FacLevel,
-                QsCode = b.QsCode,
-                QsName = b.QsName,
-                result = "鏈娴�",
-                isCheck = 0,
-                Picture = b.Picture,
-                Picturename = b.Picturename
-            }).ToList();
+        return new List<QsQaItemXj01>();
     }
+
+    return db
+        .Queryable<MesQualityStandard>()
+        .Where(b => b.QsType == "2"
+                    && b.ItemNo == itemNo
+                    && processListQuery.Contains(b.PROCESS))  // 杩囨护鏉′欢
+        .Select(b => new QsQaItemXj01
+        {
+            ProjName = b.ProjName,
+            ItemMod = b.ItemMod,
+            InspectionMethod = b.InspectionMethod,
+            UsingInstruments = b.UsingInstruments,
+            LevelNum = SqlFunc.IsNull(
+                SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
+                b.InspectionLevel),
+            MaxValue = b.MaxValue,
+            StandardValue = b.StandardValue,
+            MinValue = b.MinValue,
+            Notes = b.Notes,
+            FcheckLevel = b.FcheckLevel,
+            FacLevel = b.FacLevel,
+            QsCode = b.QsCode,
+            QsName = b.QsName,
+            result = "鏈娴�",
+            isCheck = 0,
+            UP_FILE = b.UP_FILE
+        }).ToList();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     public List<QsQaItemXj01> getJYItem(decimal? pid, decimal? id)
     {
@@ -466,7 +675,7 @@
         var items = xjDto.items;
         var userNo = xjDto.userNo;
 
-        // 鉁� 浣跨敤 lambda 杩斿洖鎻掑叆鏉℃暟锛屼繚璇� Func<SqlSugarClient, int> 姣忔潯璺緞閮芥湁杩斿洖鍊�
+       
         int insertCount = SqlSugarHelper.UseTransactionWithOracle(db =>
         {
             // 1锔忊儯 妫�鏌ヨ〃閲屾槸鍚﹀瓨鍦ㄧ浉鍚� gid 鐨勬暟鎹�
diff --git a/StandardPda/MESApplication/Controllers/QC/SJController.cs b/StandardPda/MESApplication/Controllers/QC/SJController.cs
index a06c558..aeeb63b 100644
--- a/StandardPda/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SJController.cs
@@ -338,8 +338,8 @@
             //------------------ SN鎵爜鏍¢獙 ------------------
             var sql1 =
                 @"select SCAN_ITEM 
-              from ZMZ_TEST.MES_SJ_SCAN_ITEM_CK 
-              where mid='" + rkjDto.gid + "' and sn_no is null";
+                  from ZMZ_TEST.MES_SJ_SCAN_ITEM_CK 
+                  where mid='" + rkjDto.gid + "' and sn_no is null";
 
             var dataTable1 = SQLHelper.ExecuteQuery(sql1);
             string msg = "";
@@ -373,11 +373,11 @@
             //------------------ 涓嶅悎鏍煎浘鐗囨槸鍚︿笂浼犳牎楠� ------------------
             var sql2 =
                 @"select A.id, A.PROJ_NAME, B.id as id2
-              from QS_ITEM_IPI_ITEM A
-              left join MES_QS_IMAGE B on 777 || A.ID = B.FID
-              where A.PID = '" + rkjDto.gid + @"' 
-                and B.id is null 
-                and IS_PASS = 0";
+                  from QS_ITEM_IPI_ITEM A
+                  left join MES_QS_IMAGE B on 777 || A.ID = B.FID
+                  where A.PID = '" + rkjDto.gid + @"' 
+                    and B.id is null 
+                    and IS_PASS = 0";
 
             var dt2 = SQLHelper.ExecuteQuery(sql2);
             if (dt2.Rows.Count > 0)
@@ -399,11 +399,11 @@
             //------------------ 蹇呭~椤瑰浘鐗囨槸鍚︿笂浼犳牎楠� ------------------
             var sql3 =
                 @"select A.id, A.PROJ_NAME, B.id as id2
-              from QS_ITEM_IPI_ITEM A
-              left join MES_QS_IMAGE B on 777 || A.ID = B.FID
-              where A.PID = '" + rkjDto.gid + @"'
-                and B.id is null
-                and UP_FILE = 1";
+                  from QS_ITEM_IPI_ITEM A
+                  left join MES_QS_IMAGE B on 777 || A.ID = B.FID
+                  where A.PID = '" + rkjDto.gid + @"'
+                    and B.id is null
+                    and UP_FILE = 1";
 
             var dt3 = SQLHelper.ExecuteQuery(sql3);
             if (dt3.Rows.Count > 0)
@@ -425,9 +425,9 @@
             //------------------ 鏂板鏍¢獙锛氭鏌ユ槸鍚﹀瓨鍦ㄦ湭瀹屾垚锛圛S_PASS is null锛� ------------------
             var sqlPass =
                 @"select ID, PROJ_NAME 
-              from QS_ITEM_IPI_ITEM
-              where PID = '" + rkjDto.gid + @"'
-                and IS_PASS is null";
+                  from QS_ITEM_IPI_ITEM
+                  where PID = '" + rkjDto.gid + @"'
+                    and IS_PASS is null";
 
             var dtPass = SQLHelper.ExecuteQuery(sqlPass);
             if (dtPass.Rows.Count > 0)
@@ -451,38 +451,29 @@
             var tbBillList = new SJService().SJQaSubmit(rkjDto);
             resultInfos.tbBillList = tbBillList;
             //=================  鍒ゆ柇妫�楠屽悎鏍肩敓鎴愬贰妫�鍗� =========
-            var sqlpass6 = $@"update QS_ITEM_IPI_REQ set FSUBMIT1 = 1 where ID = '{rkjDto.gid}' ";
+            var sqlpass6 = $@"update QS_ITEM_IPI_REQ set FSUBMIT = 1 where ID = '{rkjDto.gid}' ";
             var dtPass7 = SQLHelper.ExecuteQuery(sqlpass6);
 
-
-
-
             var sqlPass1 = $@"
-    SELECT 
-        IS_PASS
-    FROM QS_ITEM_IPI_REQ
-    WHERE  ID = '{rkjDto.gid}'
-     ";
+        SELECT 
+            IS_PASS
+        FROM QS_ITEM_IPI_REQ
+        WHERE  ID = '{rkjDto.gid}'
+         ";
 
             var dtPass1 = SQLHelper.ExecuteQuery(sqlPass1);
 
             var sqlPass3 = $@"select C.ID from QS_ITEM_IPI_REQ A
-LEFT JOIN  V_MES_SJ B on b.BILL_NO = A.BILL_NO
-LEFT JOIN WOMDAA C on C.DAA001 = B.DAA001
-WHERE A.ID = '{rkjDto.gid}'
-";
-
+    LEFT JOIN  V_MES_SJ B on b.BILL_NO = A.BILL_NO
+    LEFT JOIN WOMDAA C on C.DAA001 = B.DAA001
+    WHERE A.ID = '{rkjDto.gid}'
+    ";
             var dtPass3 = SQLHelper.ExecuteQuery(sqlPass3);
 
             var value4 = dtPass3.Rows[0][0];
             int sqlPass2 = Convert.ToInt32(value4);
 
-
             bool isPass = false;
-
-
-
-
 
 
             if (dtPass1 != null && dtPass1.Rows.Count > 0)
@@ -492,13 +483,15 @@
                 // 鍒ゆ柇涓哄悎鏍硷紙IS_PASS = 1锛�
                 if (value == "1")
                 {
-                   
+                    var sqlpass4 = $@"update QS_ITEM_IPI_REQ set FSUBMIT1 = 1 where ID = '{rkjDto.gid}' ";
+
+                    var dtPass5 = SQLHelper.ExecuteQuery(sqlpass4);
 
                     isPass = true;
                 }
                 else
                 {
-                    var sqlpass4 = $@"update QS_ITEM_IPI_REQ set FSUBMIT = 0 where ID = '{rkjDto.gid}' ";
+                    var sqlpass4 = $@"update QS_ITEM_IPI_REQ set FSUBMIT1 = 0 where ID = '{rkjDto.gid}' ";
 
                     var dtPass5 = SQLHelper.ExecuteQuery(sqlpass4);
                 }
@@ -518,16 +511,15 @@
 
                 // ===== 杈撳叆鍙傛暟 =====
                 var parameters = new List<SugarParameter>
-    {
-        new SugarParameter("P_ID", sqlPass2, DbType.Int64, ParameterDirection.Input),
-        new SugarParameter("P_USER", rkjDto.userNo, DbType.String, ParameterDirection.Input),
-        new SugarParameter("P_ISH", 0, DbType.Int64, ParameterDirection.Input),
+        {
+            new SugarParameter("P_ID", sqlPass2, DbType.Int64, ParameterDirection.Input),
+            new SugarParameter("P_USER", rkjDto.userNo, DbType.String, ParameterDirection.Input),
+            new SugarParameter("P_ISH", 0, DbType.Int64, ParameterDirection.Input),
 
-        // 杈撳嚭鍙傛暟蹇呴』甯︿笂
-        outFlag,
-        outText
-    };
-
+            // 杈撳嚭鍙傛暟蹇呴』甯︿笂
+            outFlag,
+            outText
+        };
                 // ===== 鎵ц瀛樺偍杩囩▼ =====
                 db.Ado.ExecuteCommand(
                     "BEGIN PRC_XJ_GENERATE(:P_ID, :P_USER, :P_ISH, :P_FLAG, :P_TEXT); END;",
@@ -558,7 +550,8 @@
 
 
 
-    
+
+
 
 
 
diff --git a/StandardPda/MESApplication/Controllers/QC/XJController.cs b/StandardPda/MESApplication/Controllers/QC/XJController.cs
index 57719f7..611e564 100644
--- a/StandardPda/MESApplication/Controllers/QC/XJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/XJController.cs
@@ -188,11 +188,12 @@
     public ResponseResult setJYItem([FromBody] JObject data)
     {
         var itemNo = data["itemNo"].ToString();
+        var releaseNo = data["releaseNo"].ToString();
         try
         {
             dynamic resultInfos = new ExpandoObject();
             var tbBillList =
-                new XJService().setJYItem(itemNo);
+                new XJService().setJYItem(itemNo, releaseNo);
             resultInfos.tbBillList = tbBillList;
             return new ResponseResult
             {

--
Gitblit v1.9.3