MES.Service/Dto/webApi/ErpCAA.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,39 @@ namespace MES.Service.Dto.webApi; public class ErpCAA { public string Id { get; set; } public string? Type { get; set; } public string? FBillNo { get; set; } public string? FWorkShopID0 { get; set; } public string? FRoutingId { get; set; } public string? FREMWorkShopId { get; set; } public string? FStockId { get; set; } public string? FDate { get; set; } public string? FBillType { get; set; } public string? FStatus { get; set; } public string? FMaterialId { get; set; } public string? FUnitId { get; set; } public string? FQty { get; set; } public string? FWorkGroupId { get; set; } public string? FPlannerID { get; set; } public string? FPlanStartDate { get; set; } public string? FPlanFinishDate { get; set; } public string? FConveyDate { get; set; } public string? FStockInLimitH { get; set; } public string? FStockInLimitL { get; set; } public string? FMTONO { get; set; } public string? FLot { get; set; } public string? FBomId { get; set; } public string? F_UNW_Text_xsddh { get; set; } public string? FCreateType { get; set; } public string? FSrcBillType { get; set; } public string? FSrcBillNo { get; set; } public string? FSrcBillEntrySeq { get; set; } public string? FSaleOrderNo { get; set; } public string? FSaleOrderEntrySeq { get; set; } public string? FForceCloserId { get; set; } public string? FCloseType { get; set; } public string? FSrcSplitBillNo { get; set; } public string? FMemoItem { get; set; } } MES.Service/Dto/webApi/ErpCAB.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,24 @@ namespace MES.Service.Dto.webApi; public class ErpCAB { public string? FBillNo { get; set; } public string? FMaterialID2 { get; set; } public string? FNeedQty2 { get; set; } public string? FPickedQty { get; set; } public string? FPositionNO { get; set; } public string? FOwnerID { get; set; } public string? FMTONO { get; set; } public string? FLot { get; set; } public string? FStockID { get; set; } public string? FIssueType { get; set; } public string? F_UNW_Text_tpgy { get; set; } public string? FUnitID { get; set; } public string? FSupplyType { get; set; } public string? FStdQty { get; set; } public string? FIsKeyItem { get; set; } public string? FNumerator { get; set; } public string? FDenominator { get; set; } public string ID { get; set; } public string PID { get; set; } } MES.Service/Dto/webApi/ErpWOM.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,7 @@ namespace MES.Service.Dto.webApi; public class ErpWOM { public ErpCAA ErpCaa { get; set; } public List<ErpCAB> ErpCabs { get; set; } } MES.Service/Modes/SalesOrder.cs
@@ -11,7 +11,8 @@ /// <summary> /// SEQ_salesåºå /// </summary> [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> MES.Service/Modes/Womcaa.cs
@@ -1,436 +1,276 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using SqlSugar; using SqlSugar; namespace MES.Service.Modes; /// <summary> /// å·¥å表 /// </summary> [Table("WOMCAA")] [SugarTable("WOMCAA")] //ç¨äºSqlSugar [SugarTable("WOMCAA")] public class Womcaa { /// <summary> /// èªå¢å SEQ_AOI /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_AOI")] public decimal? Id { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public decimal? Erpid { get; set; } /// <summary> /// åå· /// </summary> [Column("CAA001")] [SugarColumn(ColumnName = "CAA001")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "åå·é¿åº¦ä¸è½è¶ åº50")] public string? Caa001 { get; set; } [SugarColumn(ColumnName = "CAA001")] public string Caa001 { get; set; } /// <summary> /// ERPå·¥åæ¹æ¬¡ /// åæ®ç±»å 1ãç´æ¥å ¥åº-æ®éç产 SCDD03_SYS2ãç´æ¥å ¥åº-è¿å·¥ç产 SCDD04_SYS3ãå·¥åºæ±æ¥-æ®éç产 /// SCDD01_SYS4ãå·¥åºæ±æ¥-è¿å·¥ç产 SCDD02_SYS /// </summary> [Column("CAA002")] [SugarColumn(ColumnName = "CAA002")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ERPå·¥åæ¹æ¬¡é¿åº¦ä¸è½è¶ åº50")] public string? Caa002 { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [Column("CAA003")] [SugarColumn(ColumnName = "CAA003")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "客æ·ç¼å·é¿åº¦ä¸è½è¶ åº50")] public string? Caa003 { get; set; } /// <summary> /// åæ®ç±»å /// </summary> [Column("CAA004")] [SugarColumn(ColumnName = "CAA004")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "åæ®ç±»åé¿åº¦ä¸è½è¶ åº50")] public string? Caa004 { get; set; } [SugarColumn(ColumnName = "CAA004")] public string Caa004 { get; set; } /// <summary> /// å¼åæ¥æ /// </summary> [Column("CAA005")] [SugarColumn(ColumnName = "CAA005")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å¼åæ¥æé¿åº¦ä¸è½è¶ åº50")] public string? Caa005 { get; set; } [SugarColumn(ColumnName = "CAA005")] public string Caa005 { get; set; } /// <summary> /// 产åç¼ç /// </summary> [Column("CAA006")] [SugarColumn(ColumnName = "CAA006")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "产åç¼ç é¿åº¦ä¸è½è¶ åº50")] public string? Caa006 { get; set; } /// <summary> /// 产ååç§° /// </summary> [Column("CAA007")] [SugarColumn(ColumnName = "CAA007")] //ç¨äºSqlSugar [StringLength(100, ErrorMessage = "产ååç§°é¿åº¦ä¸è½è¶ åº100")] public string? Caa007 { get; set; } /// <summary> /// 产åè§æ ¼ /// </summary> [Column("CAA008")] [SugarColumn(ColumnName = "CAA008")] //ç¨äºSqlSugar [StringLength(200, ErrorMessage = "产åè§æ ¼é¿åº¦ä¸è½è¶ åº200")] public string? Caa008 { get; set; } [SugarColumn(ColumnName = "CAA006")] public string Caa006 { get; set; } /// <summary> /// åä½ /// </summary> [Column("CAA009")] [SugarColumn(ColumnName = "CAA009")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "åä½é¿åº¦ä¸è½è¶ åº50")] public string? Caa009 { get; set; } [SugarColumn(ColumnName = "CAA009")] public string Caa009 { get; set; } /// <summary> /// é¢è®¡å¼å·¥æ¶é´ /// </summary> [Column("CAA010")] [SugarColumn(ColumnName = "CAA010")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "é¢è®¡å¼å·¥æ¶é´é¿åº¦ä¸è½è¶ åº50")] public string? Caa010 { get; set; } [SugarColumn(ColumnName = "CAA010")] public string Caa010 { get; set; } /// <summary> /// é¢è®¡å®å·¥æ¶é´ /// </summary> [Column("CAA011")] [SugarColumn(ColumnName = "CAA011")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "é¢è®¡å®å·¥æ¶é´é¿åº¦ä¸è½è¶ åº50")] public string? Caa011 { get; set; } [SugarColumn(ColumnName = "CAA011")] public string Caa011 { get; set; } /// <summary> /// æ°é /// </summary> [Column("CAA012")] [SugarColumn(ColumnName = "CAA012")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "CAA012")] public decimal? Caa012 { get; set; } /// <summary> /// BOMçæ¬¡ /// </summary> [Column("CAA013")] [SugarColumn(ColumnName = "CAA013")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "BOMçæ¬¡é¿åº¦ä¸è½è¶ åº50")] public string? Caa013 { get; set; } /// <summary> /// 客æ·è®¢åå· /// </summary> [Column("CAA014")] [SugarColumn(ColumnName = "CAA014")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "客æ·è®¢åå·é¿åº¦ä¸è½è¶ åº50")] public string? Caa014 { get; set; } [SugarColumn(ColumnName = "CAA013")] public string Caa013 { get; set; } /// <summary> /// éå®è®¢åå· /// </summary> [Column("CAA015")] [SugarColumn(ColumnName = "CAA015")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "éå®è®¢åå·é¿åº¦ä¸è½è¶ åº50")] public string? Caa015 { get; set; } [SugarColumn(ColumnName = "CAA015")] public string Caa015 { get; set; } /// <summary> /// 夿³¨ /// </summary> [Column("CAA016")] [SugarColumn(ColumnName = "CAA016")] //ç¨äºSqlSugar [StringLength(200, ErrorMessage = "夿³¨é¿åº¦ä¸è½è¶ åº200")] public string? Caa016 { get; set; } [SugarColumn(ColumnName = "CAA016")] public string Caa016 { get; set; } /// <summary> /// å·²ææ°é /// </summary> [Column("CAA017")] [SugarColumn(ColumnName = "CAA017")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "CAA017")] public decimal? Caa017 { get; set; } /// <summary> /// ERPæºåID /// </summary> [Column("CAA018")] [SugarColumn(ColumnName = "CAA018")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "CAA018")] public decimal? Caa018 { get; set; } /// <summary> /// ERPæºåè¡å· /// </summary> [Column("CAA019")] [SugarColumn(ColumnName = "CAA019")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "CAA019")] public decimal? Caa019 { get; set; } /// <summary> /// ERPæºååå·(ä»»å¡åå·) /// </summary> [Column("CAA020")] [SugarColumn(ColumnName = "CAA020")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ERPæºååå·(ä»»å¡åå·)é¿åº¦ä¸è½è¶ åº50")] public string? Caa020 { get; set; } [SugarColumn(ColumnName = "CAA020")] public string Caa020 { get; set; } /// <summary> /// å·¥ä½è½¦é´ /// </summary> [Column("CAA021")] [SugarColumn(ColumnName = "CAA021")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å·¥ä½è½¦é´é¿åº¦ä¸è½è¶ åº50")] public string? Caa021 { get; set; } [SugarColumn(ColumnName = "CAA021")] public string Caa021 { get; set; } /// <summary> /// æªææ°é /// å®¡æ ¸ç /// </summary> [Column("CAA022")] [SugarColumn(ColumnName = "CAA022")] //ç¨äºSqlSugar public decimal? Caa022 { get; set; } /// <summary> /// ç¶æ å®å·¥ï¼æªå®å·¥ /// </summary> [Column("CAA023")] [SugarColumn(ColumnName = "CAA023")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "ç¶æ å®å·¥ï¼æªå®å·¥é¿åº¦ä¸è½è¶ åº20")] public string? Caa023 { get; set; } /// <summary> /// å·²å ¥åºæ°é /// </summary> [Column("CAA024")] [SugarColumn(ColumnName = "CAA024")] //ç¨äºSqlSugar public decimal? Caa024 { get; set; } /// <summary> /// ç»æ¡æ è¯ /// </summary> [Column("CAA025")] [SugarColumn(ColumnName = "CAA025")] //ç¨äºSqlSugar public decimal? Caa025 { get; set; } /// <summary> /// 失败åå /// </summary> [Column("CAA026")] [SugarColumn(ColumnName = "CAA026")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "失败åå é¿åº¦ä¸è½è¶ åº50")] public string? Caa026 { get; set; } /// <summary> /// ç»æ¡æ¶é´ /// </summary> [Column("CAA027")] [SugarColumn(ColumnName = "CAA027")] //ç¨äºSqlSugar public DateTime? Caa027 { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [Column("CAA028")] [SugarColumn(ColumnName = "CAA028")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ä¾åºåç¼ç é¿åº¦ä¸è½è¶ åº50")] public string? Caa028 { get; set; } [SugarColumn(ColumnName = "FSTATUS")] public decimal? Fstatus { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [Column("CHECK_DATE")] [SugarColumn(ColumnName = "CHECK_DATE")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [Column("CHECK_USER")] [SugarColumn(ColumnName = "CHECK_USER")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "å®¡æ ¸äººé¿åº¦ä¸è½è¶ åº20")] public string? CheckUser { get; set; } [SugarColumn(ColumnName = "CHECK_USER")] public string CheckUser { get; set; } /// <summary> /// ERPID /// æªææ°é /// </summary> [Column("ERPID")] [SugarColumn(ColumnName = "ERPID")] //ç¨äºSqlSugar public decimal? Erpid { get; set; } [SugarColumn(ColumnName = "CAA022")] public decimal? Caa022 { get; set; } /// <summary> /// å®¡æ ¸ç /// ç¶æ å®å·¥ï¼æªå®å·¥ /// </summary> [Column("FSTATUS")] [SugarColumn(ColumnName = "FSTATUS")] //ç¨äºSqlSugar public decimal? Fstatus { get; set; } [SugarColumn(ColumnName = "CAA023")] public string Caa023 { get; set; } /// <summary> /// èªå¢å /// å·²å ¥åºæ°é /// </summary> [Column("ID")] [SugarColumn(ColumnName = "ID")] //ç¨äºSqlSugar public decimal? Id { get; set; } /// <summary> /// æ´æ°æ¥æ /// </summary> [Column("LASTTIME")] [SugarColumn(ColumnName = "LASTTIME")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "æ´æ°æ¥æé¿åº¦ä¸è½è¶ åº50")] public string? Lasttime { get; set; } /// <summary> /// æ¨¡å ·å· /// </summary> [Column("MOLD_NO")] [SugarColumn(ColumnName = "MOLD_NO")] //ç¨äºSqlSugar [StringLength(200, ErrorMessage = "æ¨¡å ·å·é¿åº¦ä¸è½è¶ åº200")] public string? MoldNo { get; set; } [SugarColumn(ColumnName = "CAA024")] public decimal? Caa024 { get; set; } /// <summary> /// å·¥èºè·¯çº¿ /// </summary> [Column("TLA021")] [SugarColumn(ColumnName = "TLA021")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å·¥èºè·¯çº¿é¿åº¦ä¸è½è¶ åº50")] public string? Tla021 { get; set; } [SugarColumn(ColumnName = "ROUTING_ID")] public string RoutingId { get; set; } /// <summary> /// 鿱忮å·ç /// 产线 /// </summary> [Column("TLA022")] [SugarColumn(ColumnName = "TLA022")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "鿱忮å·ç é¿åº¦ä¸è½è¶ åº50")] public string? Tla022 { get; set; } [SugarColumn(ColumnName = "WORK_SHOP_ID")] public string WorkShopId { get; set; } /// <summary> /// è¡å· /// ä»åº /// </summary> [Column("TLA023")] [SugarColumn(ColumnName = "TLA023")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "è¡å·é¿åº¦ä¸è½è¶ åº50")] public string? Tla023 { get; set; } [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } /// <summary> /// ç产订åå·ç /// åæ®æ¥æ /// </summary> [Column("TLA024")] [SugarColumn(ColumnName = "TLA024")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ç产订åå·ç é¿åº¦ä¸è½è¶ åº50")] public string? Tla024 { get; set; } [SugarColumn(ColumnName = "CREATE_DATE")] public string CreateDate { get; set; } /// <summary> /// ç产订åå·ç /// 计åç» /// </summary> [Column("TLA025")] [SugarColumn(ColumnName = "TLA025")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ç产订åå·ç é¿åº¦ä¸è½è¶ åº50")] public string? Tla025 { get; set; } [SugarColumn(ColumnName = "WORK_GROUP_ID")] public string WorkGroupId { get; set; } /// <summary> /// 计åå /// </summary> [Column("TLA025A")] [SugarColumn(ColumnName = "TLA025A")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "Tla025aé¿åº¦ä¸è½è¶ åº50")] public string? Tla025a { get; set; } [SugarColumn(ColumnName = "PLAN_ID")] public string PlanId { get; set; } /// <summary> /// å ¥åºè´§ä¸»ç±»å /// å ¥åºä¸é /// </summary> [Column("TLA026")] [SugarColumn(ColumnName = "TLA026")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å ¥åºè´§ä¸»ç±»åé¿åº¦ä¸è½è¶ åº50")] public string? Tla026 { get; set; } [SugarColumn(ColumnName = "STOCK_INLIMITH")] public string StockInlimith { get; set; } /// <summary> /// å ¥åºè´§ä¸» /// å ¥åºä¸é /// </summary> [Column("TLA027")] [SugarColumn(ColumnName = "TLA027")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å ¥åºè´§ä¸»é¿åº¦ä¸è½è¶ åº50")] public string? Tla027 { get; set; } /// <summary> /// å ¥åºç»ç» /// </summary> [Column("TLA028")] [SugarColumn(ColumnName = "TLA028")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å ¥åºç»ç»é¿åº¦ä¸è½è¶ åº50")] public string? Tla028 { get; set; } /// <summary> /// </summary> [Column("TLA029")] [SugarColumn(ColumnName = "TLA029")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "Tla029é¿åº¦ä¸è½è¶ åº50")] public string? Tla029 { get; set; } /// <summary> /// </summary> [Column("TLA030")] [SugarColumn(ColumnName = "TLA030")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "Tla030é¿åº¦ä¸è½è¶ åº50")] public string? Tla030 { get; set; } [SugarColumn(ColumnName = "STOCK_INLIMITL")] public string StockInlimitl { get; set; } /// <summary> /// 计åè·è¸ªå· /// </summary> [Column("TLA031")] [SugarColumn(ColumnName = "TLA031")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "计åè·è¸ªå·é¿åº¦ä¸è½è¶ åº50")] public string? Tla031 { get; set; } [SugarColumn(ColumnName = "MTONO")] public string Mtono { get; set; } /// <summary> /// å·¥åç¶æ /// æ¹å· /// </summary> [Column("TLA032")] [SugarColumn(ColumnName = "TLA032")] //ç¨äºSqlSugar [StringLength(10, ErrorMessage = "å·¥åç¶æé¿åº¦ä¸è½è¶ åº10")] public string? Tla032 { get; set; } [SugarColumn(ColumnName = "LOT")] public string Lot { get; set; } /// <summary> /// æ´ç¯åå· /// éå®è®¢åè¡å· /// </summary> [Column("TLA033")] [SugarColumn(ColumnName = "TLA033")] //ç¨äºSqlSugar [StringLength(500, ErrorMessage = "æ´ç¯åå·é¿åº¦ä¸è½è¶ åº500")] public string? Tla033 { get; set; } [SugarColumn(ColumnName = "CAA015_HEAD")] public string Caa015Head { get; set; } /// <summary> /// å·¥åºè®¡åå· /// çææ¹å¼ /// </summary> [Column("TLA034")] [SugarColumn(ColumnName = "TLA034")] //ç¨äºSqlSugar [StringLength(100, ErrorMessage = "å·¥åºè®¡åå·é¿åº¦ä¸è½è¶ åº100")] public string? Tla034 { get; set; } [SugarColumn(ColumnName = "CREATE_TYPE")] public string CreateType { get; set; } /// <summary> /// å®¢æ· /// æºåç±»å /// </summary> [Column("TLA035")] [SugarColumn(ColumnName = "TLA035")] //ç¨äºSqlSugar [StringLength(100, ErrorMessage = "客æ·é¿åº¦ä¸è½è¶ åº100")] public string? Tla035 { get; set; } [SugarColumn(ColumnName = "SRC_BILL_TYPE")] public string SrcBillType { get; set; } /// <summary> /// åæ®ç±»å /// æºåç¼å· /// </summary> [Column("TLA036")] [SugarColumn(ColumnName = "TLA036")] //ç¨äºSqlSugar [StringLength(100, ErrorMessage = "åæ®ç±»åé¿åº¦ä¸è½è¶ åº100")] public string? Tla036 { get; set; } [SugarColumn(ColumnName = "SRC_BILL_NO")] public string SrcBillNo { get; set; } /// <summary> /// æ´æ°æ¬¡æ° /// æºååå½è¡å· /// </summary> [Column("UPCX")] [SugarColumn(ColumnName = "UPCX")] //ç¨äºSqlSugar public decimal? Upcx { get; set; } [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")] public string SrcBillentryseq { get; set; } /// <summary> /// æ´æ°æ è¯ /// éæ±åæ®å· /// </summary> [Column("UPFLAG")] [SugarColumn(ColumnName = "UPFLAG")] //ç¨äºSqlSugar [StringLength(2, ErrorMessage = "æ´æ°æ è¯é¿åº¦ä¸è½è¶ åº2")] public string? Upflag { get; set; } [SugarColumn(ColumnName = "SALE_ORDER_NO")] public string SaleOrderNo { get; set; } /// <summary> /// çæ¬ /// 鿱忮è¡å· /// </summary> [Column("VNO")] [SugarColumn(ColumnName = "VNO")] //ç¨äºSqlSugar public decimal? Vno { get; set; } [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")] public string SaleOrderEntryseq { get; set; } /// <summary> /// ç»æ¡äºº /// </summary> [SugarColumn(ColumnName = "FORCE_CLOSERID")] public string ForceCloserid { get; set; } /// <summary> /// ç»æ¡ç±»å /// </summary> [SugarColumn(ColumnName = "CLOSE_TYPE")] public string CloseType { get; set; } /// <summary> /// æºæå订åç¼å· /// </summary> [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")] public string SrcSplitBillno { get; set; } } MES.Service/Modes/Womcab.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,155 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// å·¥åå表 /// </summary> [SugarTable("WOMCAB")] public class Womcab { /// <summary> /// èªå¢å /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_AOI")] public decimal? Id { get; set; } /// <summary> /// ERPID /// </summary> [SugarColumn(ColumnName = "ERPID")] public decimal? Erpid { get; set; } /// <summary> /// åå· /// </summary> [SugarColumn(ColumnName = "CAB001")] public string Cab001 { get; set; } /// <summary> /// åºå· /// </summary> [SugarColumn(ColumnName = "CAB002")] public string Cab002 { get; set; } /// <summary> /// ææç¼ç /// </summary> [SugarColumn(ColumnName = "CAB003")] public string Cab003 { get; set; } /// <summary> /// éé¢ç¨é /// </summary> [SugarColumn(ColumnName = "CAB006")] public decimal? Cab006 { get; set; } /// <summary> /// å·²é¢ç¨é /// </summary> [SugarColumn(ColumnName = "CAB007")] public decimal? Cab007 { get; set; } /// <summary> /// å·¥èº /// </summary> [SugarColumn(ColumnName = "CAB008")] public string Cab008 { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "CAB009")] public string Cab009 { get; set; } /// <summary> /// ç»æç¨é /// </summary> [SugarColumn(ColumnName = "CAB012")] public decimal? Cab012 { get; set; } /// <summary> /// æ¯å¦æ¿æ /// </summary> [SugarColumn(ColumnName = "CAB014")] public string Cab014 { get; set; } /// <summary> /// PID /// </summary> [SugarColumn(ColumnName = "PID")] public decimal? Pid { get; set; } /// <summary> /// ERP头ID /// </summary> [SugarColumn(ColumnName = "EID")] public decimal? Eid { get; set; } /// <summary> /// ä½ç½®å· /// </summary> [SugarColumn(ColumnName = "POSITION_NO")] public string PositionNo { get; set; } /// <summary> /// åæç»ç» /// </summary> [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")] public string IssuingOrganization { get; set; } /// <summary> /// ä¾åºç»ç» /// </summary> [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")] public string SupplyOrganization { get; set; } /// <summary> /// 货主 /// </summary> [SugarColumn(ColumnName = "OWNER_ID")] public string OwnerId { get; set; } /// <summary> /// 计åè·è¸ªå· /// </summary> [SugarColumn(ColumnName = "MTONO")] public string Mtono { get; set; } /// <summary> /// æ¹å· /// </summary> [SugarColumn(ColumnName = "LOT")] public string Lot { get; set; } /// <summary> /// ä»åº /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } /// <summary> /// åææ¹å¼ /// </summary> [SugarColumn(ColumnName = "ISSUE_TYPE")] public string IssueType { get; set; } /// <summary> /// ä¾åºç±»å /// </summary> [SugarColumn(ColumnName = "SUPPLY_TYPE")] public string SupplyType { get; set; } /// <summary> /// åå /// </summary> [SugarColumn(ColumnName = "NUMERATOR")] public string Numerator { get; set; } /// <summary> /// 忝 /// </summary> [SugarColumn(ColumnName = "DENOMINATOR")] public string Denominator { get; set; } } 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
@@ -1,66 +1,74 @@ using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.util; using SqlSugar; namespace MES.Service.service.BasicData namespace MES.Service.service.BasicData; public class MesRohInManager : Repository<MesRohIn> { public class MesRohInManager : Repository<MesRohIn> private readonly MesRohInDataManager rohInDataManager = new(); // Save æ¹æ³ç¨äºä¿åå个 RohIn è®°å½ï¼æ ¹æ®ç±»åæ§è¡ä¸åçæä½ public bool Save(RohIn rohIn) { private readonly MesRohInDataManager rohInDataManager = new(); var rohInErpRohIn = rohIn.ErpRohIn; var mesRohIn = GetMesRohIn(rohInErpRohIn); var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); // Save æ¹æ³ç¨äºä¿åå个 RohIn è®°å½ï¼æ ¹æ®ç±»åæ§è¡ä¸åçæä½ public bool Save(RohIn rohIn) return UseTransaction(db => { var rohInErpRohIn = rohIn.ErpRohIn; var mesRohIn = GetMesRohIn(rohInErpRohIn); var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); return UseTransaction(db => switch (rohInErpRohIn.Type) { switch (rohInErpRohIn.Type) { // case "2": // return InsertData(db, mesRohIn, mesRohInDatas, // rohInErpRohIn.FBILLTYPE) // ? 1 // : 0; case "3": return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; case "2": case "4": return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; default: throw new NotImplementedException( $"type没æ{rohInErpRohIn.Type}è¿ä¸ªç±»å"); } }) > 0; } // case "2": // return InsertData(db, mesRohIn, mesRohInDatas, // rohInErpRohIn.FBILLTYPE) // ? 1 // : 0; case "3": return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; case "2": 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) // æå ¥æ°æ®çæ¹æ³ private bool InsertData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas, string FBILLTYPE) { switch (FBILLTYPE) { switch (FBILLTYPE) case "A": { case "A": var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id); if (decimals.Length > 0) db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand(); 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 decimals = mesRohInDatas.Select(s => s.Id).ToArray(); if (mesRohIn.Id != null) { base.DeleteById(mesRohIn.Id); } if (decimals.Length > 0) { db.Deleteable<MesRohInData>().In(decimals).ExecuteCommand(); } var insert = base.Insert(mesRohIn); var insertRange = rohInDataManager.InsertRange(mesRohInDatas); @@ -68,207 +76,187 @@ 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; } break; } throw new NotImplementedException("éè´è®¢åç±»åé误"); } // æ´æ°æ°æ®çæ¹æ³ private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); var update = base.DeleteById(mesRohIn.Id); var insertOrUpdate = db .Deleteable<MesRohInData>().In(decimals) .ExecuteCommand() > 0; throw new NotImplementedException("éè´è®¢åç±»åé误"); } if (update && insertOrUpdate) return true; throw new NotImplementedException("æ´æ°å¤±è´¥"); } // æ´æ°æ°æ®çæ¹æ³ private bool UpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { var decimals = mesRohInDatas.Select(s => s.Id).ToArray(); var update = base.DeleteById(mesRohIn.Id); var insertOrUpdate = db .Deleteable<MesRohInData>().In(decimals) .ExecuteCommand() > 0; // æå ¥ææ´æ°æ°æ®çæ¹æ³ private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { if (mesRohIn.Id != null) { base.DeleteById(mesRohIn.Id); } if (update && insertOrUpdate) return true; throw new NotImplementedException("æ´æ°å¤±è´¥"); } if (mesRohInDatas.Count > 0) { db.Deleteable<MesRohInData>().Where(s=>s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand(); } // æå ¥ææ´æ°æ°æ®çæ¹æ³ private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn, List<MesRohInData> mesRohInDatas) { if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id); var orUpdate = base.Insert(mesRohIn); var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } if (mesRohInDatas.Count > 0) db.Deleteable<MesRohInData>() .Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand(); // æ¹éä¿åè®°å½çæ¹æ³ public bool SaveList(List<RohIn> rohIns) { var result = rohIns.Select(Save).ToList(); return result.All(b => b); } var orUpdate = base.Insert(mesRohIn); var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas); if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } // å° ErpRohIn 对象转æ¢ä¸º MesRohIn å¯¹è±¡çæ¹æ³ public MesRohIn GetMesRohIn(ErpRohIn rohIn) { var eid = Convert.ToDecimal(rohIn.id); var mesRohIn = new MesRohIn(); // æ¹éä¿åè®°å½çæ¹æ³ public bool SaveList(List<RohIn> rohIns) { var result = rohIns.Select(Save).ToList(); return result.All(b => b); } var single = base.GetSingle(it => it.EbelnK3id == eid); if (single != null) mesRohIn.Id = single.Id; // å° ErpRohIn 对象转æ¢ä¸º MesRohIn å¯¹è±¡çæ¹æ³ public MesRohIn GetMesRohIn(ErpRohIn rohIn) { var eid = Convert.ToDecimal(rohIn.id); var mesRohIn = new MesRohIn(); mesRohIn.EbelnK3id = eid; mesRohIn.BillNo = rohIn.FBillNo; mesRohIn.DocumentStatus = rohIn.FDocumentStatus; mesRohIn.DocumentType = rohIn.FBillTypeID; mesRohIn.BusinessType = rohIn.FBusinessType; var single = base.GetSingle(it => it.EbelnK3id == eid); if (single != null) mesRohIn.Id = single.Id; if (rohIn.FDate != null) mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate, 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.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.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; mesRohIn.CreateBy = rohIn.FCreatorId; if (rohIn.FCancelDate != null) mesRohIn.CancellationDate = DateTime.ParseExact(rohIn.FCancelDate, "yyyy-MM-dd HH:mm:ss", null); if (rohIn.FCreateDate != null) mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.CreateBy = rohIn.FCreatorId; mesRohIn.LastupdateBy = rohIn.FModifierId; if (rohIn.FCreateDate != null) mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate, "yyyy-MM-dd HH:mm:ss", null); if (rohIn.FModifyDate != null) mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate, "yyyy-MM-dd HH:mm:ss", null); mesRohIn.LastupdateBy = rohIn.FModifierId; mesRohIn.ErpCheckBy = rohIn.FApproverId; mesRohIn.ErpCheckDate = rohIn.FApproveDate; mesRohIn.Changereason = rohIn.FCHANGEREASON; if (rohIn.FModifyDate != null) mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate, "yyyy-MM-dd HH:mm:ss", null); return mesRohIn; } 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) // å° ErpRohinData 对象转æ¢ä¸º MesRohInData å¯¹è±¡çæ¹æ³ public List<MesRohInData> GetMesRohInDatas( List<ErpRohinData> erpRohinDatas, string type) { return erpRohinDatas.Select(s => { return erpRohinDatas.Select(s => var entity = new MesRohInData { 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 }; 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; var single = rohInDataManager.GetSingle(it => it.EbelnK3id == entity.EbelnK3id); if (single != null) entity.Id = single.Id; return entity; }).ToList(); } return entity; }).ToList(); } } MES.Service/service/BasicData/MesStaffManager.cs
@@ -65,9 +65,9 @@ if (exists) { var updateUser = db.Updateable<SysUser>() .SetColumns(s=>s.Fcode == sysUser.Fcode) .SetColumns(s=>s.Fname == sysUser.Fname) .Where(s=>s.Sid == sysUser.Sid) .SetColumns(s => s.Fcode == sysUser.Fcode) .SetColumns(s => s.Fname == sysUser.Fname) .Where(s => s.Sid == sysUser.Sid) .ExecuteCommand(); if (updateUser > 0) { MES.Service/service/BasicData/ShipmentNoticeManager.cs
@@ -1,7 +1,6 @@ using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.BasicData; @@ -15,30 +14,26 @@ var shipmentNotice = GetShipmentNotice(shipment.ShipmentNotice); var shipmentDetails = GetShipmentDetails(shipment.ShipmentDetails); return false; } private ShipmentNotice GetShipmentNotice(ErpShipmentNotice notice) { ShipmentNotice entity = new ShipmentNotice(); var 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; @@ -51,25 +46,25 @@ List<ErpShipmentDetail> shipmentDetails) { return shipmentDetails.Select(s => { var entity = new ShipmentDetail { 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(); 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(); } } MES.Service/service/WomcaaManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,156 @@ using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service; public class WomcaaManager : Repository<Womcaa> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,妿è¦éæ°çæè¯·å é¤ WomcaaManager.cs private readonly WomcabManager _womcabManager = new(); public bool SaveList(List<ErpWOM> rohIns) { var result = rohIns.Select(Save).ToList(); return result.All(b => b); } public bool Save(ErpWOM wom) { var womErpCaa = wom.ErpCaa; var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa); var mesWomcabs = MapErpCABtoWomcab(wom.ErpCabs); return UseTransaction(db => { switch (womErpCaa.Type) { case "3": return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; case "2": case "4": return SaveOrUpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0; default: throw new NotImplementedException( $"type没æ{womErpCaa.Type}è¿ä¸ªç±»å"); } }) > 0; } private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs) { if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id); if (mesWomcabs.Count > 0) db.Deleteable<Womcab>() .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand(); var orUpdate = base.Insert(mesWomcaa); var baOrUpdate = _womcabManager.InsertRange(mesWomcabs); if (orUpdate && baOrUpdate) return true; throw new NotImplementedException("æå ¥ææ´æ°å¤±è´¥"); } private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs) { var decimals = mesWomcabs.Select(s => s.Id).ToArray(); var update = base.DeleteById(mesWomcaa.Id); var insertOrUpdate = db .Deleteable<Womcab>().In(decimals) .ExecuteCommand() > 0; if (update && insertOrUpdate) return true; throw new NotImplementedException("æ´æ°å¤±è´¥"); } private Womcaa MapErpCAAtoWomcaa(ErpCAA dto) { return new Womcaa { Erpid = Convert.ToDecimal(dto.Id), Caa001 = dto.FBillNo, WorkShopId = dto.FWorkShopID0, RoutingId = dto.FRoutingId, DepotCode = dto.FStockId, CreateDate = dto.FDate, Caa004 = dto.FBillType, Caa023 = dto.FStatus, Caa006 = dto.FMaterialId, Caa009 = dto.FUnitId, Caa012 = !string.IsNullOrEmpty(dto.FQty) ? Convert.ToDecimal(dto.FQty) : null, WorkGroupId = dto.FWorkGroupId, PlanId = dto.FPlannerID, Caa010 = dto.FPlanStartDate, Caa011 = dto.FPlanFinishDate, Caa005 = dto.FConveyDate, StockInlimith = dto.FStockInLimitH, StockInlimitl = dto.FStockInLimitL, Mtono = dto.FMTONO, Lot = dto.FLot, Caa013 = dto.FBomId, Caa015 = dto.F_UNW_Text_xsddh, CreateType = dto.FCreateType, SrcBillType = dto.FSrcBillType, SrcBillNo = dto.FSrcBillNo, SrcBillentryseq = dto.FSrcBillEntrySeq, SaleOrderNo = dto.FSaleOrderNo, SaleOrderEntryseq = dto.FSaleOrderEntrySeq, ForceCloserid = dto.FForceCloserId, CloseType = dto.FCloseType, SrcSplitBillno = dto.FSrcSplitBillNo, Caa016 = dto.FMemoItem }; } private List<Womcab> MapErpCABtoWomcab(List<ErpCAB> dtoList) { var womcabList = new List<Womcab>(); foreach (var dto in dtoList) { var womcab = new Womcab { Erpid = Convert.ToDecimal(dto.ID), Cab001 = dto.FBillNo, Cab003 = dto.FMaterialID2, Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2) ? Convert.ToDecimal(dto.FNeedQty2) : null, Cab007 = !string.IsNullOrEmpty(dto.FPickedQty) ? Convert.ToDecimal(dto.FPickedQty) : null, PositionNo = dto.FPositionNO, OwnerId = dto.FOwnerID, Mtono = dto.FMTONO, Lot = dto.FLot, DepotCode = dto.FStockID, IssueType = dto.FIssueType, Cab008 = dto.F_UNW_Text_tpgy, Cab009 = dto.FUnitID, SupplyType = dto.FSupplyType, Cab012 = !string.IsNullOrEmpty(dto.FStdQty) ? Convert.ToDecimal(dto.FStdQty) : null, Cab014 = dto.FIsKeyItem, Numerator = dto.FNumerator, Denominator = dto.FDenominator, Eid = Convert.ToDecimal(dto.PID) }; womcabList.Add(womcab); } return womcabList; } } MES.Service/service/WomcabManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service; public class WomcabManager : Repository<Womcab> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,妿è¦éæ°çæè¯·å é¤ WomcabManager.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(Womcab).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 Womcab(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æä»¬å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new Womcab(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new Womcab() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®å䏿´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new Womcab(); //æµè¯åæ° base.Delete(deldata); //æ ¹æ®å®ä½å é¤ base.DeleteById(1); //æ ¹æ®ä¸»é®å é¤ base.DeleteById(new[] { 1, 2 }); //æ ¹æ®ä¸»é®æ°ç»å é¤ base.Delete(it => 1 == 2); //æ ¹æ®æ¡ä»¶å é¤ AsDeleteable().Where(it => 1 == 2) .ExecuteCommand(); //转æDeleteableå®ç°å¤æçæä½ } #endregion } MESApplication/Controllers/BasicData/SalesOrderDetailController.cs
@@ -10,7 +10,7 @@ [Route("api/[controller]")] public class SalesOrderDetailController : ControllerBase { private SalesOrderDetailManager m = new SalesOrderDetailManager(); private readonly SalesOrderDetailManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
@@ -10,7 +10,7 @@ [Route("api/[controller]")] public class SalesReturnNoticeController : ControllerBase { private SalesReturnNoticeManager m = new SalesReturnNoticeManager(); private readonly SalesReturnNoticeManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
@@ -10,8 +10,7 @@ [Route("api/[controller]")] public class SalesReturnNoticeDetailController : ControllerBase { private SalesReturnNoticeDetailManager m = new SalesReturnNoticeDetailManager(); private readonly SalesReturnNoticeDetailManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ MESApplication/Controllers/BasicData/ShipmentDetailController.cs
@@ -10,7 +10,7 @@ [Route("api/[controller]")] public class ShipmentDetailController : ControllerBase { private ShipmentDetailManager m = new ShipmentDetailManager(); private readonly ShipmentDetailManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ MESApplication/Controllers/BasicData/ShipmentNoticeController.cs
@@ -10,7 +10,7 @@ [Route("api/[controller]")] public class ShipmentNoticeController : ControllerBase { private ShipmentNoticeManager m = new ShipmentNoticeManager(); private readonly ShipmentNoticeManager m = new(); /***è¿å ¥æ¨¡ç管çå¯ä»¥ä¿®æ¹æ¨¡ç***/ MESApplication/Controllers/WomcaaController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,257 @@ using System.Dynamic; using MES.Service.Dto.webApi; using MES.Service.Modes; using MES.Service.service; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; namespace MESApplication.Controllers; [ApiController] [Route("api/[controller]")] public class WomcaaController : ControllerBase { private readonly WomcaaManager m = new(); private readonly MessageCenterManager _manager = new(); private readonly string METHOD = "POST"; private readonly string TableName = "WOMCAA"; private readonly string URL = "http://localhost:10054/api/Womcaa/"; // [HttpPost("Save")] public ResponseResult Save(ErpWOM rohIn) { var entity = new MessageCenter(); entity.TableName = TableName; entity.Url = URL + "Save"; entity.Method = METHOD; entity.Data = JsonConvert.SerializeObject(rohIn); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); var save = m.Save(rohIn); 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<ErpWOM> 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] Womcaa 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] Womcaa 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] Womcaa 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/WomcabController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,162 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers; [ApiController] [Route("api/[controller]")] public class WomcabController : ControllerBase { private readonly WomcabManager 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] Womcab 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] Womcab 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] Womcab 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/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