Controllers/Warehouse/MesXsthController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/SalesReturnNotice.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/SalesReturnNoticeDetail.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/Warehouse/MesXsthManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Controllers/Warehouse/MesXsthController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,255 @@ using System.Dynamic; using Microsoft.AspNetCore.Mvc; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using NewPdaSqlServer.service.Warehouse; using NewPdaSqlServer.util; namespace NewPdaSqlServer.Controllers.Warehouse; /// <summary> /// ç产补æç¸å ³æ¥å£ /// </summary> [Route("api/[controller]")] [ApiController] public class MesXsthController : ControllerBase { private readonly MesXsthManager _manager = new(); #region åºç¡ /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <summary> /// è·åææ /// </summary> /// <returns></returns> [HttpPost("GetList")] public ResponseResult GetList() { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.GetList(); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®ä¸»é®è·å /// </summary> /// <returns></returns> [HttpPost("GetById")] public ResponseResult GetById(int id) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.GetById(id); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®ä¸»é®å é¤ /// </summary> /// <returns></returns> [HttpPost("DeleteByIds")] public ResponseResult DeleteByIds([FromBody] object[] ids) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.DeleteByIds(ids); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ·»å /// </summary> /// <returns></returns> [HttpPost("Insert")] public ResponseResult Add([FromBody] MesItemBl data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.Insert(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ·»å è¿åèªå¢ /// </summary> /// <returns></returns> [HttpPost("InsertReturnIdentity")] public ResponseResult InsertReturnIdentity([FromBody] MesItemBl data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.InsertReturnIdentity(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// ä¿®æ¹ /// </summary> /// <returns></returns> [HttpPost("Update")] public ResponseResult Update([FromBody] MesItemBl data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.Update(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } #endregion /// <summary> /// è·åéå®éè´§ç³è¯·å表 /// </summary> /// <returns>éå®éè´§ç³è¯·å表</returns> [HttpPost("GetXsthBillNo")] public ResponseResult GetXsthBillNo(WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.GetXsthBillNo(query); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// æ ¹æ®åå·è·åéå®éè´§åæç» /// </summary> /// <param name="query">æ¥è¯¢åæ°</param> /// <returns>éå®éè´§åæç»å表</returns> [HttpPost("GetMesItemDetailByBillNo")] public ResponseResult GetMesItemDetailByBillNo( [FromBody] WarehouseQuery query) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.GetMesItemDetailByBillNo(query); if (resultInfos.tbBillList.Count < 1) { return new ResponseResult { status = 1, message = "该ç³è¯·åå·ä¸å卿æªå®¡æ ¸ï¼ï¼ï¼", data = "" }; } return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } /// <summary> /// è·åæ¡ç ä¿¡æ¯åç©æä¿¡æ¯ /// </summary> /// <returns></returns> [HttpPost("XsthScanBarcode")] public ResponseResult XsthScanBarcode(WarehouseQuery unity) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = _manager.XsthScanBarcode(unity); return new ResponseResult { status = 0, message = resultInfos.tbBillList, data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } } entity/SalesReturnNotice.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,268 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®éè´§ç³è¯·å /// </summary> [SugarTable("SALES_RETURN_NOTICE")] public class SalesReturnNotice { /// <summary> /// ä¸»é® /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public Guid? Id { get; set; } /// <summary> /// åæ®ç±»å /// </summary> [SugarColumn(ColumnName = "BILL_TYPE")] public string? BillType { get; set; } /// <summary> /// åæ®ç¼å· /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> /// æ¥æ /// </summary> [SugarColumn(ColumnName = "F_DATE")] public DateTime? FDate { get; set; } /// <summary> /// ç»ç®å¸å« /// </summary> [SugarColumn(ColumnName = "CURRENCY")] public string? Currency { get; set; } /// <summary> /// éå®ç»ç» /// </summary> [SugarColumn(ColumnName = "SALES_ORG")] public string? SalesOrg { get; set; } /// <summary> /// éå®é¨é¨ /// </summary> [SugarColumn(ColumnName = "SALES_DEPT")] public string? SalesDept { get; set; } /// <summary> /// 客æ·è®¢å /// </summary> [SugarColumn(ColumnName = "CUSTOMER_ORDER_NO")] public string? CustomerOrderNo { get; set; } /// <summary> /// éè´§å®¢æ· /// </summary> [SugarColumn(ColumnName = "RETURN_CUSTOMER")] public string? ReturnCustomer { get; set; } /// <summary> /// æ·å®å®¢æ·å¤æ³¨ /// </summary> [SugarColumn(ColumnName = "TAOBAO_REMARK")] public string? TaobaoRemark { get; set; } /// <summary> /// éè´§åå /// </summary> [SugarColumn(ColumnName = "RETURN_REASON")] public string? ReturnReason { get; set; } /// <summary> /// 交货å°ç¹ /// </summary> [SugarColumn(ColumnName = "DELIVERY_LOCATION")] public string? DeliveryLocation { get; set; } /// <summary> /// åºåç»ç» /// </summary> [SugarColumn(ColumnName = "INVENTORY_ORG")] public string? InventoryOrg { get; set; } /// <summary> /// åºåé¨é¨ /// </summary> [SugarColumn(ColumnName = "INVENTORY_DEPT")] public string? InventoryDept { get; set; } /// <summary> /// åºåç» /// </summary> [SugarColumn(ColumnName = "INVENTORY_GROUP")] public string? InventoryGroup { get; set; } /// <summary> /// ä»ç®¡å /// </summary> [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")] public string? WarehouseManager { get; set; } /// <summary> /// éå®ç» /// </summary> [SugarColumn(ColumnName = "SALES_GROUP")] public string? SalesGroup { get; set; } /// <summary> /// éå®å /// </summary> [SugarColumn(ColumnName = "SALES_PERSON")] public string? SalesPerson { get; set; } /// <summary> /// å¿«éåå· /// </summary> [SugarColumn(ColumnName = "EXPRESS_NO")] public string? ExpressNo { get; set; } /// <summary> /// æ¶è´§æ¹ /// </summary> [SugarColumn(ColumnName = "RECEIVER")] public string? Receiver { get; set; } /// <summary> /// æ¶è´§æ¹è系人 /// </summary> [SugarColumn(ColumnName = "RECEIVER_CONTACT")] public string? ReceiverContact { get; set; } /// <summary> /// æ¶è´§æ¹å°å /// </summary> [SugarColumn(ColumnName = "RECEIVER_ADDRESS")] public string? ReceiverAddress { get; set; } /// <summary> /// æ¶è´§æ¹å§å /// </summary> [SugarColumn(ColumnName = "RECEIVER_NAME")] public string? ReceiverName { get; set; } /// <summary> /// ç»ç®æ¹ /// </summary> [SugarColumn(ColumnName = "SETTLE_PARTY")] public string? SettleParty { get; set; } /// <summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "CREATED_BY")] public string? CreatedBy { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "CREATED_DATE")] public DateTime? CreatedDate { get; set; } /// <summary> /// ä¿®æ¹äºº /// </summary> [SugarColumn(ColumnName = "MODIFIED_BY")] public string? ModifiedBy { get; set; } /// <summary> /// ä¿®æ¹æ¶é´ /// </summary> [SugarColumn(ColumnName = "MODIFIED_DATE")] public DateTime? ModifiedDate { get; set; } /// <summary> /// å ³é人 /// </summary> [SugarColumn(ColumnName = "CLOSED_BY")] public string? ClosedBy { get; set; } /// <summary> /// å ³éåå /// </summary> [SugarColumn(ColumnName = "CLOSE_REASON")] public string? CloseReason { get; set; } /// <summary> /// å ³éæ¥æ /// </summary> [SugarColumn(ColumnName = "CLOSE_DATE")] public DateTime? CloseDate { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "APPROVED_BY")] public string? ApprovedBy { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "APPROVED_DATE")] public DateTime? ApprovedDate { get; set; } /// <summary> /// ä½åºç¶æ /// </summary> [SugarColumn(ColumnName = "CANCEL_STATUS")] public string? CancelStatus { get; set; } /// <summary> /// ä½åºäºº /// </summary> [SugarColumn(ColumnName = "CANCELLED_BY")] public string? CancelledBy { get; set; } /// <summary> /// ä½åºæ¥æ /// </summary> [SugarColumn(ColumnName = "CANCEL_DATE")] public DateTime? CancelDate { get; set; } /// <summary> /// å ³éç¶æ /// </summary> [SugarColumn(ColumnName = "CLOSE_STATUS")] public string? CloseStatus { get; set; } /// <summary> /// æ¯å¦æå¨å ³é /// </summary> [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")] public string? ManualCloseFlag { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public string? ErpId { get; set; } /// <summary> /// åæ®ç¶æ /// </summary> [SugarColumn(ColumnName = "BILL_STATUS")] public string? BillStatus { get; set; } /// <summary> /// æ£æ¥ç¶æ /// </summary> [SugarColumn(ColumnName = "checkStatus")] public bool? CheckStatus { get; set; } /// <summary> /// å®ç»ç¶æ /// </summary> [SugarColumn(ColumnName = "finishStatus")] public bool? FinishStatus { get; set; } /// <summary> /// éå®è®¢åå· /// </summary> [SugarColumn(ColumnName = "SALES_ORDER_ID")] public Guid? SalesOrderId { get; set; } } entity/SalesReturnNoticeDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,184 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®éè´§éç¥åæç»è¡¨ /// </summary> [SugarTable("SALES_RETURN_NOTICE_DETAIL")] public class SalesReturnNoticeDetail { /// <summary> /// ä¸»é® /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public Guid? Id { get; set; } /// <summary> /// ç³è¯·åä¸»é® /// </summary> [SugarColumn(ColumnName = "pid")] public Guid? Pid { get; set; } /// <summary> /// ç©æID /// </summary> [SugarColumn(ColumnName = "MATERIAL_ID")] public string? MaterialId { get; set; } /// <summary> /// ç©æåç§° /// </summary> [SugarColumn(ColumnName = "MATERIAL_NAME")] public string? MaterialName { get; set; } /// <summary> /// ç©æè§æ ¼ /// </summary> [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")] public string? MaterialSpecification { get; set; } /// <summary> /// éå®åä½ /// </summary> [SugarColumn(ColumnName = "SALES_UNIT_ID")] public string? SalesUnitId { get; set; } /// <summary> /// é宿°é /// </summary> [SugarColumn(ColumnName = "SALES_QUANTITY")] public decimal? SalesQuantity { get; set; } /// <summary> /// æ¯å¦èµ å /// </summary> [SugarColumn(ColumnName = "IS_FREE")] public bool? IsFree { get; set; } /// <summary> /// éè´§æ¥æ /// </summary> [SugarColumn(ColumnName = "RETURN_DATE")] public DateTime? ReturnDate { get; set; } /// <summary> /// ä»åº /// </summary> [SugarColumn(ColumnName = "WAREHOUSE")] public string? Warehouse { get; set; } /// <summary> /// 计åè·è¸ªå· /// </summary> [SugarColumn(ColumnName = "PLAN_TRACKING_NUMBER")] public string? PlanTrackingNumber { get; set; } /// <summary> /// æ¹å· /// </summary> [SugarColumn(ColumnName = "LOT_NUMBER")] public string? LotNumber { get; set; } /// <summary> /// 夿³¨ /// </summary> [SugarColumn(ColumnName = "NOTE")] public string? Note { get; set; } /// <summary> /// éè´§ç±»å /// </summary> [SugarColumn(ColumnName = "RETURN_TYPE")] public string? ReturnType { get; set; } /// <summary> /// è·åå /// </summary> [SugarColumn(ColumnName = "SALES_CLERK")] public string? SalesClerk { get; set; } /// <summary> /// åºååä½ /// </summary> [SugarColumn(ColumnName = "INVENTORY_UNIT")] public string? InventoryUnit { get; set; } /// <summary> /// åºåæ°é /// </summary> [SugarColumn(ColumnName = "INVENTORY_QUANTITY")] public decimal? InventoryQuantity { get; set; } /// <summary> /// ç©æç±»å« /// </summary> [SugarColumn(ColumnName = "MATERIAL_CATEGORY")] public string? MaterialCategory { get; set; } /// <summary> /// 货主类å /// </summary> [SugarColumn(ColumnName = "OWNER_TYPE_ID")] public string? OwnerTypeId { get; set; } /// <summary> /// 货主 /// </summary> [SugarColumn(ColumnName = "OWNER_ID")] public string? OwnerId { get; set; } /// <summary> /// æºåç±»å /// </summary> [SugarColumn(ColumnName = "SOURCE_BILL_TYPE")] public string? SourceBillType { get; set; } /// <summary> /// æºååå· /// </summary> [SugarColumn(ColumnName = "SOURCE_BILL_NO")] public string? SourceBillNo { get; set; } /// <summary> /// 订ååå· /// </summary> [SugarColumn(ColumnName = "ORDER_BILL_NO")] public string? OrderBillNo { get; set; } /// <summary> /// ERPè¡ID /// </summary> [SugarColumn(ColumnName = "ERP_LINE_ID")] public string? ErpLineId { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "ERP_HEAD_ID")] public string? ErpHeadId { get; set; } /// <summary> /// ç³è¯·æ°é /// </summary> [SugarColumn(ColumnName = "SQ_Qty")] public decimal? SqQty { get; set; } /// <summary> /// å·²æ«æ°é /// </summary> [SugarColumn(ColumnName = "YS_Qty")] public decimal? YsQty { get; set; } /// <summary> /// éè´§åæç»GUID /// </summary> [SugarColumn(ColumnName = "DELIVE_DETAIL_GUID")] public Guid? DeliverDetailGuid { get; set; } /// <summary> /// åºå· /// </summary> [SugarColumn(ColumnName = "FSEQ")] public int? FSeq { get; set; } } service/Warehouse/MesXsthManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,129 @@ using Masuit.Tools; using MES.Service.Modes; using NewPdaSqlServer.DB; using NewPdaSqlServer.Dto.service; using NewPdaSqlServer.entity; using NewPdaSqlServer.util; using OracleInternal.Sharding; using SqlSugar; using SqlSugar.Extensions; using System.Data; using System.Data.SqlClient; namespace NewPdaSqlServer.service.Warehouse; public class MesXsthManager : Repository<MesItemBl> { /// <summary> /// è·åéå®éè´§ç³è¯·å表 /// </summary> /// <returns>éå®éè´§ç³è¯·å表</returns> public List<string> GetXsthBillNo(WarehouseQuery query) { var list = Db.Queryable<SalesReturnNotice>() .Where(s => s.CheckStatus == true) .Select(s => s.BillNo).ToList(); return list; } /// <summary> /// æ ¹æ®åå·è·åMESç©æè¡¨æç» /// </summary> /// <param name="query">ä»åºæ¥è¯¢åæ°</param> /// <returns>ç©ææç»å表</returns> public List<ItemDetailModel> GetMesItemDetailByBillNo( WarehouseQuery query) { // å ³èæ¥è¯¢ç©æè¡¨ãç©ææç»è¡¨åç©æåºç¡ä¿¡æ¯è¡¨ var mesItemTblDetails = Db .Queryable<SalesReturnNotice, SalesReturnNoticeDetail, MesItems>( (a, b, c) => new JoinQueryInfos( JoinType.Left, a.Id == b.Pid, JoinType.Left, b.MaterialId == c.Id.ToString()) ).Where((a, b, c) => a.BillNo == query.billNo && a.CheckStatus == true) .Select<ItemDetailModel>((a, b, c) => new ItemDetailModel { ItemNo = c.ItemNo, ItemName = c.ItemName, ItemModel = c.ItemModel, FQty = b.SqQty, // ç³è¯·æ°é SQty = b.YsQty, // å·²æ«æ°é Pid = b.Pid.ToString(), FMaterialId = b.MaterialId, Id = b.Id.ToString() }).ToList(); // çéåºå¾ éæ°é大äºå·²éæ°éçè®°å½ //var itemTblDetails = mesItemTblDetails // .Where(s => (s.Tld005 ?? 0) - (s.Tld006 ?? 0) > 0).ToList(); return mesItemTblDetails; } /// <summary> /// éå®éè´§å ¥åº /// </summary> /// <param name="unity"></param> /// <returns></returns> /// <exception cref="Exception"></exception> public string XsthScanBarcode(WarehouseQuery unity) { var _strMsg = ""; var _intSum = ""; using (var conn = new SqlConnection(DbHelperSQL.strConn)) { if (unity.userName.IsNullOrEmpty()) throw new Exception("ç¨æ·åä¸å 许为空"); if (unity.sectionCode.IsNullOrEmpty()) throw new Exception("åºä½ç¼å·ä¸å 许为空"); if (unity.barcode.IsNullOrEmpty()) throw new Exception("æ¡ç ä¸å 许为空"); if (unity.billNo.IsNullOrEmpty()) throw new Exception("ç³è¯·åå·ä¸å 许为空"); using (var cmd = new SqlCommand("[prc_pda_inv_xsth]", conn)) { try { conn.Open(); cmd.CommandType = CommandType.StoredProcedure; SqlParameter[] parameters = { new("@po_outMsg", SqlDbType.NVarChar, 300), new("@po_outSum", SqlDbType.NVarChar, 300), //new("@po_womInBarSum", SqlDbType.NVarChar, 300), new("@pi_user", unity.userName), new("@pi_barcode", unity.barcode), new("@pi_sectionCode", unity.sectionCode), new("@pi_billno", unity.billNo), }; parameters[0].Direction = ParameterDirection.Output; parameters[1].Direction = ParameterDirection.Output; // parameters[2].Direction = ParameterDirection.Output; foreach (var parameter in parameters) cmd.Parameters.Add(parameter); cmd.ExecuteNonQuery(); _strMsg = parameters[0].Value.ToString(); _intSum = parameters[1].Value.ToString(); var result = Convert.ToInt32(_intSum); if (result <= 0) throw new Exception(_strMsg); return _strMsg; //return 0; } catch (Exception ex) { throw new Exception(ex.Message); } finally { conn.Close(); } } } } }