代码提交

zjh

2025-08-02 da95b0b41366074a2806b7c46447c0fac0f8b77a

代码提交

 StandardPda/MES.Service/DB/OracleSQLHelper.cs

@@ -228,4 +228,23 @@
    //     }
    //     return result;
    // }
    // æ‰“开连接并开启事务
    public (OracleConnection, OracleTransaction) BeginTransaction()
    {
        var connection = new OracleConnection(_connectionString);
        connection.Open();
        var transaction = connection.BeginTransaction();
        return (connection, transaction);
    }

    // å…³é—­è¿žæŽ¥ï¼ˆæäº¤æˆ–回滚后用）
    public void CloseConnection(OracleConnection connection)
    {
        if (connection != null && connection.State != ConnectionState.Closed)
        {
            connection.Close();
            connection.Dispose();
        }
    }

}

 StandardPda/MES.Service/Dto/service/AsnInfo.cs

@@ -19,6 +19,44 @@
        /// </summary>
        public string snState { get; set; }

        /// <summary>
        /// äº§æµ‹ç™»é™†å·
        /// </summary>
        public string loginId { get; set; }
        /// <summary>
        /// å¤±è´¥é¡¹ç›®
        /// </summary>
        public List<CcFailItems> failItems { get; set; }


    }
    /// <summary>
    /// äº§æµ‹SN失败项明细表
    /// </summary>
    public class CcFailItems
    {

        /// <summary>
        /// ä¸è‰¯é—®é¢˜
        /// </summary>
        public string DefectIssue { get; set; }

        /// <summary>
        /// åˆæ­¥åŽŸå› 
        /// </summary>
        public string RootCause { get; set; }

        /// <summary>
        /// ç»´ä¿®æ–¹æ¡ˆ/方法
        /// </summary>
        public string RepairMethod { get; set; }

        /// <summary>
        /// ä¸è‰¯ç‰©æ–™å¤„理
        /// </summary>
        public string MaterialHandling { get; set; }


    }

}

 StandardPda/MES.Service/Dto/service/MesItemQtList.cs

@@ -7,7 +7,7 @@
        /// <summary>
        /// ç‰©æ–™ç¼–号
        /// </summary>
        public string Itemld { get; set; }
        public string ItemId { get; set; }

        /// <summary>
        /// è®¡åˆ’数量

 StandardPda/MES.Service/Dto/service/MesMiddleBox.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
namespace MES.Service.Dto.service
{
    /// <summary>
    /// ä¸­ç®±ç è¡¨
    /// </summary>
    public class MesMiddleBox
    {

        /// <summary>
        /// ç±»åž‹ï¼ˆæ“ä½œï¼šA绑定，F解绑）
        /// </summary>
        public string type { get; set; }
        /// <summary>
        /// ä¸­ç®±ç 
        /// </summary>
        public string MediumBoxCode { get; set; }

        /// <summary>
        /// ç™»å½•å·
        /// </summary>
        public string LoginId { get; set; }
        /// <summary>
        /// sn列表
        /// </summary>
       public List<snList> SnList { get; set; }

        public class snList
        {
            /// <summary>
            /// SN号
            /// </summary>
            public string SnNo { get; set; }

            /// <summary>
            /// å·¥å•å•å·
            /// </summary>
            public string TicketNo { get; set; }
        }

    }

  
}

 StandardPda/MES.Service/Dto/service/MesPalletBinding.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,50 @@
namespace MES.Service.Dto.service
{
    /// <summary>
    /// æ ˆæ¿ç»‘定表
    /// </summary>
    public class MesPalletBinding
    {

        /// <summary>
        /// æ“ä½œï¼šA绑定，F解绑
        /// </summary>
        public string Type { get; set; }
        /// <summary>
        /// æ ˆæ¿ç 
        /// </summary>
        public string StackCode { get; set; }

        /// <summary>
        /// ç™»å½•å·
        /// </summary>
        public string LoginId { get; set; }

