MES.Service/Dto/webApi/ErpItems.cs
@@ -25,7 +25,7 @@ public string? FForbidStatus { get; set; } public string? FErpClsID { get; set; } public string? FWorkShopId { get; set; } public string? FPRODUCEUNITID { get; set; } public string? FSUBCONUNITID { get; set; } } MES.Service/Dto/webApi/ErpRohIn.cs
@@ -39,4 +39,9 @@ public string? FModifyDate { get; set; } public string? FApproverId { get; set; } public string? FApproveDate { get; set; } public string? FCHANGEREASON { get; set; } //éè´è®¢åA éè´è®¢ååæ´åB public string? FBILLTYPE { get; set; } } MES.Service/Dto/webApi/ErpShipment.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ namespace MES.Service.Dto.webApi; public class ErpShipment { public ErpShipmentNotice ShipmentNotice { get; set; } public List<ErpShipmentDetail> ShipmentDetails { get; set; } } MES.Service/Dto/webApi/ErpShipmentDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,20 @@ namespace MES.Service.Dto.webApi; public class ErpShipmentDetail { public string ErpId { get; set; } public string? ErpHeadId { get; set; } public string? FMaterialID { get; set; } public string? FMaterialName { get; set; } public string? FMateriaModel { get; set; } public string? FAmount { get; set; } public string? FPrice { get; set; } public string? FQty { get; set; } public string? FLot { get; set; } public string? FNoteEntry { get; set; } public string? F_UNW_Text_xsddh { get; set; } public string? FSOEntryId { get; set; } public string? FBasePrice { get; set; } public string? FStockID { get; set; } public string? FBaseUnitID { get; set; } } MES.Service/Dto/webApi/ErpShipmentNotice.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,16 @@ namespace MES.Service.Dto.webApi; public class ErpShipmentNotice { public string? FCreatorId { get; set; } public string? FBillNo { get; set; } public string? FApproverID { get; set; } public string? FCreateDate { get; set; } public string? FApproveDate { get; set; } public string? FSaleDeptId { get; set; } public string? FCustomerID { get; set; } public string? FNote { get; set; } public string? FSalesManID { get; set; } public string ERPId { get; set; } public string? Type { get; set; } } MES.Service/Modes/MesRohIn.cs
@@ -28,7 +28,7 @@ public string? DocumentStatus { get; set; } /// <summary> /// åæ®ç±»å 1ãéè´ 2ãå§å¤ /// åæ®ç±»å /// </summary> [SugarColumn(ColumnName = "DOCUMENT_TYPE")] public string? DocumentType { get; set; } @@ -236,6 +236,12 @@ /// <summary> /// èªå®ä¹å段1 /// </summary> [SugarColumn(ColumnName = "changereason")] public string? Changereason { get; set; } /// <summary> /// èªå®ä¹å段1 /// </summary> [SugarColumn(ColumnName = "REMARK1")] public string? Remark1 { get; set; }
@@ -323,7 +323,7 @@ /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public decimal? ErpId { get; set; } /// <summary> /// éè´è®¢åè¡å· /// </summary> @@ -333,18 +333,18 @@ /// <summary> /// éæ±ç»ç» /// </summary> [SugarColumn(ColumnName = "ERP_ID")] [SugarColumn(ColumnName = "DEMAND")] public string? Demand { get; set; } /// <summary> /// æ¶æç»ç» /// </summary> [SugarColumn(ColumnName = "ERP_ID")] [SugarColumn(ColumnName = "RECEIVING")] public string? Receiving { get; set; } /// <summary> /// ç»ç®ç»ç» /// </summary> [SugarColumn(ColumnName = "ERP_ID")] [SugarColumn(ColumnName = "SETTLEMENT")] public string? Settlement { get; set; } } MES.Service/Modes/MesSupplier.cs
@@ -11,13 +11,13 @@ /// <summary> /// ID /// </summary> [SugarColumn(ColumnName = "ID")] [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [SugarColumn(ColumnName = "SUPP_NO", IsPrimaryKey = true)] [SugarColumn(ColumnName = "SUPP_NO")] public string? SuppNo { get; set; } /// <summary> MES.Service/Modes/SalesOrder.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,112 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®è®¢å表 /// </summary> [SugarTable("SALES_ORDER")] public class SalesOrder { /// <summary> /// SEQ_salesåºå /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 订ååå· /// </summary> [SugarColumn(ColumnName = "ORDER_ID")] public string OrderId { get; set; } /// <summary> /// 订ååå« /// </summary> [SugarColumn(ColumnName = "ORDER_TYPE")] public string OrderType { get; set; } /// <summary> /// å订æ¥æ /// </summary> [SugarColumn(ColumnName = "ORDER_DATE")] public DateTime? OrderDate { get; set; } /// <summary> /// åæ®çæ¬ /// </summary> [SugarColumn(ColumnName = "DOCUMENT_VERSION")] public long? DocumentVersion { get; set; } /// <summary> /// åæ®æ¥æ /// </summary> [SugarColumn(ColumnName = "DOCUMENT_DATE")] public DateTime? DocumentDate { get; set; } /// <summary> /// å·¥åç¼å· /// </summary> [SugarColumn(ColumnName = "FACTORY_ID")] public string FactoryId { get; set; } /// <summary> /// å·¥åç®ç§° /// </summary> [SugarColumn(ColumnName = "FACTORY_NAME")] public string FactoryName { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [SugarColumn(ColumnName = "CUSTOMER_ID")] public string CustomerId { get; set; } /// <summary> /// 客æ·ç®ç§° /// </summary> [SugarColumn(ColumnName = "CUSTOMER_NAME")] public string CustomerName { get; set; } /// <summary> /// 客æ·åå· /// </summary> [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")] public string CustomerOrderId { get; set; } /// <summary> /// é¨é¨ç¼å· /// </summary> [SugarColumn(ColumnName = "DEPARTMENT_ID")] public string DepartmentId { get; set; } /// <summary> /// æ»æ°é /// </summary> [SugarColumn(ColumnName = "TOTAL_QUANTITY")] public decimal? TotalQuantity { get; set; } /// <summary> /// å¤æ³¨ /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string Remarks { get; set; } /// <summary> /// erpå®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "APPROVAL_DATE")] public DateTime? ApprovalDate { get; set; } /// <summary> /// erpå®¡æ ¸è /// </summary> [SugarColumn(ColumnName = "APPROVER")] public string Approver { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public string ErpId { get; set; } } MES.Service/Modes/SalesOrderDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,113 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®è®¢åæç»è¡¨ /// </summary> [SugarTable("SALES_ORDER_DETAIL")] public class SalesOrderDetail { /// <summary> /// SEQ_salesåºå /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// 订ååå· /// </summary> [SugarColumn(ColumnName = "ORDER_ID")] public string OrderId { get; set; } /// <summary> /// åºå· /// </summary> [SugarColumn(ColumnName = "LINE_NUMBER")] public long? LineNumber { get; set; } /// <summary> /// 产åç¼ç /// </summary> [SugarColumn(ColumnName = "PRODUCT_CODE")] public string ProductCode { get; set; } /// <summary> /// 产åå称 /// </summary> [SugarColumn(ColumnName = "PRODUCT_NAME")] public string ProductName { get; set; } /// <summary> /// 产åè§æ ¼ /// </summary> [SugarColumn(ColumnName = "PRODUCT_SPEC")] public string ProductSpec { get; set; } /// <summary> /// é¢äº¤è´§æ¥æ /// </summary> [SugarColumn(ColumnName = "SCHEDULED_DELIVERY_DATE")] public DateTime? ScheduledDeliveryDate { get; set; } /// <summary> /// 订åæ°é /// </summary> [SugarColumn(ColumnName = "ORDER_QUANTITY")] public decimal? OrderQuantity { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } /// <summary> /// åä»· /// </summary> [SugarColumn(ColumnName = "UNIT_PRICE")] public decimal? UnitPrice { get; set; } /// <summary> /// éé¢ /// </summary> [SugarColumn(ColumnName = "AMOUNT")] public decimal? Amount { get; set; } /// <summary> /// 客æ·äº§åç¼ç /// </summary> [SugarColumn(ColumnName = "CUSTOMER_PRODUCT_CODE")] public string CustomerProductCode { get; set; } /// <summary> /// å·²äº¤è´§æ° /// </summary> [SugarColumn(ColumnName = "DELIVERED_QUANTITY")] public decimal? DeliveredQuantity { get; set; } /// <summary> /// ç»æ /// </summary> [SugarColumn(ColumnName = "IS_CLOSED")] public string IsClosed { get; set; } /// <summary> /// å¤æ³¨ /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string Remarks { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public string ErpId { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "ERP_HEAD_ID")] public string ErpHeadId { get; set; } } MES.Service/Modes/SalesReturnNotice.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,83 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®éè´§éç¥å表 /// </summary> [SugarTable("SALES_RETURN_NOTICE")] public class SalesReturnNotice { /// <summary> /// SEQ_sales /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// å¶å人 /// </summary> [SugarColumn(ColumnName = "CREATED_BY")] public string CreatedBy { get; set; } /// <summary> /// åæ®ç¼å· /// </summary> [SugarColumn(ColumnName = "DOCUMENT_ID")] public string DocumentId { get; set; } /// <summary> /// å®¡æ ¸äººå称 /// </summary> [SugarColumn(ColumnName = "APPROVED_BY")] public string ApprovedBy { get; set; } /// <summary> /// å¶å/å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "CREATED_OR_APPROVED_DATE")] public DateTime? CreatedOrApprovedDate { get; set; } /// <summary> /// é¨é¨ä»£ç /// </summary> [SugarColumn(ColumnName = "DEPARTMENT_CODE")] public string DepartmentCode { get; set; } /// <summary> /// é¨é¨å称 /// </summary> [SugarColumn(ColumnName = "DEPARTMENT_NAME")] public string DepartmentName { get; set; } /// <summary> /// è´è´§åä½ä»£ç /// </summary> [SugarColumn(ColumnName = "PURCHASER_CODE")] public string PurchaserCode { get; set; } /// <summary> /// è´è´§åä½å称 /// </summary> [SugarColumn(ColumnName = "PURCHASER_NAME")] public string PurchaserName { get; set; } /// <summary> /// ä¸å¡å代ç /// </summary> [SugarColumn(ColumnName = "SALESPERSON_CODE")] public string SalespersonCode { get; set; } /// <summary> /// ä¸å¡åå称 /// </summary> [SugarColumn(ColumnName = "SALESPERSON_NAME")] public string SalespersonName { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public string ErpId { get; set; } } MES.Service/Modes/SalesReturnNoticeDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,155 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®éè´§éç¥åæç»è¡¨ /// </summary> [SugarTable("SALES_RETURN_NOTICE_DETAIL")] public class SalesReturnNoticeDetail { /// <summary> /// SEQ_sales /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// åæ®è¡å· /// </summary> [SugarColumn(ColumnName = "LINE_NUMBER")] public long? LineNumber { get; set; } /// <summary> /// 产å代ç /// </summary> [SugarColumn(ColumnName = "PRODUCT_CODE")] public string ProductCode { get; set; } /// <summary> /// 产åå称 /// </summary> [SugarColumn(ColumnName = "PRODUCT_NAME")] public string ProductName { get; set; } /// <summary> /// 产åè§æ ¼ /// </summary> [SugarColumn(ColumnName = "PRODUCT_SPEC")] public string ProductSpec { get; set; } /// <summary> /// éé¢ /// </summary> [SugarColumn(ColumnName = "AMOUNT")] public decimal? Amount { get; set; } /// <summary> /// åä»· /// </summary> [SugarColumn(ColumnName = "UNIT_PRICE")] public decimal? UnitPrice { get; set; } /// <summary> /// æ°é /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> /// åºåºæ°é /// </summary> [SugarColumn(ColumnName = "OUT_QUANTITY")] public decimal? OutQuantity { get; set; } /// <summary> /// æ¹å· /// </summary> [SugarColumn(ColumnName = "BATCH_NUMBER")] public string BatchNumber { get; set; } /// <summary> /// éè´§æ°é /// </summary> [SugarColumn(ColumnName = "RETURN_QUANTITY")] public decimal? ReturnQuantity { get; set; } /// <summary> /// åè´§æ°é /// </summary> [SugarColumn(ColumnName = "DELIVERY_QUANTITY")] public decimal? DeliveryQuantity { get; set; } /// <summary> /// å¤æ³¨ /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string Remarks { get; set; } /// <summary> /// éå®è®¢ååå· /// </summary> [SugarColumn(ColumnName = "SALES_ORDER_ID")] public string SalesOrderId { get; set; } /// <summary> /// éå®è®¢ååå½ /// </summary> [SugarColumn(ColumnName = "SALES_ORDER_ENTRY")] public string SalesOrderEntry { get; set; } /// <summary> /// éå®è®¢åID /// </summary> [SugarColumn(ColumnName = "SALES_ORDER_DETAIL_ID")] public string SalesOrderDetailId { get; set; } /// <summary> /// åºæ¬åä»· /// </summary> [SugarColumn(ColumnName = "BASE_UNIT_PRICE")] public decimal? BaseUnitPrice { get; set; } /// <summary> /// åºæ¬åä½æ°é /// </summary> [SugarColumn(ColumnName = "BASE_UNIT_QUANTITY")] public decimal? BaseUnitQuantity { get; set; } /// <summary> /// ä»åºä»£ç /// </summary> [SugarColumn(ColumnName = "WAREHOUSE_CODE")] public string WarehouseCode { get; set; } /// <summary> /// ä»åºå称 /// </summary> [SugarColumn(ColumnName = "WAREHOUSE_NAME")] public string WarehouseName { get; set; } /// <summary> /// åºæ¬åä½åºåºæ°é /// </summary> [SugarColumn(ColumnName = "BASE_UNIT_OUT_QUANTITY")] public decimal? BaseUnitOutQuantity { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public string ErpId { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "ERP_HEAD_ID")] public string ErpHeadId { get; set; } } MES.Service/Modes/ShipmentDetail.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,155 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®åè´§éç¥åæç»è¡¨ /// </summary> [SugarTable("SHIPMENT_DETAIL")] public class ShipmentDetail { /// <summary> /// SEQ_sales /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public string ErpId { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "ERP_HEAD_ID")] public string ErpHeadId { get; set; } /// <summary> /// åæ®è¡å· /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public long? LineNo { get; set; } /// <summary> /// 产å代ç /// </summary> [SugarColumn(ColumnName = "PROD_CODE")] public string ProdCode { get; set; } /// <summary> /// 产åå称 /// </summary> [SugarColumn(ColumnName = "PROD_NAME")] public string ProdName { get; set; } /// <summary> /// 产åè§æ ¼ /// </summary> [SugarColumn(ColumnName = "PROD_SPEC")] public string ProdSpec { get; set; } /// <summary> /// éé¢ /// </summary> [SugarColumn(ColumnName = "AMOUNT")] public double? Amount { get; set; } /// <summary> /// åä»· /// </summary> [SugarColumn(ColumnName = "UNIT_PRICE")] public double? UnitPrice { get; set; } /// <summary> /// æ°é /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public double? Quantity { get; set; } /// <summary> /// åºåºæ°é /// </summary> [SugarColumn(ColumnName = "OUT_QTY")] public double? OutQty { get; set; } /// <summary> /// æ¹å· /// </summary> [SugarColumn(ColumnName = "BATCH_NO")] public string BatchNo { get; set; } /// <summary> /// éè´§æ°é /// </summary> [SugarColumn(ColumnName = "RETURN_QTY")] public double? ReturnQty { get; set; } /// <summary> /// åè´§æ°é /// </summary> [SugarColumn(ColumnName = "SHIP_QTY")] public double? ShipQty { get; set; } /// <summary> /// å¤æ³¨ /// </summary> [SugarColumn(ColumnName = "REMARKS")] public string Remarks { get; set; } /// <summary> /// éå®è®¢ååå· /// </summary> [SugarColumn(ColumnName = "ORDER_NO")] public string OrderNo { get; set; } /// <summary> /// éå®è®¢ååå½ /// </summary> [SugarColumn(ColumnName = "ORDER_ENTRY")] public string OrderEntry { get; set; } /// <summary> /// éå®è®¢åID /// </summary> [SugarColumn(ColumnName = "ORDER_ID")] public string OrderId { get; set; } /// <summary> /// åºæ¬åä»· /// </summary> [SugarColumn(ColumnName = "BASE_PRICE")] public double? BasePrice { get; set; } /// <summary> /// åºæ¬åä½æ°é /// </summary> [SugarColumn(ColumnName = "BASE_QTY")] public double? BaseQty { get; set; } /// <summary> /// ä»åºä»£ç /// </summary> [SugarColumn(ColumnName = "WAREHOUSE_CODE")] public string WarehouseCode { get; set; } /// <summary> /// ä»åºå称 /// </summary> [SugarColumn(ColumnName = "WAREHOUSE_NAME")] public string WarehouseName { get; set; } /// <summary> /// åºæ¬åä½åºåºæ°é /// </summary> [SugarColumn(ColumnName = "BASE_OUT_QTY")] public double? BaseOutQty { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } } MES.Service/Modes/ShipmentNotice.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,125 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// éå®åè´§éç¥å表 /// </summary> [SugarTable("SHIPMENT_NOTICE")] public class ShipmentNotice { /// <summary> /// SEQ_sales /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// å¶å人 /// </summary> [SugarColumn(ColumnName = "CREATOR")] public string Creator { get; set; } /// <summary> /// åæ®ç¼å· /// </summary> [SugarColumn(ColumnName = "DOC_ID")] public string DocId { get; set; } /// <summary> /// å®¡æ ¸äººå称 /// </summary> [SugarColumn(ColumnName = "APPROVER")] public string Approver { get; set; } /// <summary> /// å¶åæ¥æ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "APPROVE_DATE")] public DateTime? ApproveDate { get; set; } /// <summary> /// é¨é¨ä»£ç /// </summary> [SugarColumn(ColumnName = "DEPT_CODE")] public string DeptCode { get; set; } /// <summary> /// é¨é¨å称 /// </summary> [SugarColumn(ColumnName = "DEPT_NAME")] public string DeptName { get; set; } /// <summary> /// è´è´§åä½ä»£ç /// </summary> [SugarColumn(ColumnName = "BUYER_CODE")] public string BuyerCode { get; set; } /// <summary> /// è´è´§åä½å称 /// </summary> [SugarColumn(ColumnName = "BUYER_NAME")] public string BuyerName { get; set; } /// <summary> /// ä¸å¡å代ç /// </summary> [SugarColumn(ColumnName = "SALES_CODE")] public string SalesCode { get; set; } /// <summary> /// ä¸å¡åå称 /// </summary> [SugarColumn(ColumnName = "SALES_NAME")] public string SalesName { get; set; } /// <summary> /// åæ®ID /// </summary> [SugarColumn(ColumnName = "UNIQUE_ID")] public string UniqueId { get; set; } /// <summary> /// 客æ·ä»£ç /// </summary> [SugarColumn(ColumnName = "CUST_CODE")] public string CustCode { get; set; } /// <summary> /// 客æ·å称 /// </summary> [SugarColumn(ColumnName = "CUST_NAME")] public string CustName { get; set; } /// <summary> /// å表å¤æ³¨ /// </summary> [SugarColumn(ColumnName = "LIST_NOTE")] public string ListNote { get; set; } /// <summary> /// éå®å代ç /// </summary> [SugarColumn(ColumnName = "REP_CODE")] public string RepCode { get; set; } /// <summary> /// éå®åå称 /// </summary> [SugarColumn(ColumnName = "REP_NAME")] public string RepName { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public string ErpId { get; set; } } MES.Service/Modes/SysDepartment.cs
@@ -23,7 +23,7 @@ /// <summary> /// é¨é¨ç¼å· /// </summary> [SugarColumn(ColumnName = "DEPARTMENTCODE", IsPrimaryKey = true)] [SugarColumn(ColumnName = "DEPARTMENTCODE")] public string? Departmentcode { get; set; } /// <summary> @@ -118,7 +118,7 @@ /// <summary> /// </summary> [SugarColumn(ColumnName = "ID")] [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { 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/MesRohInManager.cs
@@ -4,286 +4,244 @@ using MES.Service.util; using SqlSugar; namespace MES.Service.service.BasicData; public class MesRohInManager : Repository<MesRohIn> namespace MES.Service.service.BasicData { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ private readonly MesRohInDataManager rohInDataManager = new(); //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,å¦æè¦éæ°çæ请å é¤ MesRohInManager.cs public bool Save(RohIn rohIn) public class MesRohInManager : Repository<MesRohIn> { var rohInErpRohIn = rohIn.ErpRohIn; var mesRohIn = GetMesRohIn(rohInErpRohIn); var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); switch (rohInErpRohIn.Type) private readonly MesRohInDataManager rohInDataManager = new(); // Save æ¹æ³ç¨äºä¿åå个 RohIn è®°å½ï¼æ ¹æ®ç±»åæ§è¡ä¸åçæä½ public bool Save(RohIn rohIn) { case "1": var insert = base.Insert(mesRohIn); var insertRange = rohInDataManager.InsertRange(mesRohInDatas); var rohInErpRohIn = rohIn.ErpRohIn; var mesRohIn = GetMesRohIn(rohInErpRohIn); var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); if (insert && insertRange) return true; throw new NotImplementedException("æå ¥å¤±è´¥"); case "2": var update = base.Update(mesRohIn); var insertOrUpdate = rohInDataManager.InsertOrUpdate(mesRohInDatas); if (update && insertOrUpdate) return true; throw new NotImplementedException("æ´æ°å¤±è´¥"); case "4": var orUpdate = SaveOrUpdate(mesRohIn); var baOrUpdate = rohInDataManager.InsertOrUpdate(mesRohInDatas); if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("æå ¥å¤±è´¥"); default: throw new NotImplementedException("type没æ" + rohInErpRohIn.Type + "è¿ä¸ªç±»å"); } } private bool SaveOrUpdate(MesRohIn mesRohIn) { var mesRohIns = base.GetList(it => it.EbelnK3id == mesRohIn.EbelnK3id); if (CollectionUtil.IsNullOrEmpty(mesRohIns)) { return base.Insert(mesRohIn); } return base.Update(mesRohIn); } public bool SaveList(List<RohIn> rohIns) { var result = new List<bool>(); rohIns.ForEach(s => { var save = Save(s); result.Add(save); }); return result.All(b => b); } public MesRohIn GetMesRohIn(ErpRohIn rohIn) { var eid = Convert.ToDecimal(rohIn.id); var mesRohIn = new MesRohIn(); if (!"1".Equals(rohIn.Type)) { var single = base.GetSingle(it => it.EbelnK3id == eid); if (single != null) mesRohIn.Id = single.Id; } mesRohIn.EbelnK3id = eid; mesRohIn.BillNo = rohIn.FBillNo; mesRohIn.DocumentStatus = rohIn.FDocumentStatus; mesRohIn.DocumentType = rohIn.FBillTypeID; mesRohIn.BusinessType = rohIn.FBusinessType; if (rohIn.FDate != null) mesRohIn.PurchaseDate = DateTime.ParseExact( rohIn.FDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.Supplier = rohIn.FSupplierId; mesRohIn.CloseStatus = rohIn.FCloseStatus; mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId; mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId; mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId; mesRohIn.QtyAcceptance = rohIn.Facctype; mesRohIn.Purchaser = rohIn.FPurchaserId; mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq; // mesRohIn.SupplierContact = rohIn.F_UNW_GYSLXR; // mesRohIn.ContactPhone = rohIn.F_UNW_LXRDH; // mesRohIn.Position = rohIn.FProviderJob; // mesRohIn.OfficePhone = rohIn.FProviderPhone; // mesRohIn.SupplierAddress = rohIn.FProviderAddress; mesRohIn.SettlementParty = rohIn.FSettleId; mesRohIn.PaymentParty = rohIn.FChargeId; mesRohIn.Email = rohIn.FProviderEMail; mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs; mesRohIn.Remarks = rohIn.F_UNW_BZ; mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj; mesRohIn.CancellationStatus = rohIn.FCancelStatus; mesRohIn.CancellationPerson = rohIn.FCancellerId; if (rohIn.FCancelDate != null) mesRohIn.CancellationDate = DateTime.ParseExact( rohIn.FCancelDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.CreateBy = rohIn.FCreatorId; if (rohIn.FCreateDate != null) mesRohIn.CreateDate = DateTime.ParseExact( rohIn.FCreateDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.LastupdateBy = rohIn.FModifierId; if (rohIn.FModifyDate != null) mesRohIn.LastupdateDate = DateTime.ParseExact( rohIn.FModifyDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.ErpCheckBy = rohIn.FApproverId; mesRohIn.ErpCheckDate = rohIn.FApproveDate; return mesRohIn; } public List<MesRohInData> GetMesRohInDatas(List<ErpRohinData> ErpRohinDatas, string type) { var list = new List<MesRohInData>(); ErpRohinDatas.ForEach(s => { var entity = new MesRohInData(); var eid = Convert.ToDecimal(s.id); if (!"1".Equals(type)) return UseTransaction(db => { var single = rohInDataManager.GetSingle(it => it.EbelnK3id == eid); if (single != null) entity.Id = single.Id; switch (rohInErpRohIn.Type) { case "2": return InsertData(db, mesRohIn, mesRohInDatas, rohInErpRohIn.FBILLTYPE) ? 1 : 0; case "3": return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; case "4": return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; default: throw new NotImplementedException( $"type没æ{rohInErpRohIn.Type}è¿ä¸ªç±»å"); } }) > 0; } // æå ¥æ°æ®çæ¹æ³ private bool InsertData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas, string FBILLTYPE) { switch (FBILLTYPE) { case "A": { var insert = base.Insert(mesRohIn); var insertRange = rohInDataManager.InsertRange(mesRohInDatas); if (insert && insertRange) return true; throw new NotImplementedException("æå ¥å¤±è´¥"); } case "B": { var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); if (base.DeleteById(mesRohIn.Id) && db .Deleteable<MesRohInData>().In(decimals) .ExecuteCommand() > 0) { var insert = base.Insert(mesRohIn); var insertRange = rohInDataManager.InsertRange(mesRohInDatas); if (insert && insertRange) return true; throw new NotImplementedException("æå ¥å¤±è´¥"); } break; } } entity.EbelnK3id = Convert.ToDecimal(s.id); entity.ErpId = Convert.ToDecimal(s.Eid); throw new NotImplementedException("éè´è®¢åç±»åé误"); } entity.BillNo = s.FBillNo; entity.SalesOrderId = s.F_UNW_Text_xsddh; entity.ItemId = s.FMaterialId; entity.PurchaseUnit = s.FUnitId; entity.PurchaseQty = Convert.ToDecimal(s.FQty); entity.InventoryUnit = s.FStockUnitID; entity.PricingUnit = s.FPriceUnitId; entity.PricingQty = Convert.ToDecimal(s.FPriceUnitQty); if (s.FDeliveryDate != null) entity.DeliveryDate = DateTime.ParseExact( s.FDeliveryDate, "yyyy-MM-dd HH:mm:ss", null); if (s.FDeliveryEarlyDate != null) entity.EarliestDeliveryDate = DateTime.ParseExact( s.FDeliveryEarlyDate, "yyyy-MM-dd HH:mm:ss", null); if (s.FDeliveryLastDate != null) entity.LatestDeliveryDate = DateTime.ParseExact( s.FDeliveryLastDate, "yyyy-MM-dd HH:mm:ss", null); entity.IsGift = s.FGiveAway; entity.Remarks = s.FEntryNote; entity.SupplierItemCode = s.FSupMatId; entity.SupplierItemName = s.FSupMatName; entity.OutsourcingOrderId = s.FSUBREQBILLNO; entity.BatchNumber = s.FLot; entity.BusinessClose = s.FMRPCloseStatus; entity.BusinessFreeze = s.FMRPFreezeStatus; entity.Freezer = s.FFreezerId; if (s.FFreezeDate != null) entity.FreezeTime = DateTime.ParseExact( s.FFreezeDate, "yyyy-MM-dd HH:mm:ss", null); entity.BusinessTerminate = s.FMRPTerminateStatus; entity.Terminator = s.FTerminaterId; if (s.FTerminateDate != null) entity.TerminateTime = DateTime.ParseExact( s.FTerminateDate, "yyyy-MM-dd HH:mm:ss", null); entity.TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty); entity.RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty); entity.TotalStoredQty = Convert.ToDecimal(s.FStockInQty); entity.RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty); entity.TotalReturnedQty = Convert.ToDecimal(s.FMrbQty); entity.ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY); entity.ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY); entity.SourceDocumentType = s.FSrcBillTypeId; entity.SourceDocumentId = s.FSrcBillNo; entity.DemandTrackingId = s.FReqTraceNo; entity.PlanTrackingId = s.FMtoNo; entity.ChangeFlag = s.FChangeFlag; entity.DemandSource = s.FDEMANDTYPE; entity.DemandDocumentId = s.FDEMANDBILLNO; entity.DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ; entity.PurchaseOrderLineNumber = s.PurchaseOrderLineNumber; entity.Demand = s.Demand; entity.Receiving = s.Receiving; entity.Settlement = s.Settlement; list.Add(entity); }); return list; } #region æå¦æ¹æ³ /// <summary> /// ä»å¨æ¹æ³æ»¡è¶³ä¸äºå¤æä¸å¡éæ±ï¼ä¸å¡ä»£ç 请å¨è¿éé¢å®ä¹æ¹æ³ /// </summary> public void Study() { /*********æ¥è¯¢*********/ var data1 = base.GetById(1); //æ ¹æ®IDæ¥è¯¢ var data2 = base.GetList(); //æ¥è¯¢ææ var data3 = base.GetList(it => 1 == 1); //æ ¹æ®æ¡ä»¶æ¥è¯¢ //var data4 = base.GetSingle(it => 1 == 1);//æ ¹æ®æ¡ä»¶æ¥è¯¢ä¸æ¡,å¦æè¶ è¿ä¸æ¡ä¼æ¥é var p = new PageModel { PageIndex = 1, PageSize = 2 }; // å页æ¥è¯¢ var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount); //è¿åæ»æ° var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom()); // å页æ¥è¯¢å æåº Console.Write(p.TotalCount); //è¿åæ»æ° var conModels = new List<IConditionalModel>(); //ç»è£ æ¡ä»¶æ¥è¯¢ä½ä¸ºæ¡ä»¶å®ç° å页æ¥è¯¢å æåº conModels.Add(new ConditionalModel // æ´æ°æ°æ®çæ¹æ³ private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { FieldName = typeof(MesRohIn).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" }); //id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); var update = base.Insert(mesRohIn); var insertOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); AsQueryable().Where(x => 1 == 1) .ToList(); //æ¯æäºè½¬æ¢æqueryable,æ们å¯ä»¥ç¨queryableå®ç°å¤æåè½ if (update && insertOrUpdate) return true; throw new NotImplementedException("æ´æ°å¤±è´¥"); } // æå ¥ææ´æ°æ°æ®çæ¹æ³ private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { var orUpdate = base.Insert(mesRohIn); var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } /*********æå ¥*********/ var insertData = new MesRohIn(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æ们å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ // æ¹éä¿åè®°å½çæ¹æ³ public bool SaveList(List<RohIn> rohIns) { var result = rohIns.Select(Save).ToList(); return result.All(b => b); } // å° ErpRohIn 对象转æ¢ä¸º MesRohIn 对象çæ¹æ³ public MesRohIn GetMesRohIn(ErpRohIn rohIn) { var eid = Convert.ToDecimal(rohIn.id); var mesRohIn = new MesRohIn(); /*********æ´æ°*********/ var updateData = new MesRohIn(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new MesRohIn() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®åä¸æ´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ var single = base.GetSingle(it => it.EbelnK3id == eid); if (single != null) mesRohIn.Id = single.Id; mesRohIn.EbelnK3id = eid; mesRohIn.BillNo = rohIn.FBillNo; mesRohIn.DocumentStatus = rohIn.FDocumentStatus; mesRohIn.DocumentType = rohIn.FBillTypeID; mesRohIn.BusinessType = rohIn.FBusinessType; /*********å é¤*********/ var deldata = new MesRohIn(); //æµè¯åæ° base.Delete(deldata); //æ ¹æ®å®ä½å é¤ base.DeleteById(1); //æ ¹æ®ä¸»é®å é¤ base.DeleteById(new[] { 1, 2 }); //æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it => 1 == 2); //æ ¹æ®æ¡ä»¶å é¤ AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ if (rohIn.FDate != null) mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.Supplier = rohIn.FSupplierId; mesRohIn.CloseStatus = rohIn.FCloseStatus; mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId; mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId; mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId; mesRohIn.QtyAcceptance = rohIn.Facctype; mesRohIn.Purchaser = rohIn.FPurchaserId; mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq; mesRohIn.SettlementParty = rohIn.FSettleId; mesRohIn.PaymentParty = rohIn.FChargeId; mesRohIn.Email = rohIn.FProviderEMail; mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs; mesRohIn.Remarks = rohIn.F_UNW_BZ; mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj; mesRohIn.CancellationStatus = rohIn.FCancelStatus; mesRohIn.CancellationPerson = rohIn.FCancellerId; if (rohIn.FCancelDate != null) mesRohIn.CancellationDate = DateTime.ParseExact(rohIn.FCancelDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.CreateBy = rohIn.FCreatorId; if (rohIn.FCreateDate != null) mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.LastupdateBy = rohIn.FModifierId; if (rohIn.FModifyDate != null) mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.ErpCheckBy = rohIn.FApproverId; mesRohIn.ErpCheckDate = rohIn.FApproveDate; mesRohIn.Changereason = rohIn.FCHANGEREASON; return mesRohIn; } // å° ErpRohinData 对象转æ¢ä¸º MesRohInData 对象çæ¹æ³ public List<MesRohInData> GetMesRohInDatas( List<ErpRohinData> erpRohinDatas, string type) { return erpRohinDatas.Select(s => { var entity = new MesRohInData { EbelnK3id = Convert.ToDecimal(s.id), ErpId = Convert.ToDecimal(s.Eid), BillNo = s.FBillNo, SalesOrderId = s.F_UNW_Text_xsddh, ItemId = s.FMaterialId, PurchaseUnit = s.FUnitId, PurchaseQty = Convert.ToDecimal(s.FQty), InventoryUnit = s.FStockUnitID, PricingUnit = s.FPriceUnitId, PricingQty = Convert.ToDecimal(s.FPriceUnitQty), DeliveryDate = s.FDeliveryDate != null ? DateTime.ParseExact(s.FDeliveryDate, "yyyy-MM-dd HH:mm:ss", null) : null, EarliestDeliveryDate = s.FDeliveryEarlyDate != null ? DateTime.ParseExact(s.FDeliveryEarlyDate, "yyyy-MM-dd HH:mm:ss", null) : null, LatestDeliveryDate = s.FDeliveryLastDate != null ? DateTime.ParseExact(s.FDeliveryLastDate, "yyyy-MM-dd HH:mm:ss", null) : null, IsGift = s.FGiveAway, Remarks = s.FEntryNote, SupplierItemCode = s.FSupMatId, SupplierItemName = s.FSupMatName, OutsourcingOrderId = s.FSUBREQBILLNO, BatchNumber = s.FLot, BusinessClose = s.FMRPCloseStatus, BusinessFreeze = s.FMRPFreezeStatus, Freezer = s.FFreezerId, FreezeTime = s.FFreezeDate != null ? DateTime.ParseExact(s.FFreezeDate, "yyyy-MM-dd HH:mm:ss", null) : null, BusinessTerminate = s.FMRPTerminateStatus, Terminator = s.FTerminaterId, TerminateTime = s.FTerminateDate != null ? DateTime.ParseExact(s.FTerminateDate, "yyyy-MM-dd HH:mm:ss", null) : null, TotalReceivedQty = Convert.ToDecimal(s.FReceiveQty), RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty), TotalStoredQty = Convert.ToDecimal(s.FStockInQty), RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty), TotalReturnedQty = Convert.ToDecimal(s.FMrbQty), ReturnableReceivedQty = Convert.ToDecimal(s.FCHECKRETQTY), ReturnableStoredQty = Convert.ToDecimal(s.FSTOCKRETQTY), SourceDocumentType = s.FSrcBillTypeId, SourceDocumentId = s.FSrcBillNo, DemandTrackingId = s.FReqTraceNo, PlanTrackingId = s.FMtoNo, ChangeFlag = s.FChangeFlag, DemandSource = s.FDEMANDTYPE, DemandDocumentId = s.FDEMANDBILLNO, DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ, PurchaseOrderLineNumber = s.PurchaseOrderLineNumber, Demand = s.Demand, Receiving = s.Receiving, Settlement = s.Settlement }; var single = rohInDataManager.GetSingle(it => it.EbelnK3id == entity.EbelnK3id); if (single != null) entity.Id = single.Id; return entity; }).ToList(); } } #endregion } MES.Service/service/BasicData/MesStaffManager.cs
@@ -64,7 +64,11 @@ var exists = db.Queryable<SysUser>().Any(u => u.Sid == sysUser.Sid); if (exists) { var updateUser = db.Updateable(sysUser).ExecuteCommand(); var updateUser = db.Updateable<SysUser>() .SetColumns(s=>s.Fcode == sysUser.Fcode) .SetColumns(s=>s.Fname == sysUser.Fname) .Where(s=>s.Sid == sysUser.Sid) .ExecuteCommand(); if (updateUser > 0) { var updateStaff = db.Updateable(entity).ExecuteCommand(); MES.Service/service/BasicData/MesSupplierManager.cs
@@ -28,7 +28,7 @@ return 1; break; case "3": if (DeleteSupplier(db, entity.Id)) if (DeleteSupplier(entity.Id)) return 1; break; case "4": @@ -108,12 +108,9 @@ throw new NotImplementedException("æå ¥å¤±è´¥"); } private bool DeleteSupplier(SqlSugarScope db, decimal supplierId) private bool DeleteSupplier(decimal supplierId) { var deleteById = db.Deleteable<MesSupplier>().In(supplierId) .ExecuteCommand(); if (deleteById > 0) return true; if (base.DeleteById(supplierId)) return true; throw new NotImplementedException("å é¤å¤±è´¥"); } MES.Service/service/BasicData/SalesOrderDetailManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; public class SalesOrderDetailManager : Repository<SalesOrderDetail> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,å¦æè¦éæ°çæ请å é¤ SalesOrderDetailManager.cs #region æå¦æ¹æ³ /// <summary> /// ä»å¨æ¹æ³æ»¡è¶³ä¸äºå¤æä¸å¡éæ±ï¼ä¸å¡ä»£ç 请å¨è¿éé¢å®ä¹æ¹æ³ /// </summary> public void Study() { /*********æ¥è¯¢*********/ var data1 = base.GetById(1); //æ ¹æ®IDæ¥è¯¢ var data2 = base.GetList(); //æ¥è¯¢ææ var data3 = base.GetList(it => 1 == 1); //æ ¹æ®æ¡ä»¶æ¥è¯¢ //var data4 = base.GetSingle(it => 1 == 1);//æ ¹æ®æ¡ä»¶æ¥è¯¢ä¸æ¡,å¦æè¶ è¿ä¸æ¡ä¼æ¥é var p = new PageModel { PageIndex = 1, PageSize = 2 }; // å页æ¥è¯¢ var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount); //è¿åæ»æ° var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom()); // å页æ¥è¯¢å æåº Console.Write(p.TotalCount); //è¿åæ»æ° var conModels = new List<IConditionalModel>(); //ç»è£ æ¡ä»¶æ¥è¯¢ä½ä¸ºæ¡ä»¶å®ç° å页æ¥è¯¢å æåº conModels.Add(new ConditionalModel { FieldName = typeof(SalesOrderDetail).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" }); //id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); AsQueryable().Where(x => 1 == 1) .ToList(); //æ¯æäºè½¬æ¢æqueryable,æ们å¯ä»¥ç¨queryableå®ç°å¤æåè½ /*********æå ¥*********/ var insertData = new SalesOrderDetail(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æ们å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new SalesOrderDetail(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new SalesOrderDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®åä¸æ´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new SalesOrderDetail(); //æµè¯åæ° base.Delete(deldata); //æ ¹æ®å®ä½å é¤ base.DeleteById(1); //æ ¹æ®ä¸»é®å é¤ base.DeleteById(new[] { 1, 2 }); //æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it => 1 == 2); //æ ¹æ®æ¡ä»¶å é¤ AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ } #endregion } MES.Service/service/BasicData/SalesOrderManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; public class SalesOrderManager : Repository<SalesOrder> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,å¦æè¦éæ°çæ请å é¤ SalesOrderManager.cs #region æå¦æ¹æ³ /// <summary> /// ä»å¨æ¹æ³æ»¡è¶³ä¸äºå¤æä¸å¡éæ±ï¼ä¸å¡ä»£ç 请å¨è¿éé¢å®ä¹æ¹æ³ /// </summary> public void Study() { /*********æ¥è¯¢*********/ var data1 = base.GetById(1); //æ ¹æ®IDæ¥è¯¢ var data2 = base.GetList(); //æ¥è¯¢ææ var data3 = base.GetList(it => 1 == 1); //æ ¹æ®æ¡ä»¶æ¥è¯¢ //var data4 = base.GetSingle(it => 1 == 1);//æ ¹æ®æ¡ä»¶æ¥è¯¢ä¸æ¡,å¦æè¶ è¿ä¸æ¡ä¼æ¥é var p = new PageModel { PageIndex = 1, PageSize = 2 }; // å页æ¥è¯¢ var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount); //è¿åæ»æ° var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom()); // å页æ¥è¯¢å æåº Console.Write(p.TotalCount); //è¿åæ»æ° var conModels = new List<IConditionalModel>(); //ç»è£ æ¡ä»¶æ¥è¯¢ä½ä¸ºæ¡ä»¶å®ç° å页æ¥è¯¢å æåº conModels.Add(new ConditionalModel { FieldName = typeof(SalesOrder).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" }); //id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); AsQueryable().Where(x => 1 == 1) .ToList(); //æ¯æäºè½¬æ¢æqueryable,æ们å¯ä»¥ç¨queryableå®ç°å¤æåè½ /*********æå ¥*********/ var insertData = new SalesOrder(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æ们å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new SalesOrder(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new SalesOrder() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®åä¸æ´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new SalesOrder(); //æµè¯åæ° base.Delete(deldata); //æ ¹æ®å®ä½å é¤ base.DeleteById(1); //æ ¹æ®ä¸»é®å é¤ base.DeleteById(new[] { 1, 2 }); //æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it => 1 == 2); //æ ¹æ®æ¡ä»¶å é¤ AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ } #endregion } MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,79 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; public class SalesReturnNoticeDetailManager : Repository<SalesReturnNoticeDetail> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,å¦æè¦éæ°çæ请å é¤ SalesReturnNoticeDetailManager.cs #region æå¦æ¹æ³ /// <summary> /// ä»å¨æ¹æ³æ»¡è¶³ä¸äºå¤æä¸å¡éæ±ï¼ä¸å¡ä»£ç 请å¨è¿éé¢å®ä¹æ¹æ³ /// </summary> public void Study() { /*********æ¥è¯¢*********/ var data1 = base.GetById(1); //æ ¹æ®IDæ¥è¯¢ var data2 = base.GetList(); //æ¥è¯¢ææ var data3 = base.GetList(it => 1 == 1); //æ ¹æ®æ¡ä»¶æ¥è¯¢ //var data4 = base.GetSingle(it => 1 == 1);//æ ¹æ®æ¡ä»¶æ¥è¯¢ä¸æ¡,å¦æè¶ è¿ä¸æ¡ä¼æ¥é var p = new PageModel { PageIndex = 1, PageSize = 2 }; // å页æ¥è¯¢ var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount); //è¿åæ»æ° var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom()); // å页æ¥è¯¢å æåº Console.Write(p.TotalCount); //è¿åæ»æ° var conModels = new List<IConditionalModel>(); //ç»è£ æ¡ä»¶æ¥è¯¢ä½ä¸ºæ¡ä»¶å®ç° å页æ¥è¯¢å æåº conModels.Add(new ConditionalModel { FieldName = typeof(SalesReturnNoticeDetail).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" }); //id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); AsQueryable().Where(x => 1 == 1) .ToList(); //æ¯æäºè½¬æ¢æqueryable,æ们å¯ä»¥ç¨queryableå®ç°å¤æåè½ /*********æå ¥*********/ var insertData = new SalesReturnNoticeDetail(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æ们å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new SalesReturnNoticeDetail(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new SalesReturnNoticeDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®åä¸æ´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new SalesReturnNoticeDetail(); //æµè¯åæ° base.Delete(deldata); //æ ¹æ®å®ä½å é¤ base.DeleteById(1); //æ ¹æ®ä¸»é®å é¤ base.DeleteById(new[] { 1, 2 }); //æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it => 1 == 2); //æ ¹æ®æ¡ä»¶å é¤ AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ } #endregion } MES.Service/service/BasicData/SalesReturnNoticeManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; public class SalesReturnNoticeManager : Repository<SalesReturnNotice> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,å¦æè¦éæ°çæ请å é¤ SalesReturnNoticeManager.cs #region æå¦æ¹æ³ /// <summary> /// ä»å¨æ¹æ³æ»¡è¶³ä¸äºå¤æä¸å¡éæ±ï¼ä¸å¡ä»£ç 请å¨è¿éé¢å®ä¹æ¹æ³ /// </summary> public void Study() { /*********æ¥è¯¢*********/ var data1 = base.GetById(1); //æ ¹æ®IDæ¥è¯¢ var data2 = base.GetList(); //æ¥è¯¢ææ var data3 = base.GetList(it => 1 == 1); //æ ¹æ®æ¡ä»¶æ¥è¯¢ //var data4 = base.GetSingle(it => 1 == 1);//æ ¹æ®æ¡ä»¶æ¥è¯¢ä¸æ¡,å¦æè¶ è¿ä¸æ¡ä¼æ¥é var p = new PageModel { PageIndex = 1, PageSize = 2 }; // å页æ¥è¯¢ var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount); //è¿åæ»æ° var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom()); // å页æ¥è¯¢å æåº Console.Write(p.TotalCount); //è¿åæ»æ° var conModels = new List<IConditionalModel>(); //ç»è£ æ¡ä»¶æ¥è¯¢ä½ä¸ºæ¡ä»¶å®ç° å页æ¥è¯¢å æåº conModels.Add(new ConditionalModel { FieldName = typeof(SalesReturnNotice).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" }); //id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); AsQueryable().Where(x => 1 == 1) .ToList(); //æ¯æäºè½¬æ¢æqueryable,æ们å¯ä»¥ç¨queryableå®ç°å¤æåè½ /*********æå ¥*********/ var insertData = new SalesReturnNotice(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æ们å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new SalesReturnNotice(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new SalesReturnNotice() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®åä¸æ´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new SalesReturnNotice(); //æµè¯åæ° base.Delete(deldata); //æ ¹æ®å®ä½å é¤ base.DeleteById(1); //æ ¹æ®ä¸»é®å é¤ base.DeleteById(new[] { 1, 2 }); //æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it => 1 == 2); //æ ¹æ®æ¡ä»¶å é¤ AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ } #endregion } MES.Service/service/BasicData/ShipmentDetailManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; public class ShipmentDetailManager : Repository<ShipmentDetail> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,å¦æè¦éæ°çæ请å é¤ ShipmentDetailManager.cs #region æå¦æ¹æ³ /// <summary> /// ä»å¨æ¹æ³æ»¡è¶³ä¸äºå¤æä¸å¡éæ±ï¼ä¸å¡ä»£ç 请å¨è¿éé¢å®ä¹æ¹æ³ /// </summary> public void Study() { /*********æ¥è¯¢*********/ var data1 = base.GetById(1); //æ ¹æ®IDæ¥è¯¢ var data2 = base.GetList(); //æ¥è¯¢ææ var data3 = base.GetList(it => 1 == 1); //æ ¹æ®æ¡ä»¶æ¥è¯¢ //var data4 = base.GetSingle(it => 1 == 1);//æ ¹æ®æ¡ä»¶æ¥è¯¢ä¸æ¡,å¦æè¶ è¿ä¸æ¡ä¼æ¥é var p = new PageModel { PageIndex = 1, PageSize = 2 }; // å页æ¥è¯¢ var data5 = base.GetPageList(it => 1 == 1, p); Console.Write(p.TotalCount); //è¿åæ»æ° var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom()); // å页æ¥è¯¢å æåº Console.Write(p.TotalCount); //è¿åæ»æ° var conModels = new List<IConditionalModel>(); //ç»è£ æ¡ä»¶æ¥è¯¢ä½ä¸ºæ¡ä»¶å®ç° å页æ¥è¯¢å æåº conModels.Add(new ConditionalModel { FieldName = typeof(ShipmentDetail).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" }); //id=1 var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom()); AsQueryable().Where(x => 1 == 1) .ToList(); //æ¯æäºè½¬æ¢æqueryable,æ们å¯ä»¥ç¨queryableå®ç°å¤æåè½ /*********æå ¥*********/ var insertData = new ShipmentDetail(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æ们å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new ShipmentDetail(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new ShipmentDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®åä¸æ´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new ShipmentDetail(); //æµè¯åæ° base.Delete(deldata); //æ ¹æ®å®ä½å é¤ base.DeleteById(1); //æ ¹æ®ä¸»é®å é¤ base.DeleteById(new[] { 1, 2 }); //æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it => 1 == 2); //æ ¹æ®æ¡ä»¶å é¤ AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ } #endregion } MES.Service/service/BasicData/ShipmentNoticeManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,75 @@ using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; public class ShipmentNoticeManager : Repository<ShipmentNotice> { private readonly ShipmentDetailManager shipmentDetailManager = new(); //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ public bool Save(ErpShipment shipment) { var shipmentNotice = GetShipmentNotice(shipment.ShipmentNotice); var shipmentDetails = GetShipmentDetails(shipment.ShipmentDetails); return false; } private ShipmentNotice GetShipmentNotice(ErpShipmentNotice notice) { ShipmentNotice entity = new ShipmentNotice(); entity.Creator = notice.FCreatorId; entity.DocId = notice.FBillNo; entity.Approver = notice.FApproverID; if (notice.FCreateDate != null) { entity.CreateDate = DateTime.ParseExact(notice.FCreateDate, "yyyy-MM-dd HH:mm:ss", null); } if (notice.FApproveDate != null) { entity.ApproveDate = DateTime.ParseExact(notice.FApproveDate, "yyyy-MM-dd HH:mm:ss", null); } entity.DeptCode = notice.FSaleDeptId; entity.CustCode = notice.FCustomerID; entity.ListNote = notice.FNote; entity.RepCode = notice.FSalesManID; return entity; } private List<ShipmentDetail> GetShipmentDetails( List<ErpShipmentDetail> shipmentDetails) { return shipmentDetails.Select(s => { var entity = new ShipmentDetail { ErpId = s.ErpId, ErpHeadId = s.ErpHeadId, ProdCode = s.FMaterialID, ProdName = s.FMaterialName, Amount = Convert.ToDouble(s.FAmount), UnitPrice = Convert.ToDouble(s.FPrice), Quantity = Convert.ToDouble(s.FQty), BatchNo = s.FLot, Remarks = s.FNoteEntry, OrderNo = s.F_UNW_Text_xsddh, OrderId = s.FSOEntryId, BasePrice = Convert.ToDouble(s.FPrice), WarehouseCode = s.FStockID, Unit = s.FBaseUnitID }; return entity; }).ToList(); } } MESApplication/Controllers/BaseController.cs
@@ -1,6 +1,5 @@ using System.Dynamic; using MES.Service.Dto.service; using MES.Service.service; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; MESApplication/Controllers/BasicData/SalesOrderController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,162 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service.BasicData; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.BasicData; [ApiController] [Route("api/[controller]")] public class SalesOrderController : ControllerBase { private readonly SalesOrderManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] SalesOrder 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] SalesOrder 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] SalesOrder 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/Controllers/BasicData/SalesOrderDetailController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,162 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service.BasicData; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.BasicData; [ApiController] [Route("api/[controller]")] public class SalesOrderDetailController : ControllerBase { private SalesOrderDetailManager m = new SalesOrderDetailManager(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] SalesOrderDetail 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] SalesOrderDetail 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] SalesOrderDetail 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/Controllers/BasicData/SalesReturnNoticeController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,163 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service.BasicData; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.BasicData; [ApiController] [Route("api/[controller]")] public class SalesReturnNoticeController : ControllerBase { private SalesReturnNoticeManager m = new SalesReturnNoticeManager(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] SalesReturnNotice 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] SalesReturnNotice 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] SalesReturnNotice 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/Controllers/BasicData/SalesReturnNoticeDetailController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,164 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service.BasicData; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.BasicData; [ApiController] [Route("api/[controller]")] public class SalesReturnNoticeDetailController : ControllerBase { private SalesReturnNoticeDetailManager m = new SalesReturnNoticeDetailManager(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] SalesReturnNoticeDetail 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] SalesReturnNoticeDetail 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] SalesReturnNoticeDetail 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/Controllers/BasicData/ShipmentDetailController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,162 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service.BasicData; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.BasicData; [ApiController] [Route("api/[controller]")] public class ShipmentDetailController : ControllerBase { private ShipmentDetailManager m = new ShipmentDetailManager(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] ShipmentDetail 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] ShipmentDetail 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] ShipmentDetail 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/Controllers/BasicData/ShipmentNoticeController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,162 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service.BasicData; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.BasicData; [ApiController] [Route("api/[controller]")] public class ShipmentNoticeController : ControllerBase { private ShipmentNoticeManager m = new ShipmentNoticeManager(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ /// <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] ShipmentNotice 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] ShipmentNotice 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] ShipmentNotice 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/Controllers/LoginController.cs
@@ -1,5 +1,4 @@ using System.Dynamic; using MES.Service.Dto; using MES.Service.Dto.@base; using MES.Service.service; using MES.Service.util; MESApplication/Controllers/RKJController.cs
@@ -1,7 +1,6 @@ using System.Dynamic; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; MESApplication/Controllers/SJController.cs
@@ -1,7 +1,6 @@ using System.Dynamic; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; MESApplication/Controllers/SuspendController.cs
@@ -1,6 +1,5 @@ using System.Dynamic; using MES.Service.Dto.service; using MES.Service.service; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; MESApplication/Controllers/XJController.cs
@@ -1,7 +1,6 @@ using System.Dynamic; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service; using MES.Service.service.QC; using MES.Service.util; using Microsoft.AspNetCore.Mvc; 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/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/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
