MES.Service/Dto/webApi/ErpQTCKDetailDto.cs
@@ -3,13 +3,13 @@ public class ErpQTCKDetailDto { public string? Type { get; set; } public string? ERPID { get; set; } public string? ERP_HID { get; set; } public decimal? ERPID { get; set; } public decimal? ERP_HID { get; set; } public string? FMaterialId { get; set; } // ç©æç¼ç public string? FMaterialName { get; set; } // ç©æåç§° public string? FModel { get; set; } // è§æ ¼åå· public string? FUnitID { get; set; } // åä½ public string? FQty { get; set; } // ç³è¯·æ°é public decimal? FQty { get; set; } // ç³è¯·æ°é public string? FBaseUnitId { get; set; } // åºæ¬åä½ public string? FStockId { get; set; } // ä»åº public string? FStockLocId { get; set; } // ä»ä½ MES.Service/Dto/webApi/ErpQTCKDto.cs
@@ -3,7 +3,7 @@ public class ErpQTCKDto { public string? Type { get; set; } public string? ERPID { get; set; } public decimal? ERPID { get; set; } public string? FBillNo { get; set; } // åæ®ç¼å· public string? FBillTypeID { get; set; } // åæ®ç±»å public string? FDate { get; set; } // ç³è¯·æ¥æ @@ -22,6 +22,7 @@ public string? FCloserId { get; set; } // å ³é人 public string? FCloseDate { get; set; } // å ³éæ¥æ public string? FApplyType { get; set; } // ç³è¯·ç±»å public string? F_UNW_CKLX { get; set; } // ç³è¯·ç±»å } MES.Service/Modes/QTCK.cs
@@ -42,7 +42,7 @@ /// 客æ·ID ///</summary> [SugarColumn(ColumnName = "FCustId")] public decimal? CustId { get; set; } public string CustId { get; set; } /// <summary> /// é¨é¨ID @@ -84,7 +84,7 @@ /// ä¿®æ¹äººID ///</summary> [SugarColumn(ColumnName = "FModifierId")] public decimal? ModifierId { get; set; } public string ModifierId { get; set; } /// <summary> /// ä¿®æ¹æ¥æ @@ -96,7 +96,7 @@ /// 审æ¹äººID ///</summary> [SugarColumn(ColumnName = "FApproverId")] public decimal? ApproverId { get; set; } public string ApproverId { get; set; } /// <summary> /// å®¡æ¹æ¥æ @@ -108,13 +108,13 @@ /// å ³éç¶æ ///</summary> [SugarColumn(ColumnName = "FCloseStatus")] public decimal? CloseStatus { get; set; } public string CloseStatus { get; set; } /// <summary> /// å ³é人ID ///</summary> [SugarColumn(ColumnName = "FCloserId")] public decimal? CloserId { get; set; } public string CloserId { get; set; } /// <summary> /// å ³éæ¥æ @@ -128,6 +128,12 @@ [SugarColumn(ColumnName = "FApplyType")] public string ApplyType { get; set; } /// <summary> /// åºåºç±»å ///</summary> [SugarColumn(ColumnName = "F_UNW_CKLX")] public string F_UNW_CKLX { get; set; } } } MES.Service/Modes/QTCKDetail.cs
@@ -94,7 +94,7 @@ /// 货主 ///</summary> [SugarColumn(ColumnName = "FOwnerId")] public decimal? OwnerId { get; set; } public string OwnerId { get; set; } /// <summary> /// 计åè·è¸ªå· MES.Service/bin/Debug/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdbBinary files differ
MES.Service/service/BasicData/ErpQTCKManager.cs
@@ -73,7 +73,7 @@ //var baOrUpdate = QTCKDetailManager.InsertRange(mesQTCKDatas); //if (orUpdate && baOrUpdate) return true; UseTransaction(db => var update_res=UseTransaction(db => { var id = db.Insertable(mesQTCK).ExecuteReturnIdentity(); @@ -88,7 +88,7 @@ return 1; }); if (update_res==1) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } @@ -122,20 +122,21 @@ BillNo = erpDto.FBillNo, FDate = ParseDateTime(erpDto.FDate) ?? null, BillType = erpDto.FBillTypeID, // åæ®ç±»å CustId = Convert.ToDecimal(erpDto.FCustId), // 客æ·ID CustId = erpDto.FCustId, // 客æ·ID DeptId = erpDto.FDeptId, //éå®é¨é¨ BizType = erpDto.FBizType, // OwnerTypeIdHead = erpDto.FOwnerTypeIdHead, // Note = erpDto.FNote, // CreatorId = erpDto.FCreatorId, // CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // ModifierId = Convert.ToDecimal(erpDto.FModifierId), // ModifierId = erpDto.FModifierId, // ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // CloseStatus = Convert.ToDecimal(erpDto.FCloseStatus), // CloserId = Convert.ToDecimal(erpDto.FCloserId), // CloseStatus = erpDto.FCloseStatus, // CloserId = erpDto.FCloserId, // CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // ApplyType = erpDto.FApplyType ApplyType = erpDto.FApplyType, F_UNW_CKLX= erpDto.F_UNW_CKLX }; @@ -183,7 +184,7 @@ StockLocId = erpDto.FStockLocId,// Lot = erpDto.FLot,// OwnerTypeId = erpDto.FOwnerTypeId,// OwnerId = Convert.ToDecimal(erpDto.FOwnerId),// OwnerId = erpDto.FOwnerId,// MtoNo = erpDto.FMtoNo,// StockStatusId = erpDto.FStockStatusId,// EntryNote = erpDto.FEntryNote,// MESApplication/Controllers/BasicData/ErpQTCKController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,271 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using SqlSugar; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using System.Dynamic; using MES.Service.Modes; using MES.Service.service; using MES.Service.util; using MES.Service.service.BasicData; using MES.Service.Dto.webApi; using Newtonsoft.Json; namespace MESApplication.Controllers { [ApiController] [Route("api/[controller]")] public class ErpQTCKController : ControllerBase { private readonly MessageCenterManager _manager = new(); private QTCKManager m = new QTCKManager(); private readonly string METHOD = "POST"; private readonly string TableName = "MES_ERPQTCK"; private readonly string URL = "http://localhost:10054/api/ErpQTCK/"; // [HttpPost("Save")] public ResponseResult Save(ErpQTCK QTCKOrder) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "Save"; entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(QTCKOrder); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var save = m.Save(QTCKOrder); resultInfos.tbBillList = save; entity.Result = 0; if (save) 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); } } [HttpPost("SaveList")] public ResponseResult SaveList(List<ErpQTCK> units) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "SaveList"; entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(units); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var save = m.SaveList(units); resultInfos.tbBillList = save; entity.Result = 0; if (save) 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); } } /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <summary> /// è·åææ /// </summary> /// <returns></returns> [HttpPost("GetList")] public ResponseResult GetList() { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.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 = m.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 = m.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] QTCK data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.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] QTCK data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.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] QTCK data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.Update(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } } } MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@ <Project> <PropertyGroup> <_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl> <History>True|2025-01-13T07:35:48.6521519Z||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History> <History>True|2025-02-27T02:43:45.2314689Z||;True|2025-02-21T16:39:35.2452658+08:00||;True|2025-01-13T15:35:48.6521519+08:00||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History> <LastFailureDetails /> </PropertyGroup> </Project> MESApplication/bin/Debug/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -66,6 +66,42 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.GetList"> <summary> è·åææ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.GetById(System.Int32)"> <summary> æ ¹æ®ä¸»é®è·å </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.DeleteByIds(System.Object[])"> <summary> æ ¹æ®ä¸»é®å é¤ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.Add(MES.Service.Modes.QTCK)"> <summary> æ·»å </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.InsertReturnIdentity(MES.Service.Modes.QTCK)"> <summary> æ·»å è¿åèªå¢ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.Update(MES.Service.Modes.QTCK)"> <summary> ä¿®æ¹ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.MesCustomerController.GetList"> <summary> è·åææ MESApplication/bin/Release/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -66,6 +66,42 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.GetList"> <summary> è·åææ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.GetById(System.Int32)"> <summary> æ ¹æ®ä¸»é®è·å </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.DeleteByIds(System.Object[])"> <summary> æ ¹æ®ä¸»é®å é¤ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.Add(MES.Service.Modes.QTCK)"> <summary> æ·»å </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.InsertReturnIdentity(MES.Service.Modes.QTCK)"> <summary> æ·»å è¿åèªå¢ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.Update(MES.Service.Modes.QTCK)"> <summary> ä¿®æ¹ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.MesCustomerController.GetList"> <summary> è·åææ MESApplication/bin/Release/net8.0/publish/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -66,6 +66,42 @@ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.GetList"> <summary> è·åææ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.GetById(System.Int32)"> <summary> æ ¹æ®ä¸»é®è·å </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.DeleteByIds(System.Object[])"> <summary> æ ¹æ®ä¸»é®å é¤ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.Add(MES.Service.Modes.QTCK)"> <summary> æ·»å </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.InsertReturnIdentity(MES.Service.Modes.QTCK)"> <summary> æ·»å è¿åèªå¢ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.ErpQTCKController.Update(MES.Service.Modes.QTCK)"> <summary> ä¿®æ¹ </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.MesCustomerController.GetList"> <summary> è·åææ