        /// <summary>
        /// sn列表
        /// </summary>
        public List<snList1> SnList { get; set; }
        public class snList1
        {
            /// <summary>
            /// SN号
            /// </summary>
            public string SnNo { get; set; }

            /// <summary>
            /// å·¥å•å•å·
            /// </summary>
            public string TicketNo { get; set; }

            /// <summary>
            /// ä¸­ç®±ç 
            /// </summary>
            public string MediumBoxCode { get; set; }
        }


    }

  

}

 StandardPda/MES.Service/service/Warehouse/MesItemQtManager.cs

@@ -247,7 +247,7 @@

                var itemIdLinkU9 = Db.Queryable<MesLinkU9>()
                    .Where(s => s.TableType == "MES_ITEMS"
                                && s.U9Id == ItemQtRKList.Itemld).First();
                                && s.U9Id == ItemQtRKList.ItemId).First();

                if (itemIdLinkU9 == null)
                {
@@ -260,7 +260,7 @@

                if (mesItems == null)
                {
                    throw new NotImplementedException("[" + ItemQtRKList.Itemld +
                    throw new NotImplementedException("[" + ItemQtRKList.ItemId +
                                                      "]物料不存在，请同步给MES");
                }
                var mesDepot = "";

 StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs

@@ -2,12 +2,13 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.BasicData;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Data;

namespace MES.Service.service.Warehouse
{
@@ -26,17 +27,24 @@
            //            join MES_LINE b on A.LINEID=b.ID
            //            left join WOMDAA C on C.DAA015=B.LINE_NO
            //            left join mes_items s on s.id = C.daa002
            //            where LOGINID='" + id+ "' and DAA018='已开工'  order by DAA016 asc";

            //            where LOGINID='" + id + "' and DAA018='已开工'  order by DAA016 asc";

            //改为按站位号反查产线，再通过产线查出工单信息
            var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
                        left join MESLINE_LIKE_CCLOGIN_WORKS A1 on A.id=a1.LOGINID
                        join MES_LINE b on A.LINEID=b.ID
                        left join WOMDAA C on C.DAA015=B.LINE_NO
                        left join mes_items s on s.id = C.daa002
                       where WORKSNO='" + id + "' and DAA018='已开工'  order by DAA016 asc";
            //var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A
            //            left join MESLINE_LIKE_CCLOGIN_WORKS A1 on A.id=a1.LOGINID
            //            join MES_LINE b on A.LINEID=b.ID
            //            left join WOMDAA C on C.DAA015=B.LINE_NO
            //            left join mes_items s on s.id = C.daa002
            //           where WORKSNO='" + id + "' and DAA018='已开工'  order by DAA016 asc";


            //取直接关联线体的产测登录号数据，去取获取工单
            var sql1 = "select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from " +
                "MESLINE_LIKE_CCLOGIN_WORKS A1" +
                "                        join MES_LINE b on A1.LOGINID=b.ID" +
                "                        left join WOMDAA C on C.DAA015=B.LINE_NO" +
                "                        left join mes_items s on s.id = C.daa002" +
                "                       where WORKSNO='" + id + "' and DAA018='已开工'  order by DAA016 asc";
            return SQLHelper.ExecuteQuery(sql1);
        }

@@ -46,19 +54,265 @@
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        //public bool AddAsnInfo(AsnInfo asnInfo)
        //{
        //    OracleSQLHelper SQLHelper = new();
        //    //记录产测过站信息
        //    var sql1 = @"INSERT  INTO MES_SN_STATUS_DETAILS (ID,TICKET_NO,SN_NO,WORKSTATION_NO,SN_STATE,LOGIN_ID) VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,'" + asnInfo.tickeNo+ "','"+ asnInfo.snNo+ "','"+ asnInfo.workstationNo+ "','"+ asnInfo.snState+ "','"+asnInfo.loginId+"')";
        //    bool result = true;
        //    int i= SQLHelper.ExecuteNonQuery(sql1);
        //    //主表信息插入成功，继续插入项目
        //    if (i > 0) {
        //        //判断项目是否为空，为空不插入
        //        if (asnInfo.failItems.Count>0)
        //        {
        //            //插入逻辑

        //        }
        //        else
        //        {
        //            result = true;
        //        }


        //    } else { result = false; }

        //    return result;
        //}
        public bool AddAsnInfo(AsnInfo asnInfo)
        {
            OracleSQLHelper SQLHelper = new();
            //记录产测过站信息
            var sql1 = @"INSERT  INTO MES_SN_STATUS_DETAILS (ID,TICKET_NO,SN_NO,WORKSTATION_NO,SN_STATE) VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,'"+ asnInfo.tickeNo+ "','"+ asnInfo.snNo+ "','"+ asnInfo.workstationNo+ "','"+ asnInfo.snState+ "')";
            var sqlHelper = new OracleSQLHelper();
            bool result = true;
            int i= SQLHelper.ExecuteNonQuery(sql1);
            if (i > 0) {result = true;} else { result = false; }
            
            //
            var (connection, transaction) = sqlHelper.BeginTransaction();

            try
            {
                // ä¸»è¡¨æ’å…¥
                var sql1 = $@"INSERT INTO MES_SN_STATUS_DETAILS
                     (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID)
                     VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
                             '{asnInfo.tickeNo}',
                             '{asnInfo.snNo}',
                             '{asnInfo.workstationNo}',
                             '{asnInfo.snState}',
                             '{asnInfo.loginId}')";

                int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);

                if (i > 0 && asnInfo.failItems?.Count > 0)
                {
                    foreach (var item in asnInfo.failItems)
                    {
                        var sql2 = $@"INSERT INTO CC_FAIL_ITEMS
                             (ID, MID, DEFECT_ISSUE, ROOT_CAUSE, REPAIR_METHOD, MATERIAL_HANDLING, CREATE_DATE, CREATED_BY)
                             VALUES (SEQ_CC_FAIL_ITEMS.NEXTVAL,
                                     SEQ_MES_SN_STATUS_DETAILS_ID.CURRVAL,
                                     '{item.DefectIssue}',
                                     '{item.RootCause}',
                                     '{item.RepairMethod}',
                                     '{item.MaterialHandling}',
                                     SYSDATE,
                                     '{asnInfo.loginId}')";

                        sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
                    }
                }

                // å…¨éƒ¨æˆåŠŸæäº¤
                transaction.Commit();
            }
            catch (Exception ex)
            {
                transaction.Rollback();
                result = false;
                throw; // å»ºè®®è®°å½•æ—¥å¿—
            }
            finally
            {
                sqlHelper.CloseConnection(connection);
            }

            return result;
        }

        /// <summary>
        /// è®¾ç½®ä¸­ç®±ç 
        /// </summary>
        /// <param name="mesMiddleBox"></param>
        /// <returns></returns>
        public string[] SetMediumBoxCode(MesMiddleBox mesMiddleBox)
        {
            var sqlHelper = new OracleSQLHelper();
            string[] msg= new string[2];
            msg[0] = "true";
            //
            var (connection, transaction) = sqlHelper.BeginTransaction();

            try
            {
                if (mesMiddleBox.type.ToUpper() =="A") {
                    if (mesMiddleBox.SnList.Count > 0)
                    {
                        string sql1 = "select count(*) count  from MES_MIDDLE_BOX where MEDIUMBOXCODE='"+ mesMiddleBox.MediumBoxCode + "'";
                        DataTable data= sqlHelper.ExecuteQuery(sql1);
                        if (data.Rows[0]["COUNT"].ToString() != "0") {
                            msg[0] = "false";
                            msg[1] = "该中箱码已经绑定SN数据，如需再次绑定请先解绑！中箱码：" + mesMiddleBox.MediumBoxCode;
                            transaction.Rollback();
                           
                            return msg;
                        }
                        foreach (var item in mesMiddleBox.SnList)
                        {
                            var sql2 = $@"INSERT INTO MES_MIDDLE_BOX
                                    (
                                        ID,
                                        MEDIUMBOXCODE,
                                        LOGIN_ID,
                                        SN_NO,
                                        TICKET_NO,
                                        CREATE_DATE,
                                        CREATED_BY
                                    )
                                    VALUES
                                    (
                                        SEQ_MES_MIDDLE_BOX_ID.NEXTVAL, -- åºåˆ—生成主键
                                        '{mesMiddleBox.MediumBoxCode.ToString()}',                 -- ä¸­ç®±ç 
                                        '{mesMiddleBox.LoginId}',                       -- ç™»å½•å·
                                        '{item.SnNo}',                          -- SN号
                                        '{item.TicketNo}',                      -- å·¥å•å•å·
                                        SYSDATE,                         -- åˆ›å»ºæ—¶é—´
                                        '{mesMiddleBox.LoginId}'                       -- åˆ›å»ºäºº
                                    )
                                    ";

                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
                        }
                    }
                    else
                    {
                        msg[0] = "false";
                    }
                } else if(mesMiddleBox.type.ToUpper() == "F") {
                    //解绑，根据中箱码全部删除
                    var sql2 = $@"delete MES_MIDDLE_BOX where MEDIUMBOXCODE='{mesMiddleBox.MediumBoxCode}'";

                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
                }
                else
                {
                    msg[1] = "SN明细为空，请确认！";
                    msg[0] = "false";
                }
               

                // å…¨éƒ¨æˆåŠŸæäº¤
                transaction.Commit();
            }
            catch (Exception ex)
            {
                transaction.Rollback();
                msg[0] = "false";
                msg[1] = ex.Message;
                throw; // å»ºè®®è®°å½•æ—¥å¿—
            }
            finally
            {
                sqlHelper.CloseConnection(connection);
            }

            return msg;
        }


        public string[] SetStackCode(MesPalletBinding mesPalletBinding)
        {
            var sqlHelper = new OracleSQLHelper();
            string[] msg = new string[2];
            msg[0] = "true";
            //
            var (connection, transaction) = sqlHelper.BeginTransaction();

            try
            {
                //绑定
                if (mesPalletBinding.Type.ToUpper() == "A") {
                    if (mesPalletBinding.SnList.Count > 0)
                    {
                        string sql1 = "select count(*) count  from MES_PALLET_BINDING where STACKCODE='" + mesPalletBinding.StackCode + "'";
                        DataTable data = sqlHelper.ExecuteQuery(sql1);
                        if (data.Rows[0]["COUNT"].ToString() != "0")
                        {
                            msg[0] = "false";
                            msg[1] = "该栈板码已经绑定SN数据，如需再次绑定请先解绑！栈板码：" + mesPalletBinding.StackCode;
                            transaction.Rollback();

                            return msg;
                        }
                        foreach (var item in mesPalletBinding.SnList)
                        {
                            var sql2 = $@"INSERT INTO MES_PALLET_BINDING
                            (
                                ID,
                                STACKCODE,
                                LOGIN_ID,
                                SN_NO,
                                TICKET_NO,
                                MEDIUMBOXCODE,
                                CREATE_DATE,
                                CREATED_BY
                            )
                            VALUES
                            (
                                SEQ_MES_PALLET_BINDING_ID.NEXTVAL, -- åºåˆ—生成主键
                                '{mesPalletBinding.StackCode}',                        -- æ ˆæ¿ç 
                                '{mesPalletBinding.LoginId}',                          -- ç™»å½•å·
                                '{item.SnNo}',                             -- SN号
                                '{item.TicketNo}',                         -- å·¥å•å•å·
                                '{item.MediumBoxCode}',                     -- ä¸­ç®±ç 
                                SYSDATE,                            -- åˆ›å»ºæ—¶é—´
                                '{mesPalletBinding.LoginId}'                          -- åˆ›å»ºäºº
                            )

                                    ";

                            sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
                        }
                    }
                    else
                    {
                        msg[1] = "SN明细为空，请确认！";
                        msg[0] = "false";
                    }
                }
                //解绑
                else if(mesPalletBinding.Type.ToUpper() == "F")
                {
                    //解绑，根据中箱码全部删除
                    var sql2 = $@"delete MES_PALLET_BINDING where STACKCODE='" + mesPalletBinding.StackCode + "'";

                    sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql2);
                }
                

                // å…¨éƒ¨æˆåŠŸæäº¤
                transaction.Commit();
            }
            catch (Exception ex)
            {
                transaction.Rollback();
                msg[0] = "false";
                msg[1] = ex.Message;
                throw; // å»ºè®®è®°å½•æ—¥å¿—
            }
            finally
            {
                sqlHelper.CloseConnection(connection);
            }

            return msg;
        }

    }
}

 StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs

