Merge branch 'master' of http://43.142.96.171:8080/r/~cnj/ZMZ_MES_Api

wbc

昨天 f56fcadd8d412fa1a65c873e77ad04ebb31fc954

Merge branch 'master' of http://43.142.96.171:8080/r/~cnj/ZMZ_MES_Api

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
namespace MES.Service.Dto.service
{
    public class AsnInfo
    {
        /// <summary>
        /// å·¥å•å•å·
        /// </summary>
        public string tickeNo { get; set; }
        /// <summary>
        /// SN号
        /// </summary>
        public string snNo { get; set; }
        /// <summary>
        /// ç«™å·
        /// </summary>
        public string workstationNo { get; set; }
        /// <summary>
        /// SN状态（OK,NG）
        /// </summary>
        public string snState { get; set; }


    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
namespace MES.Service.Dto.service
{
    public class CCLoginDto
    {
        /// <summary>
        /// äº§æµ‹ç™»å½•å·
        /// </summary>
        public string LoginId { get; set; }

       
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
using Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Data;

namespace MES.Service.service.Warehouse
{
    public class WomdaaManager
    {
        /// <summary>
        /// èŽ·å–产测登录号对应工单信息
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public DataTable GetTickeInfo(string id)
        {
            OracleSQLHelper SQLHelper = new();
            //查工单信息
            var sql1 = @"select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from MESLINE_LIKE_CCLOGIN A 
                        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";

            return SQLHelper.ExecuteQuery(sql1);
        }


        /// <summary>
        /// è®°å½•äº§æµ‹è¿‡ç«™ä¿¡æ¯
        /// </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) VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,'"+ asnInfo.tickeNo+ "','"+ asnInfo.snNo+ "','"+ asnInfo.workstationNo+ "','"+ asnInfo.snState+ "')";
            bool result = true;
            int i= SQLHelper.ExecuteNonQuery(sql1);
            if (i > 0) {result = true;} else { result = false; }
            
            return result;
        }



    }
}

 StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,116 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System.Dynamic;

namespace MESApplication.Controllers.Warehouse
{
    [Route("api/[controller]")]
    [ApiController]
    public class womdaaController : ControllerBase
    {

        private readonly WomdaaManager m = new();

        private readonly MessageCenterManager _manager = new();

        private readonly string METHOD = "POST";

        private readonly string TableName = "womdaa";

        private readonly string URL = "http://localhost:10054/api/womdaa/";
        /// <summary>
        ///根据产测登录号获取产线相关工单信息
        /// </summary>
        /// <returns></returns>
        [HttpPost("GetTickeInfo")]
        public ResponseResult GetTickeInfo(CCLoginDto ccLoginDto)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "GetTickeInfo";
            entity.Method = METHOD;
            entity.Data = Newtonsoft.Json.JsonConvert.SerializeObject(ccLoginDto);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var result = m.GetTickeInfo(ccLoginDto.LoginId);
                resultInfos.tbBillList = result;

                entity.Result = 0;
                if (true) entity.Result = 1;
                entity.DealWith = 1;
                _manager.save(entity);

                return new ResponseResult
                {
                    status = 0,
                    message = "OK",
                    data = resultInfos.tbBillList
                };
            }
            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("AddAsnInfo")]
        public ResponseResult AddAsnInfo(AsnInfo asnInfo)
        {
            var entity = new MessageCenter();
            entity.TableName = TableName;
            entity.Url = URL + "AddAsnInfo";
            entity.Method = METHOD;
            entity.Data = Newtonsoft.Json.JsonConvert.SerializeObject(asnInfo);
            entity.Status = 1;
            entity.CreateBy = "PL017";
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var result = m.AddAsnInfo(asnInfo);
                resultInfos.tbBillList = result;

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

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

                return ResponseResult.ResponseError(ex);
            }
        }


    }
}