From f56fcadd8d412fa1a65c873e77ad04ebb31fc954 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期五, 18 七月 2025 14:27:43 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~cnj/ZMZ_MES_Api
---
StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs | 116 +++++++++++++++++++++++++++++
StandardPda/MES.Service/Dto/service/AsnInfo.cs | 24 ++++++
StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | 55 +++++++++++++
StandardPda/MES.Service/Dto/service/CCLoginDto.cs | 12 +++
4 files changed, 207 insertions(+), 0 deletions(-)
diff --git a/StandardPda/MES.Service/Dto/service/AsnInfo.cs b/StandardPda/MES.Service/Dto/service/AsnInfo.cs
new file mode 100644
index 0000000..f21dd93
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/AsnInfo.cs
@@ -0,0 +1,24 @@
+锘縩amespace 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; }
+
+
+ }
+}
diff --git a/StandardPda/MES.Service/Dto/service/CCLoginDto.cs b/StandardPda/MES.Service/Dto/service/CCLoginDto.cs
new file mode 100644
index 0000000..4700033
--- /dev/null
+++ b/StandardPda/MES.Service/Dto/service/CCLoginDto.cs
@@ -0,0 +1,12 @@
+锘縩amespace MES.Service.Dto.service
+{
+ public class CCLoginDto
+ {
+ /// <summary>
+ /// 浜ф祴鐧诲綍鍙�
+ /// </summary>
+ public string LoginId { get; set; }
+
+
+ }
+}
diff --git a/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
new file mode 100644
index 0000000..5a11494
--- /dev/null
+++ b/StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -0,0 +1,55 @@
+锘縰sing 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;
+ }
+
+
+
+ }
+}
diff --git a/StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs b/StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs
new file mode 100644
index 0000000..c0f541e
--- /dev/null
+++ b/StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs
@@ -0,0 +1,116 @@
+锘縰sing 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);
+ }
+ }
+
+
+ }
+}
--
Gitblit v1.9.3