@@ -1,4 +1,5 @@
using MES.Service.Dto.service;
using AngleSharp.Text;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.Warehouse;
@@ -18,7 +19,7 @@
        private readonly WomdaaManager m = new();

        private readonly MessageCenterManager _manager = new();

        
        private readonly string METHOD = "POST";

        private readonly string TableName = "womdaa";
@@ -111,6 +112,116 @@
            }
        }

        /// <summary>
        ///设置中箱码
        /// </summary>
        /// <returns></returns>
        [HttpPost("SetMediumBoxCode")]
        public ResponseResult SetMediumBoxCode(MesMiddleBox MesMiddleBox)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "SetMediumBoxCode";
            entity.Method = METHOD;
            entity.Data = Newtonsoft.Json.JsonConvert.SerializeObject(MesMiddleBox);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var result = m.SetMediumBoxCode(MesMiddleBox);
                resultInfos.tbBillList = result;

                entity.Result = 0;
                if (result[0].ToBoolean()) entity.Result = 1;
                entity.DealWith = 1;
                _manager.save(entity);

                if (result[0].ToBoolean())
                {
                    return new ResponseResult
                    {
                        status = 0,
                        message = "OK",
                        data = resultInfos
                    };
                }
                else {
                    return new ResponseResult
                    {
                        status = 1,
                        message = result[1],
                        data = resultInfos
                    };
                }
               
            }
            catch (Exception ex)
            {
                entity.Result = 0;
                entity.DealWith = 0;
                entity.ResultData = ex.Message;
                _manager.save(entity);

                return ResponseResult.ResponseError(ex);
            }
        }

        /// <summary>
        ///设置栈板码
        /// </summary>
        /// <returns></returns>
        [HttpPost("SetStackCode")]
        public ResponseResult SetStackCode(MesPalletBinding mesPalletBinding)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "SetStackCode";
            entity.Method = METHOD;
            entity.Data = Newtonsoft.Json.JsonConvert.SerializeObject(mesPalletBinding);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var result = m.SetStackCode(mesPalletBinding);
                resultInfos.tbBillList = result;

                entity.Result = 0;
                if (result[0].ToBoolean()) entity.Result = 1;
                entity.DealWith = 1;
                _manager.save(entity);

                if (result[0].ToBoolean())
                {
                    return new ResponseResult
                    {
                        status = 0,
                        message = "OK",
                        data = resultInfos
                    };
                }
                else
                {
                    return new ResponseResult
                    {
                        status = 1,
                        message = result[1],
                        data = resultInfos
                    };
                }
            }
            catch (Exception ex)
            {
                entity.Result = 0;
                entity.DealWith = 0;
                entity.ResultData = ex.Message;
                _manager.save(entity);

                return ResponseResult.ResponseError(ex);
            }
        }


    }
}