| StandardPda/MES.Service/DB/OracleSQLHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MES.Service/Dto/webApi/SalesPalletDetailQueryDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MES.Service/Dto/webApi/SalesPalletQueryDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MES.Service/Dto/webApi/StackCodeStateDto.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MES.Service/Modes/SalesPallet.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MES.Service/Modes/SalesPalletDetail.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
StandardPda/MES.Service/DB/OracleSQLHelper.cs
@@ -121,6 +121,23 @@ } } // æ§è¡æ¥è¯¢å¹¶è¿åå个å¼(另忰) public object ExecuteScalar(string sql, CommandType commandType, OracleParameter[] parameters) { using (var connection = new OracleConnection(_connectionString)) { using (var command = new OracleCommand(sql, connection)) { command.CommandType = commandType; if (parameters != null) command.Parameters.AddRange(parameters); connection.Open(); return command.ExecuteScalar(); } } } // æ§è¡åå¨è¿ç¨ //OracleParameter[] parameters = new OracleParameter[] StandardPda/MES.Service/Dto/webApi/SalesPalletDetailQueryDto.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,47 @@ namespace MES.Service.Dto.webApi; /// <summary> /// é宿çæç»æ¥è¯¢ç»æDTO /// </summary> public class SalesPalletDetailQueryDto { /// <summary> /// æç»ID /// </summary> public decimal Id { get; set; } /// <summary> /// SALES_PALLET表çID /// </summary> public decimal? Mid { get; set; } /// <summary> /// éå®è®¢åå· /// </summary> public string? BillNo { get; set; } /// <summary> /// æ æ¿ç /// </summary> public string? Stackcode { get; set; } /// <summary> /// æ°é /// </summary> public decimal? Qty { get; set; } /// <summary> /// ç©æç¼ç /// </summary> public string? ItemNo { get; set; } /// <summary> /// ç©æåç§° /// </summary> public string? ItemName { get; set; } /// <summary> /// ç©æè§æ ¼ /// </summary> public string? ItemModel { get; set; } } StandardPda/MES.Service/Dto/webApi/SalesPalletQueryDto.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,67 @@ namespace MES.Service.Dto.webApi; /// <summary> /// éå®æçæ¥è¯¢ç»æDTO /// </summary> public class SalesPalletQueryDto { /// <summary> /// æçID /// </summary> public decimal Id { get; set; } /// <summary> /// å®¡æ ¸ç¶æ /// </summary> public decimal? Status { get; set; } /// <summary> /// å®¡æ ¸æ¶é´ /// </summary> public DateTime? CheckDate { get; set; } /// <summary> /// å®¡æ ¸äººå§å /// </summary> public string? CheckUser { get; set; } /// <summary> /// åæ®ç¼å· /// </summary> public string? BillNo { get; set; } /// <summary> /// ç©æç¼ç /// </summary> public string? ItemNo { get; set; } /// <summary> /// ç©æåç§° /// </summary> public string? ItemName { get; set; } /// <summary> /// ç©æè§æ ¼ /// </summary> public string? ItemModel { get; set; } /// <summary> /// åä½åç§° /// </summary> public string? UnitName { get; set; } /// <summary> /// éå®è®¢åæ°é(xsdd) /// </summary> public decimal? Xsdd { get; set; } /// <summary> /// å·²ç»å®æ°é(yb) /// </summary> public decimal? Yb { get; set; } /// <summary> /// å¯ä¸æ è¯(wyj) /// </summary> public string? Wyj { get; set; } } StandardPda/MES.Service/Dto/webApi/StackCodeStateDto.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,12 @@ namespace MES.Service.Dto.webApi; /// <summary> /// æ æ¿ç ç¶ææ¥è¯¢è¯·æ±DTO /// </summary> public class StackCodeStateDto { /// <summary> /// æ æ¿ç /// </summary> public string StackCode { get; set; } } StandardPda/MES.Service/Modes/SalesPallet.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,52 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// æ æ¿ä¸éå®è®¢åç»å®è¡¨ /// </summary> [SugarTable("SALES_PALLET")] public class SalesPallet { /// <summary> /// 主é®ID /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_PALLET", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// åæ®ç¼å· /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// ç©æID /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } /// <summary> /// é宿°é /// </summary> [SugarColumn(ColumnName = "SALES_QUANTITY")] public decimal? SalesQuantity { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string? CheckUser { get; set; } /// <summary> /// å®¡æ ¸æ¶é´ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// å®¡æ ¸ç¶æ(é»è®¤å¼ï¼0) /// </summary> [SugarColumn(ColumnName = "STATUS")] public decimal? Status { get; set; } } StandardPda/MES.Service/Modes/SalesPalletDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,46 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// æ æ¿ä¸éå®è®¢åç»å®æç» /// </summary> [SugarTable("SALES_PALLET_DETAIL")] public class SalesPalletDetail { /// <summary> /// 主é®ID /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_PALLET", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// éå®è®¢åå· /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// ç©æID /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } /// <summary> /// æ æ¿ç /// </summary> [SugarColumn(ColumnName = "STACKCODE")] public string? Stackcode { get; set; } /// <summary> /// æ°é /// </summary> [SugarColumn(ColumnName = "QTY")] public decimal? Qty { get; set; } /// <summary> /// SALES_PALLET表çID /// </summary> [SugarColumn(ColumnName = "MID")] public decimal? Mid { get; set; } } StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs
@@ -749,5 +749,32 @@ return result; } /// <summary> /// æ¥è¯¢æ æ¿ç ç¶æ /// </summary> /// <param name="stackCode">æ æ¿ç </param> /// <returns>0-å 许解ç»ï¼1-ä¸å 许解ç»(å·²å ¥åº)</returns> public int GetStackCodeState(string stackCode) { var sqlHelper = new OracleSQLHelper(); try { // æ¥è¯¢è¯¥æ æ¿ç æ¯å¦å·²å ¥åº (IS_INBOUND = 1) var sql = @"SELECT COUNT(*) FROM MES_PALLET_BINDING WHERE STACKCODE = :stackCode AND IS_INBOUND = 1"; var parameters = new[] { new OracleParameter(":stackCode", stackCode ?? (object)DBNull.Value) }; var count = Convert.ToInt32(sqlHelper.ExecuteScalar(sql, CommandType.Text, parameters)); // 妿count > 0ï¼è¯´æå·²å ¥åºï¼è¿å1(ä¸å 许解ç») // å¦åè¿å0(å 许解ç») return count > 0 ? 1 : 0; } catch (Exception ex) { throw new Exception($"æ¥è¯¢æ æ¿ç ç¶æå¤±è´¥: {ex.Message}", ex); } } } } StandardPda/MESApplication/Controllers/Warehouse/SalesPalletController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,141 @@ using MES.Service.util; using MES.Service.service.Warehouse; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.Warehouse; /// <summary> /// é宿çç®¡çæ§å¶å¨ /// </summary> [Route("api/[controller]")] [ApiController] public class SalesPalletController : ControllerBase { private readonly SalesPalletManager _manager = new(); /// <summary> /// è·åé宿çä¿¡æ¯ /// </summary> /// <returns>é宿çä¿¡æ¯å表</returns> [HttpPost("GetSalesPalletInfo")] public ResponseResult GetSalesPalletInfo() { try { var result = _manager.GetSalesPalletInfo(); return new ResponseResult { status = 0, message = "æ¥è¯¢æå", data = result }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®æ¡ä»¶è·åé宿çä¿¡æ¯ /// </summary> /// <param name="request">æ¥è¯¢æ¡ä»¶</param> /// <returns>é宿çä¿¡æ¯å表</returns> [HttpPost("GetSalesPalletInfoByCondition")] public ResponseResult GetSalesPalletInfoByCondition([FromBody] SalesPalletQueryRequest request) { try { var result = _manager.GetSalesPalletInfo(request.BillNo, request.ItemId, request.Status); return new ResponseResult { status = 0, message = "æ¥è¯¢æå", data = result }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// è·åé宿çæç»ä¿¡æ¯ /// </summary> /// <returns>é宿çæç»ä¿¡æ¯å表</returns> [HttpPost("GetSalesPalletDetailInfo")] public ResponseResult GetSalesPalletDetailInfo() { try { var result = _manager.GetSalesPalletDetailInfo(); return new ResponseResult { status = 0, message = "æ¥è¯¢æå", data = result }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®æ æ¿ç è·åé宿çæç»ä¿¡æ¯ /// </summary> /// <param name="request">æ¥è¯¢æ¡ä»¶</param> /// <returns>é宿çæç»ä¿¡æ¯å表</returns> [HttpPost("GetSalesPalletDetailInfoByStackcode")] public ResponseResult GetSalesPalletDetailInfoByStackcode([FromBody] SalesPalletDetailQueryRequest request) { try { var result = _manager.GetSalesPalletDetailInfo(request.Stackcode); return new ResponseResult { status = 0, message = "æ¥è¯¢æå", data = result }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } } /// <summary> /// éå®æçæ¥è¯¢è¯·æ± /// </summary> public class SalesPalletQueryRequest { /// <summary> /// åæ®ç¼å· /// </summary> public string? BillNo { get; set; } /// <summary> /// ç©æID /// </summary> public decimal? ItemId { get; set; } /// <summary> /// å®¡æ ¸ç¶æ /// </summary> public decimal? Status { get; set; } } /// <summary> /// é宿çæç»æ¥è¯¢è¯·æ± /// </summary> public class SalesPalletDetailQueryRequest { /// <summary> /// æ æ¿ç /// </summary> public string? Stackcode { get; set; } } StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs
@@ -1,6 +1,7 @@ using System.Dynamic; using AngleSharp.Text; using MES.Service.Dto.service; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.service; using MES.Service.service.Warehouse; @@ -265,4 +266,46 @@ return ResponseResult.ResponseError(ex); } } /// <summary> /// æ¥è¯¢æ æ¿ç ç¶æ /// </summary> /// <returns></returns> [HttpPost("GetStackCodeState")] public ResponseResult GetStackCodeState(StackCodeStateDto request) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "GetStackCodeState"; entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(request); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var state = m.GetStackCodeState(request.StackCode); resultInfos.state = state; entity.Result = 1; entity.DealWith = 1; _manager.save(entity); return new ResponseResult { status = state, message = state == 1 ? "è¯¥æ æ¿ç å·²å ¥åºï¼ä¸å 许解ç»" : "å 许解ç»", data = resultInfos }; } catch (Exception ex) { entity.Result = 0; entity.DealWith = 0; entity.ResultData = ex.Message; _manager.save(entity); return ResponseResult.ResponseError(ex); } } }