MES.Service/Dto/service/Material.cs
@@ -12,4 +12,8 @@ public decimal? FmesEntryId { get; set; } public decimal? Mid { get; set; } public string? UserName { get; set; } public string? DepotSectionCode { get; set; } public string? WorkNo { get; set; } public decimal? Frealqty { get; set; } public string? FuintId { get; set; } } MES.Service/Dto/service/PurchaseInventory.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ using MES.Service.Modes; namespace MES.Service.Dto.service; public class PurchaseInventory { public string? ItemNo { get; set; } public decimal? SumQuantity { get; set; } public MesInvItemIns? ItemIns { get; set; } public List<MesInvItemInCDetails>? InvItemInCDetails { get; set; } public List<MesInvItemInCDetails>? ItemInDetails { get; set; } } MES.Service/Dto/service/WarehouseQuery.cs
@@ -7,4 +7,14 @@ public decimal? id { get; set; } public decimal[]? ItemArnDetailIds { get; set; } public string? itemInId { get; set; } public string? sectionCode { get; set; } public string? barcode { get; set; } public string? userName { get; set; } public string? billNo { get; set; } public short? status { get; set; } public DateTime? date { get; set; } public string? Type { get; set; } } MES.Service/Modes/MesInvItemArnDetail.cs
@@ -211,6 +211,12 @@ [SugarColumn(ColumnName = "OK_RKQTY")] public decimal? OkRkqty { get; set; } /// <summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] public string CbillNo { get; set; } [SugarColumn(IsIgnore = true)] public string? itemModel { get; set; } [SugarColumn(IsIgnore = true)] public string? itemName { get; set; } MES.Service/Modes/MesInvItemBarcodes.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,460 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// ç©ææ¡ç 表 /// </summary> [SugarTable("MES_INV_ITEM_BARCODES")] public class MesInvItemBarcodes { /// <summary> /// SEQ_BARCODE_PSN_ID /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// ç©ææ¡ç /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] public string ItemBarcode { get; set; } /// <summary> /// 客æ·æåç¼ç /// </summary> [SugarColumn(ColumnName = "C_PRODUCT_CODE")] public string CProductCode { get; set; } /// <summary> /// 客æ·ç©ææ¡ç /// </summary> [SugarColumn(ColumnName = "C_ITEM_BARCODE")] public string CItemBarcode { get; set; } /// <summary> /// 客æ·ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] public string CItemCode { get; set; } /// <summary> /// æ¬å¸ç©æç¼ç /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> /// å家æ¹æ¬¡ /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } /// <summary> /// æ°é /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> /// æ¯å¦ç¯ä¿(0:å¦,1:æ¯) /// </summary> [SugarColumn(ColumnName = "EP_FLAG")] public short? EpFlag { get; set; } /// <summary> /// ç产工å /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// æåæ´æ°äºº /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [SugarColumn(ColumnName = "CUST_NO")] public string CustNo { get; set; } /// <summary> /// ç©ææ¡ç 注éè¡[åä½ï¼æ¡ç éæ使ç¨] /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")] public string ItemBarcodeText { get; set; } /// <summary> /// åPSNç©ææ¡ç /// </summary> [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")] public string OldItemBarcode { get; set; } /// <summary> /// SAPæ¶è´§ç©æåè¯å· --éè´åå· /// </summary> [SugarColumn(ColumnName = "MBLNR")] public string Mblnr { get; set; } /// <summary> /// SAPæ¶è´§ç©æåè¯è¡å· --éè´åè¡å· /// </summary> [SugarColumn(ColumnName = "ZEILE")] public decimal? Zeile { get; set; } /// <summary> /// æ¶æ表ID /// </summary> [SugarColumn(ColumnName = "ROH_IN_ID")] public decimal? RohInId { get; set; } /// <summary> /// 0为æææ¡ç ï¼1为æ ææ¡ç /// </summary> [SugarColumn(ColumnName = "BARCODESTATUS")] public short? Barcodestatus { get; set; } /// <summary> /// åå§æ°é /// </summary> [SugarColumn(ColumnName = "OLDQTY")] public decimal? Oldqty { get; set; } /// <summary> /// 使ç¨æ°é /// </summary> [SugarColumn(ColumnName = "USEQTY")] public decimal? Useqty { get; set; } /// <summary> /// 0å¨åºï¼1å¨çº¿ï¼2ä½åº /// </summary> [SugarColumn(ColumnName = "LOCATION")] public short? Location { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } /// <summary> /// ééï¼åä½ï¼å ¬æ¤ï¼ /// </summary> [SugarColumn(ColumnName = "WEIGHT_UNIT")] public decimal? WeightUnit { get; set; } /// <summary> /// åä»· /// </summary> [SugarColumn(ColumnName = "PRICE")] public decimal? Price { get; set; } /// <summary> /// åæ¡ç æ°é /// </summary> [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")] public decimal? OldBarQuantity { get; set; } /// <summary> /// æ±æ»æ¡ç /// </summary> [SugarColumn(ColumnName = "SUM_BARCODE")] public string SumBarcode { get; set; } /// <summary> /// ç产æ¥æ /// </summary> [SugarColumn(ColumnName = "LOT_DATE")] public string LotDate { get; set; } /// <summary> /// æ¨¡å· /// </summary> [SugarColumn(ColumnName = "MOCODE")] public string Mocode { get; set; } /// <summary> /// æ¥æº /// </summary> [SugarColumn(ColumnName = "MEMO")] public string Memo { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// æ¡£ä½ä½å¼ /// </summary> [SugarColumn(ColumnName = "SPOSTION")] public string Spostion { get; set; } /// <summary> /// æ¡£ä½é«å¼ /// </summary> [SugarColumn(ColumnName = "EPOSTION")] public string Epostion { get; set; } /// <summary> /// ç©æç®ç§° /// </summary> [SugarColumn(ColumnName = "ITEM_SNAME")] public string ItemSname { get; set; } /// <summary> /// æ¯å¦å·²å»ç»,1å»ç» /// </summary> [SugarColumn(ColumnName = "VISABLE")] public short? Visable { get; set; } /// <summary> /// ä¾åºåæ¹æ¬¡ /// </summary> [SugarColumn(ColumnName = "TR_LOTNO")] public string TrLotno { get; set; } /// <summary> /// å»ç»æ¶é´ /// </summary> [SugarColumn(ColumnName = "FLEZZ_DATE")] public DateTime? FlezzDate { get; set; } /// <summary> /// å»ç»åå /// </summary> [SugarColumn(ColumnName = "FLEZZ_REASON")] public string FlezzReason { get; set; } /// <summary> /// å»ç»äºº /// </summary> [SugarColumn(ColumnName = "FLEZZ_BY")] public string FlezzBy { get; set; } /// <summary> /// 延é¿ä¿è´¨æ /// </summary> [SugarColumn(ColumnName = "DELANY_MONTH")] public decimal? DelanyMonth { get; set; } /// <summary> /// æå°å è£ æ è¯ /// </summary> [SugarColumn(ColumnName = "MINPACK_FLAG")] public short? MinpackFlag { get; set; } /// <summary> /// æå°IDï¼ç¨æ¥åºåæå°æ¬¡æ° /// </summary> [SugarColumn(ColumnName = "PRINT_ID")] public string PrintId { get; set; } /// <summary> /// ç¯ä¿é¡¹ç® /// </summary> [SugarColumn(ColumnName = "EP_ITEM")] public string EpItem { get; set; } /// <summary> /// å·¥åç¼å· /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// å ¬å¸ç¼å· /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// å¡æ¿ç¼ç /// </summary> [SugarColumn(ColumnName = "CB_NO")] public string CbNo { get; set; } /// <summary> /// å家ç产线 /// </summary> [SugarColumn(ColumnName = "LINFLINE")] public string Linfline { get; set; } /// <summary> /// æææ /// </summary> [SugarColumn(ColumnName = "VALID_TIME")] public DateTime? ValidTime { get; set; } /// <summary> /// è´¨æ£ç»æ /// </summary> [SugarColumn(ColumnName = "IQC_STATUS")] public string IqcStatus { get; set; } /// <summary> /// å°è½¦æ¡ç /// </summary> [SugarColumn(ColumnName = "FCAR")] public string Fcar { get; set; } /// <summary> /// æ¯é /// </summary> [SugarColumn(ColumnName = "GWEIGHT")] public string Gweight { get; set; } /// <summary> /// åé /// </summary> [SugarColumn(ColumnName = "NWEIGHT")] public string Nweight { get; set; } /// <summary> /// ä¿è´¨æ /// </summary> [SugarColumn(ColumnName = "EXT_DATE")] public decimal? ExtDate { get; set; } /// <summary> /// ä¾åºåãèµ åã客ä¾æãå§å¤ /// </summary> [SugarColumn(ColumnName = "BARCODETYPE")] public string Barcodetype { get; set; } /// <summary> /// ä¾åºåå称 /// </summary> [SugarColumn(ColumnName = "SUPP_NAME")] public string SuppName { get; set; } /// <summary> /// å°è´§åå·/å ¥åºåå· /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// æ¥ææ è¯ /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } /// <summary> /// é¢è² /// </summary> [SugarColumn(ColumnName = "COLOR_NAME")] public string ColorName { get; set; } /// <summary> /// 产ååå· /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] public string BoardStyle { get; set; } /// <summary> /// æ¥ææ¥æ /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> /// å°è´§åè¡å· /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// ä¸è¯åå /// </summary> [SugarColumn(ColumnName = "MEMO_BAD")] public string MemoBad { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } /// <summary> /// æ¡ç æ¥æºæ è¯ï¼0-åæç©æ,1-éè´å ¥åºï¼2ãç产éæï¼3ãå ¶å®å ¥åºï¼4-客ä¾æ,5-å¨åºåæï¼6-å¶ç¨æ¡ç /// </summary> [SugarColumn(ColumnName = "COME_FLG")] public short? ComeFlg { get; set; } /// <summary> /// çäº§çº¿ä½ /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string LineNo { get; set; } /// <summary> /// ä¸å°æ¬¡æ° /// </summary> [SugarColumn(ColumnName = "SILK_PQTY")] public decimal? SilkPqty { get; set; } /// <summary> /// ä¸å°æ¬¡æ°æ¯ /// </summary> [SugarColumn(ColumnName = "SILK")] public string Silk { get; set; } /// <summary> /// ä¸å°æ´¾å·¥ä»è¡¨ID /// </summary> [SugarColumn(ColumnName = "SILK_ID")] public decimal? SilkId { get; set; } /// <summary> /// å·²æ¥å·¥æ è¯ /// </summary> [SugarColumn(ColumnName = "WORK_FLG")] public decimal? WorkFlg { get; set; } /// <summary> /// æåå·¥åº /// </summary> [SugarColumn(ColumnName = "WORK_LAST")] public decimal? WorkLast { get; set; } /// <summary> /// 0-æªå并æå°ï¼1-å并æå° /// </summary> [SugarColumn(ColumnName = "HBDY")] public decimal? Hbdy { get; set; } /// <summary> /// 0-æææ¡ç ï¼1-å并æåçæ¡ç ï¼æ æ /// </summary> [SugarColumn(ColumnName = "HBDYTM")] public decimal? Hbdytm { get; set; } /// <summary> /// æ¥å·¥æ¶é´ /// </summary> [SugarColumn(ColumnName = "WORK_FLGTIME")] public string WorkFlgtime { get; set; } } MES.Service/Modes/MesInvItemInCDetails.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,361 @@ using SqlSugar; namespace MES.Service.Modes; /// <summary> /// ç©æå ¥åºæ¡ç æç» /// </summary> [SugarTable("MES_INV_ITEM_IN_C_DETAILS")] public class MesInvItemInCDetails { /// <summary> /// SEQ_OUT /// </summary> [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// å ¥åºåid /// </summary> [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)] public decimal ItemInId { get; set; } /// <summary> /// ç©ææ¡ç PSN /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] public string ItemBarcode { get; set; } /// <summary> /// 客æ·ç©æç¼ç ï¼æ æ¡ç æå·¥å½å ¥ï¼ææ¡ç 为åä½åæ®µï¼ /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] public string CItemCode { get; set; } /// <summary> /// 客æ·ç©ææ¡ç /// </summary> [SugarColumn(ColumnName = "C_ITEM_BARCODE")] public string CItemBarcode { get; set; } /// <summary> /// éªæ¶æ°é /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> /// å ¥åºæ¹å¼(1:ææ¡ç ,0:æ æ¡ç ) /// </summary> [SugarColumn(ColumnName = "BARCODE_FLAG")] public short? BarcodeFlag { get; set; } /// <summary> /// ç¯ä¿æ å¿ï¼0-éç¯ä¿,1-ç¯ä¿.æ æ¡ç æå·¥å½å ¥ï¼ææ¡ç 为åä½åæ®µï¼ /// </summary> [SugarColumn(ColumnName = "EP_FLAG")] public short? EpFlag { get; set; } /// <summary> /// å建人 /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// æåæ´æ°äºº /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// ä½ä¸æ¹å¼0-æ线æ¡ç æª1-æ 线æ¡ç æª /// </summary> [SugarColumn(ColumnName = "WORK_TYPE")] public decimal? WorkType { get; set; } /// <summary> /// æ¬å¸ç©æç¼ç ï¼æ æ¡ç æå·¥å½å ¥ï¼ææ¡ç 为åä½åæ®µï¼ /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> /// å家æ¹æ¬¡ /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } /// <summary> /// æ¯å¦å ±ç®¡ç©æ(0:å¦ï¼1:æ¯) /// </summary> [SugarColumn(ColumnName = "COMANAGEMENT_FLAG")] public short? ComanagementFlag { get; set; } /// <summary> /// 客æ·ç¼ç /// </summary> [SugarColumn(ColumnName = "CUST_NO")] public string CustNo { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] public string CheckRes { get; set; } /// <summary> /// è¿è´§æ°é /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] public decimal? CheckQty { get; set; } /// <summary> /// æ£éªç¶æ /// </summary> [SugarColumn(ColumnName = "CHECK_STATES")] public string CheckStates { get; set; } /// <summary> /// 强å¶å ¥åºæ è®°0æ ï¼1-强å¶å ¥åº éæåä½¿ç¨ /// </summary> [SugarColumn(ColumnName = "FORCE_IN_FLAG")] public short? ForceInFlag { get; set; } /// <summary> /// ä»åºç¼ç /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } /// <summary> /// è´§ä½ç¼ç /// </summary> [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] public string DepotSectionCode { get; set; } /// <summary> /// ç¹è®°äºé¡¹ /// </summary> [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// ç©ææ¡ç /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE2")] public string ItemBarcode2 { get; set; } /// <summary> /// æ°æ¡ç /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE3")] public string ItemBarcode3 { get; set; } /// <summary> /// 使ç¨æ°é /// </summary> [SugarColumn(ColumnName = "USE_QTY")] public decimal? UseQty { get; set; } /// <summary> /// é¢ææ°é /// </summary> [SugarColumn(ColumnName = "OUT_QTY")] public decimal? OutQty { get; set; } /// <summary> /// ç©æç®ç§° /// </summary> [SugarColumn(ColumnName = "ITEM_SNAME")] public string ItemSname { get; set; } /// <summary> /// æ¡£ä½ä½å¼ /// </summary> [SugarColumn(ColumnName = "SPOSTION")] public decimal? Spostion { get; set; } /// <summary> /// æ¡£ä½é«å¼ /// </summary> [SugarColumn(ColumnName = "EPOSTION")] public decimal? Epostion { get; set; } /// <summary> /// æ£éªæ¥æ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// åä½ /// </summary> [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } /// <summary> /// æ¯å¦æ£éª /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } /// <summary> /// éè´è®¢å /// </summary> [SugarColumn(ColumnName = "EBELN")] public string Ebeln { get; set; } /// <summary> /// ç产æ¥æ /// </summary> [SugarColumn(ColumnName = "LOT_DATE")] public string LotDate { get; set; } /// <summary> /// å ¥åºåå· /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// å ¥åºå®¡æ ¸æ å¿ /// </summary> [SugarColumn(ColumnName = "STOCK_OK")] public short? StockOk { get; set; } /// <summary> /// ååç¼ç /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// å ¬å¸ä»£ç /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// å¡æ¿ç¼ç /// </summary> [SugarColumn(ColumnName = "CB_NO")] public string CbNo { get; set; } /// <summary> /// ç®±å· /// </summary> [SugarColumn(ColumnName = "BOX_NO")] public string BoxNo { get; set; } /// <summary> /// ä»åºID /// </summary> [SugarColumn(ColumnName = "DEPOT_ID")] public decimal? DepotId { get; set; } /// <summary> /// è´§ä½ID /// </summary> [SugarColumn(ColumnName = "DEPOT_SECTION_ID")] public decimal? DepotSectionId { get; set; } /// <summary> /// è¡å· /// </summary> [SugarColumn(ColumnName = "LINE_NUM")] public string LineNum { get; set; } /// <summary> /// æ«ç æ°é /// </summary> [SugarColumn(ColumnName = "SM_QTY")] public decimal? SmQty { get; set; } /// <summary> /// éå®è®¢å /// </summary> [SugarColumn(ColumnName = "VGBEL")] public string Vgbel { get; set; } /// <summary> /// éå®è®¢åè¡å· /// </summary> [SugarColumn(ColumnName = "KDPOS")] public decimal? Kdpos { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } /// <summary> /// è¡å· /// </summary> [SugarColumn(ColumnName = "EBELN_LINE_NO")] public decimal? EbelnLineNo { get; set; } /// <summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] public string CbillNo { get; set; } /// <summary> /// æ¥ææ è¯ /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public decimal? UrgentFlag { get; set; } /// <summary> /// 产ååå· /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] public string BoardStyle { get; set; } /// <summary> /// ä»»å¡åè¡å· /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> /// ç产工å /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> /// ä¾åºå /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// ä»»å¡æ±æ¥å /// </summary> [SugarColumn(ColumnName = "RBILL_NO")] public string RbillNo { get; set; } // æ·»å çå段ï¼å¹¶ä¸å®ä»¬ä¸å±äºæ°æ®åºè¡¨ [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; } [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; } [SugarColumn(IsIgnore = true)] public string? ItemUnit { get; set; } [SugarColumn(IsIgnore = true)] public decimal? SumQuantity { get; set; } } MES.Service/Modes/MesInvItemIns.cs
@@ -1,5 +1,3 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using SqlSugar; namespace MES.Service.Modes; @@ -7,404 +5,311 @@ /// <summary> /// ç©æå ¥åºä¸»è¡¨ /// </summary> [Table("MES_INV_ITEM_INS")] [SugarTable("MES_INV_ITEM_INS")] //ç¨äºSqlSugar [SugarTable("MES_INV_ITEM_INS")] public class MesInvItemIns { /// <summary> /// ID(SEQ_INV_ID) /// </summary> [Key] [Column("ID")] [SugarColumn(ColumnName = "ID")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } /// <summary> /// å ¥åºåå· /// </summary> [Column("BILL_NO")] [SugarColumn(ColumnName = "BILL_NO")] //ç¨äºSqlSugar [StringLength(100, ErrorMessage = "å ¥åºåå·é¿åº¦ä¸è½è¶ åº100")] [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } /// <summary> /// åæ®ç±»åID /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\ç»æ¡ /// </summary> [Column("BILL_TYPE_ID")] [SugarColumn(ColumnName = "BILL_TYPE_ID")] //ç¨äºSqlSugar public decimal? BillTypeId { get; set; } [SugarColumn(ColumnName = "STATUS")] public short? Status { get; set; } /// <summary> /// å°è´§åå·/计ååå· /// ä»åº /// </summary> [Column("CBILL_NO")] [SugarColumn(ColumnName = "CBILL_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å°è´§åå·/计ååå·é¿åº¦ä¸è½è¶ åº50")] public string CbillNo { get; set; } [SugarColumn(ColumnName = "DEPOTS_ID")] public decimal? DepotsId { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// åå /// </summary> [Column("CHECK_DATE")] [SugarColumn(ColumnName = "CHECK_DATE")] //ç¨äºSqlSugar public DateTime? CheckDate { get; set; } /// <summary> /// å·²æ¡æ°é /// </summary> [Column("CHECK_QTY")] [SugarColumn(ColumnName = "CHECK_QTY")] //ç¨äºSqlSugar public decimal? CheckQty { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [Column("CHECK_RES")] [SugarColumn(ColumnName = "CHECK_RES")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "æ£éªç»æé¿åº¦ä¸è½è¶ åº50")] public string CheckRes { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [Column("CHECK_USER")] [SugarColumn(ColumnName = "CHECK_USER")] //ç¨äºSqlSugar [StringLength(32, ErrorMessage = "å®¡æ ¸äººé¿åº¦ä¸è½è¶ åº32")] public string CheckUser { get; set; } /// <summary> /// å ¬å¸ä»£ç /// </summary> [Column("COMPANY")] [SugarColumn(ColumnName = "COMPANY")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "å ¬å¸ä»£ç é¿åº¦ä¸è½è¶ åº20")] public string Company { get; set; } [SugarColumn(ColumnName = "REASON")] public string Reason { get; set; } /// <summary> /// å建人 /// </summary> [Column("CREATE_BY")] [SugarColumn(ColumnName = "CREATE_BY")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "å建人é¿åº¦ä¸è½è¶ åº30")] [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [Column("CREATE_DATE")] [SugarColumn(ColumnName = "CREATE_DATE")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> /// 客æ·å称 /// </summary> [Column("CUST_NAME")] [SugarColumn(ColumnName = "CUST_NAME")] //ç¨äºSqlSugar [StringLength(300, ErrorMessage = "客æ·å称é¿åº¦ä¸è½è¶ åº300")] public string CustName { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [Column("CUST_NO")] [SugarColumn(ColumnName = "CUST_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "客æ·ç¼å·é¿åº¦ä¸è½è¶ åº50")] public string CustNo { get; set; } /// <summary> /// ä»åºç¼ç /// </summary> [Column("DEPOTS_CODE")] [SugarColumn(ColumnName = "DEPOTS_CODE")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "ä»åºç¼ç é¿åº¦ä¸è½è¶ åº30")] public string DepotsCode { get; set; } /// <summary> /// ä»åº /// </summary> [Column("DEPOTS_ID")] [SugarColumn(ColumnName = "DEPOTS_ID")] //ç¨äºSqlSugar public decimal? DepotsId { get; set; } /// <summary> /// SAPéè´è®¢åå· /// </summary> [Column("EBELN")] [SugarColumn(ColumnName = "EBELN")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "SAPéè´è®¢åå·é¿åº¦ä¸è½è¶ åº50")] public string Ebeln { get; set; } /// <summary> /// å·¥åç¼ç /// </summary> [Column("FACTORY")] [SugarColumn(ColumnName = "FACTORY")] //ç¨äºSqlSugar [StringLength(10, ErrorMessage = "å·¥åç¼ç é¿åº¦ä¸è½è¶ åº10")] public string Factory { get; set; } /// <summary> /// ææåè¡å· /// </summary> [Column("FBILL_LINO")] [SugarColumn(ColumnName = "FBILL_LINO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ææåè¡å·é¿åº¦ä¸è½è¶ åº50")] public string FbillLino { get; set; } /// <summary> /// ææéç¥ååå· /// </summary> [Column("FBILLNO")] [SugarColumn(ColumnName = "FBILLNO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ææéç¥ååå·é¿åº¦ä¸è½è¶ åº50")] public string Fbillno { get; set; } /// <summary> /// å ¥åºå®¡æ ¸æ¥æ /// </summary> [Column("FCHECK_DATE")] [SugarColumn(ColumnName = "FCHECK_DATE")] //ç¨äºSqlSugar public DateTime? FcheckDate { get; set; } /// <summary> /// å ¥åºå®¡æ ¸äºº /// </summary> [Column("FCHECK_USER")] [SugarColumn(ColumnName = "FCHECK_USER")] //ç¨äºSqlSugar [StringLength(10, ErrorMessage = "å ¥åºå®¡æ ¸äººé¿åº¦ä¸è½è¶ åº10")] public string FcheckUser { get; set; } /// <summary> /// å ¥åºç¶æ /// </summary> [Column("FSTATUS")] [SugarColumn(ColumnName = "FSTATUS")] //ç¨äºSqlSugar public decimal? Fstatus { get; set; } /// <summary> /// å®¡æ ¸å ¥åºäºº /// </summary> [Column("INSBY")] [SugarColumn(ColumnName = "INSBY")] //ç¨äºSqlSugar [StringLength(32, ErrorMessage = "å®¡æ ¸å ¥åºäººé¿åº¦ä¸è½è¶ åº32")] public string Insby { get; set; } /// <summary> /// ç¡®è®¤å ¥åºæ¥æ /// </summary> [Column("INSDATE")] [SugarColumn(ColumnName = "INSDATE")] //ç¨äºSqlSugar public DateTime? Insdate { get; set; } /// <summary> /// å ¥åºæ¥æ /// </summary> [Column("INS_DATE")] [SugarColumn(ColumnName = "INS_DATE")] //ç¨äºSqlSugar public DateTime? InsDate { get; set; } /// <summary> /// IQCæ£éªåå· /// </summary> [Column("IQC_RELEASE_NO")] [SugarColumn(ColumnName = "IQC_RELEASE_NO")] //ç¨äºSqlSugar [StringLength(300, ErrorMessage = "IQCæ£éªåå·é¿åº¦ä¸è½è¶ åº300")] public string IqcReleaseNo { get; set; } /// <summary> /// æ¯å¦æ£éª /// </summary> [Column("ISCHECK")] [SugarColumn(ColumnName = "ISCHECK")] //ç¨äºSqlSugar public decimal? Ischeck { get; set; } /// <summary> /// æ¯å¦æ¾ç¤º /// </summary> [Column("IS_VISUAL")] [SugarColumn(ColumnName = "IS_VISUAL")] //ç¨äºSqlSugar public decimal? IsVisual { get; set; } /// <summary> /// åæåç¼å· /// </summary> [Column("ITEM_NO")] [SugarColumn(ColumnName = "ITEM_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "åæåç¼å·é¿åº¦ä¸è½è¶ åº50")] public string ItemNo { get; set; } /// <summary> /// æåæ´æ°äºº /// </summary> [Column("LASTUPDATE_BY")] [SugarColumn(ColumnName = "LASTUPDATE_BY")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "æåæ´æ°äººé¿åº¦ä¸è½è¶ åº30")] [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> /// æåæ´æ°æ¶é´ /// </summary> [Column("LASTUPDATE_DATE")] [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> /// éè´åè¡å· /// åæ®ç±»åID /// </summary> [Column("LINE_NO")] [SugarColumn(ColumnName = "LINE_NO")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "éè´åè¡å·é¿åº¦ä¸è½è¶ åº20")] public string LineNo { get; set; } /// <summary> /// é¢æ工段 /// </summary> [Column("MMLIST")] [SugarColumn(ColumnName = "MMLIST")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "é¢æ工段é¿åº¦ä¸è½è¶ åº30")] public string Mmlist { get; set; } /// <summary> /// ç产订å /// </summary> [Column("MOCODE")] [SugarColumn(ColumnName = "MOCODE")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ç产订åé¿åº¦ä¸è½è¶ åº50")] public string Mocode { get; set; } /// <summary> /// å²éäºå¡ç±»åç¼ç /// </summary> [Column("MTTRANSCTION_NO")] [SugarColumn(ColumnName = "MTTRANSCTION_NO")] //ç¨äºSqlSugar public decimal? MttransctionNo { get; set; } /// <summary> /// éè´§åå· /// </summary> [Column("PAPER_BILL_NO")] [SugarColumn(ColumnName = "PAPER_BILL_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "éè´§åå·é¿åº¦ä¸è½è¶ åº50")] public string PaperBillNo { get; set; } /// <summary> /// 0 ç³è¯·åï¼1å ¥åºåæ è¯ /// </summary> [Column("PICK_INS")] [SugarColumn(ColumnName = "PICK_INS")] //ç¨äºSqlSugar public decimal? PickIns { get; set; } /// <summary> /// åå /// </summary> [Column("REASON")] [SugarColumn(ColumnName = "REASON")] //ç¨äºSqlSugar [StringLength(1000, ErrorMessage = "åå é¿åº¦ä¸è½è¶ åº1000")] public string Reason { get; set; } /// <summary> /// éæåå /// </summary> [Column("REM")] [SugarColumn(ColumnName = "REM")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "éæåå é¿åº¦ä¸è½è¶ åº50")] public string Rem { get; set; } /// <summary> /// å¤æ³¨ /// </summary> [Column("REMARK")] [SugarColumn(ColumnName = "REMARK")] //ç¨äºSqlSugar [StringLength(255, ErrorMessage = "å¤æ³¨é¿åº¦ä¸è½è¶ åº255")] public string Remark { get; set; } /// <summary> /// SAPè¿ååæ® /// </summary> [Column("SAPNO")] [SugarColumn(ColumnName = "SAPNO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "SAPè¿ååæ®é¿åº¦ä¸è½è¶ åº50")] public string Sapno { get; set; } /// <summary> /// æ¯å¦å·²ååSAP /// </summary> [Column("SAPSTATUS")] [SugarColumn(ColumnName = "SAPSTATUS")] //ç¨äºSqlSugar public decimal? Sapstatus { get; set; } /// <summary> /// SAPè¿åä¿¡æ¯ /// </summary> [Column("SAPTEXT")] [SugarColumn(ColumnName = "SAPTEXT")] //ç¨äºSqlSugar [StringLength(200, ErrorMessage = "SAPè¿åä¿¡æ¯é¿åº¦ä¸è½è¶ åº200")] public string Saptext { get; set; } /// <summary> /// SAPè¿å年份 /// </summary> [Column("SAPYEAR")] [SugarColumn(ColumnName = "SAPYEAR")] //ç¨äºSqlSugar public decimal? Sapyear { get; set; } /// <summary> /// ç¶æ|0-æªå®¡æ ¸1-å®¡æ ¸å ¥åº\ç»æ¡ /// </summary> [Column("STATUS")] [SugarColumn(ColumnName = "STATUS")] //ç¨äºSqlSugar public decimal? Status { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [Column("SUPP_NO")] [SugarColumn(ColumnName = "SUPP_NO")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "ä¾åºåç¼ç é¿åº¦ä¸è½è¶ åº30")] public string SuppNo { get; set; } /// <summary> /// å·¥åè¡å· /// </summary> [Column("TASK_LINO")] [SugarColumn(ColumnName = "TASK_LINO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "å·¥åè¡å·é¿åº¦ä¸è½è¶ åº50")] public string TaskLino { get; set; } /// <summary> /// ä»»å¡åå· /// </summary> [Column("TASK_NO")] [SugarColumn(ColumnName = "TASK_NO")] //ç¨äºSqlSugar [StringLength(50, ErrorMessage = "ä»»å¡åå·é¿åº¦ä¸è½è¶ åº50")] public string TaskNo { get; set; } [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> /// äºå¡ç±»åID /// </summary> [Column("TRANSACTION_ID")] [SugarColumn(ColumnName = "TRANSACTION_ID")] //ç¨äºSqlSugar [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } /// <summary> /// äºå¡ç±»åç¼ç /// å¤æ³¨ /// </summary> [Column("TRANSCTION_NO")] [SugarColumn(ColumnName = "TRANSCTION_NO")] //ç¨äºSqlSugar [StringLength(30, ErrorMessage = "äºå¡ç±»åç¼ç é¿åº¦ä¸è½è¶ åº30")] public string TransctionNo { get; set; } [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> /// æ¥ææ è¯ /// éè´§åå· /// </summary> [Column("URGENT_FLAG")] [SugarColumn(ColumnName = "URGENT_FLAG")] //ç¨äºSqlSugar public decimal? UrgentFlag { get; set; } [SugarColumn(ColumnName = "PAPER_BILL_NO")] public string PaperBillNo { get; set; } /// <summary> /// éæäººå·¥å· /// </summary> [Column("USER_NO_BACK")] [SugarColumn(ColumnName = "USER_NO_BACK")] //ç¨äºSqlSugar [StringLength(20, ErrorMessage = "éæ人工å·é¿åº¦ä¸è½è¶ åº20")] [SugarColumn(ColumnName = "USER_NO_BACK")] public string UserNoBack { get; set; } /// <summary> /// å®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "CHECK_USER")] public string CheckUser { get; set; } /// <summary> /// å®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } /// <summary> /// ç产订åå· /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> /// å ¥åºæ¥æ /// </summary> [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } /// <summary> /// æ£éªç»æ /// </summary> [SugarColumn(ColumnName = "CHECK_RES")] public string CheckRes { get; set; } /// <summary> /// å·²æ¡æ°é /// </summary> [SugarColumn(ColumnName = "CHECK_QTY")] public decimal? CheckQty { get; set; } /// <summary> /// é¢æ工段 /// </summary> [SugarColumn(ColumnName = "MMLIST")] public string Mmlist { get; set; } /// <summary> /// SAPéè´è®¢åå· /// </summary> [SugarColumn(ColumnName = "EBELN")] public string Ebeln { get; set; } /// <summary> /// ä»åºç¼ç /// </summary> [SugarColumn(ColumnName = "DEPOTS_CODE")] public string DepotsCode { get; set; } /// <summary> /// äºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "TRANSCTION_NO")] public string TransctionNo { get; set; } /// <summary> /// ä¾åºåç¼ç /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> /// å ¥åºç¶æ /// </summary> [SugarColumn(ColumnName = "FSTATUS")] public short? Fstatus { get; set; } /// <summary> /// å·¥åç¼ç /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> /// æ¯å¦å·²ååSAP /// </summary> [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } /// <summary> /// SAPè¿ååæ® /// </summary> [SugarColumn(ColumnName = "SAPNO")] public string Sapno { get; set; } /// <summary> /// SAPè¿å年份 /// </summary> [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } /// <summary> /// SAPè¿åä¿¡æ¯ /// </summary> [SugarColumn(ColumnName = "SAPTEXT")] public string Saptext { get; set; } /// <summary> /// ç¡®è®¤å ¥åºæ¥æ /// </summary> [SugarColumn(ColumnName = "INSDATE")] public DateTime? InsdateA { get; set; } /// <summary> /// æ¯å¦æ£éª /// </summary> [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } /// <summary> /// å®¡æ ¸å ¥åºäºº /// </summary> [SugarColumn(ColumnName = "INSBY")] public string Insby { get; set; } /// <summary> /// æ¯å¦æ¾ç¤º /// </summary> [SugarColumn(ColumnName = "IS_VISUAL")] public decimal? IsVisual { get; set; } /// <summary> /// å ¬å¸ä»£ç /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> /// æ¥ææ è¯ /// </summary> [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } /// <summary> /// éè´åè¡å· /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string LineNo { get; set; } /// <summary> /// å²éäºå¡ç±»åç¼ç /// </summary> [SugarColumn(ColumnName = "MTTRANSCTION_NO")] public decimal? MttransctionNo { get; set; } /// <summary> /// å·¥åè¡å· /// </summary> [SugarColumn(ColumnName = "TASK_LINO")] public string TaskLino { get; set; } /// <summary> /// ææéç¥ååå· /// </summary> [SugarColumn(ColumnName = "FBILLNO")] public string Fbillno { get; set; } /// <summary> /// ææåè¡å· /// </summary> [SugarColumn(ColumnName = "FBILL_LINO")] public string FbillLino { get; set; } /// <summary> /// 客æ·ç¼å· /// </summary> [SugarColumn(ColumnName = "CUST_NO")] public string CustNo { get; set; } /// <summary> /// 客æ·å称 /// </summary> [SugarColumn(ColumnName = "CUST_NAME")] public string CustName { get; set; } /// <summary> /// IQCæ£éªåå· /// </summary> [SugarColumn(ColumnName = "IQC_RELEASE_NO")] public string IqcReleaseNo { get; set; } /// <summary> /// å°è´§åå· /// </summary> [SugarColumn(ColumnName = "CBILL_NO")] public string CbillNo { get; set; } /// <summary> /// 0 ç³è¯·åï¼1å ¥åºåæ è¯ /// </summary> [SugarColumn(ColumnName = "PICK_INS")] public decimal? PickIns { get; set; } /// <summary> /// å ¥åºå®¡æ ¸äºº /// </summary> [SugarColumn(ColumnName = "FCHECK_USER")] public string FcheckUser { get; set; } /// <summary> /// å ¥åºå®¡æ ¸æ¥æ /// </summary> [SugarColumn(ColumnName = "FCHECK_DATE")] public DateTime? FcheckDate { get; set; } /// <summary> /// ä»»å¡æ±æ¥å /// </summary> [SugarColumn(ColumnName = "RBILL_NO")] public string RbillNo { get; set; } //å¨æ°æ®åºæ¥è¯¢æ¶å¿½ç¥è¿ä¸ªå段 [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; } [SugarColumn(IsIgnore = true)] public string? SuppName { get; set; } } MES.Service/Modes/MessageCenter.cs
@@ -105,6 +105,14 @@ [SugarColumn(ColumnName = "ROUTE")] public string? Route { get; set; } /// <summary> /// åæ°ç±»å /// </summary> [SugarColumn(ColumnName = "Content_Type")] public string? ContentType { get; set; } [SugarColumn(IsIgnore = true)] public int? isShow { get; set; } [SugarColumn(IsIgnore = true)] public decimal? Count { 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/GetErpParametersServer.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,138 @@ using System.Text; using System.Web; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service.Warehouse; using Newtonsoft.Json; using Newtonsoft.Json.Linq; namespace MES.Service.service; public class GetErpParametersServer { private readonly MesInvItemInCDetailsManager _invItemInCDetailsServer = new(); private readonly MessageCenterManager _messageCenterServer = new(); public List<MessageCenter> GetErpParameters(List<MessageCenter> data) { var centers = new List<MessageCenter>(); //è·å第ä¸ä¸ªè¯·æ± var center = data.Find(p => p.Seq == 1); //解æURL var queryString = center.PageName.Substring(center.PageName.IndexOf('?') + 1); //æååæ° var queryParameters = HttpUtility.ParseQueryString(queryString); switch (center.TableName) { //éè´å ¥åºåå®¡æ ¸ case "MES_INV_ITEM_INS_A": //éè´å ¥åºååå®¡æ ¸ case "MES_INV_ITEM_INS_B": var strings = center.TableName.Split("_"); var query = new WarehouseQuery(); //è·åå°ç±»åï¼å®¡æ ¸è¿æ¯åå®¡æ ¸ï¼ query.Type = strings[^1]; query.id = Convert.ToDecimal(queryParameters["id"]); query.billNo = queryParameters["billNo"]; var mesToErp = _invItemInCDetailsServer.MesToErpParam(query); mesToErp.Id = center.Id; centers.Add(mesToErp); var messageCenter = data[0]; var json = new JObject(); json.Add(new JProperty("id", query.id)); json.Add(new JProperty("billNo", query.billNo)); messageCenter.Data = json.ToString(); centers.Add(messageCenter); break; default: throw new Exception("æ æ³è¯å«TableNameç±»å"); } //æ ¹æ®é¡ºåºè¿å return centers.OrderBy(p => p.Seq).ToList(); } public string Resend(MessageCenter data) { //è·åææçåè° var messageCenters = _messageCenterServer.GetList(it => it.Pid == data.Id); messageCenters.Add(data); var erpParameters = GetErpParameters(messageCenters); return sendHttp(erpParameters).Result; } private async Task<string> sendHttp(List<MessageCenter> requestList) { var sortedRequests = requestList.OrderBy(r => r.Seq).ToList(); using var httpClient = new HttpClient(); var responses = ""; foreach (var request in sortedRequests) { var httpRequestMessage = new HttpRequestMessage { Method = new HttpMethod(request.Method), RequestUri = new Uri(request.Url), Content = new StringContent(request.Data, Encoding.UTF8, request.ContentType) }; var response = await httpClient.SendAsync(httpRequestMessage); var responseData = await response.Content.ReadAsStringAsync(); var result = JsonConvert.DeserializeObject<Result>(responseData); responses += result.msg + "!!!"; responses += result.message + "!!!"; if ("500".Equals(result.state)) { responses = "è¿åæ¥éï¼" + responses; return responses; } if ("1".Equals(result.status)) { responses = "è¿åæ¥éï¼" + responses; return responses; } request.Result = 1; request.ResultData = result.msg; request.Status = 1; request.DealWith = 1; _messageCenterServer.ResetUpdate(request); } responses = "éæ¨æåï¼" + responses; return responses; } } public class Result { public string? state { get; set; } public string? msg { get; set; } public string? status { get; set; } public string? message { get; set; } } MES.Service/service/MessageCenterManager.cs
@@ -1,5 +1,6 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service; @@ -7,25 +8,54 @@ { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ public List<MessageCenter> getPushFailedPage(MessageCenter query) public List<MessageCenter> GetPushFailedPage(MessageCenter query) { return Context.Queryable<MessageCenter>() .Where(it => it.Result == 0 && it.Status == 1 && it.Seq == 1 && it.CreateBy == query.CreateBy) it.Seq == 1 && it.Title != null) .WhereIF(query.isShow == 1, it => it.DealWith == 0) .OrderByDescending(it => it.CreateDate) .ToPageList(1, 20); } public bool save(MessageCenter entity) public int save(MessageCenter entity) { entity.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); entity.Method = "POST"; return Db.Insertable(entity).ExecuteReturnIdentity(); } public bool SetError(MessageCenter entity) { entity.CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); entity.Method = "POST"; entity.Result = 0; entity.DealWith = 0; entity.Status = 1; return base.Insert(entity); } //è·åææ没ææåçè¯·æ± public List<MessageCenter> ErrorMsg() { return Context.Queryable<MessageCenter>() .GroupBy(a => new { a.TableName, a.Pid, a.Title, a.PageName }) .Where(a => a.DealWith == 0 && a.Status == 0 && a.Result == 0 && a.Title == null) .Select<MessageCenter>(a => new MessageCenter { TableName = a.TableName, Pid = a.Pid, Title = a.Title, PageName = a.PageName, Count = SqlFunc.AggregateCount(a.Id) }).ToList(); } //æ ¹æ®å ç§æ åµæ´æ° ä¿æ页é¢idæ¯åºå®ç
@@ -64,7 +64,7 @@ BoardModel = b.BoardModel, PlanQty = c.PlanQty, Mocode = a.Mocode, BoardStyle = c.BoardStyle, // BoardStyle = c.BoardStyle, Id = a.Id }) .ToList(); @@ -156,7 +156,7 @@ CatQty = a.CatQty, MoidNum = s.MoidNum, Daa020 = a.LineNo, DetailMem = a.DetailMem, // DetailMem = a.DetailMem, TaskNo = a.TaskNo, Id = s.Id, CreateBy = s.CreateBy, @@ -169,9 +169,9 @@ FcheckResu = s.FcheckResu, Remarks = s.Remarks, BoardModel = b.BoardModel, PlanQty = c.PlanQty, Mocode = a.Mocode, BoardStyle = c.BoardStyle PlanQty = c.PlanQty // Mocode = a.Mocode, // BoardStyle = c.BoardStyle }).OrderBy(s => s.CreateDate, OrderByType.Desc) .ToPageList(queryObj.PageIndex, queryObj.Limit); } MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,78 @@ using MES.Service.DB; using MES.Service.Modes; using SqlSugar; namespace MES.Service.service.Warehouse; public class MesInvItemBarcodesManager : Repository<MesInvItemBarcodes> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ //è¿éé¢åç代ç ä¸ä¼ç»è¦ç,å¦æè¦éæ°çæ请å é¤ MesInvItemBarcodesManager.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(MesInvItemBarcodes).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 MesInvItemBarcodes(); //æµè¯åæ° var insertArray = new[] { insertData }; base.Insert(insertData); //æå ¥ base.InsertRange(insertArray); //æ¹éæå ¥ var id = base.InsertReturnIdentity(insertData); //æå ¥è¿åèªå¢å AsInsertable(insertData).ExecuteCommand(); //æ们å¯ä»¥è½¬æ Insertableå®ç°å¤ææå ¥ /*********æ´æ°*********/ var updateData = new MesInvItemBarcodes(); //æµè¯åæ° var updateArray = new[] { updateData }; //æµè¯åæ° base.Update(updateData); //æ ¹æ®å®ä½æ´æ° base.UpdateRange(updateArray); //æ¹éæ´æ° //base.Update(it => new MesInvItemBarcodes() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ´æ°ClassNameååCreateTimeåï¼å ¶å®åä¸æ´æ°ï¼æ¡ä»¶id=1 AsUpdateable(updateData).ExecuteCommand(); //转æUpdateableå¯ä»¥å®ç°å¤æçæå ¥ /*********å é¤*********/ var deldata = new MesInvItemBarcodes(); //æµè¯åæ° 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/Warehouse/MesInvItemInCDetailsManager.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,317 @@ using System.Data; using MES.Service.DB; using MES.Service.Dto.service; using MES.Service.Modes; using Newtonsoft.Json; using SqlSugar; using DbType = System.Data.DbType; namespace MES.Service.service.Warehouse; public class MesInvItemInCDetailsManager : Repository<MesInvItemInCDetails> { //å½å类已ç»ç»§æ¿äº Repository å¢ãå ãæ¥ãæ¹çæ¹æ³ private readonly MessageCenterManager _messageCenterManager = new(); public PurchaseInventory SaveBarCodes(WarehouseQuery entity) { // éè´å ¥åº[FILED3[userName[sectionCode[barcode var inputParam = "éè´å ¥åº[FILED3[" + entity.userName + "[" + entity.sectionCode + "[" + entity.barcode; // å®ä¹è¾åºåæ° var outputParam = new SugarParameter("c_result", null, DbType.String, ParameterDirection.Output, 4000); // ä½¿ç¨ SqlSugar æ§è¡åå¨è¿ç¨ Db.Ado.ExecuteCommand( "BEGIN prc_rf_pda_scan_in_barcode(:c_in_str, :c_result); END;", new SugarParameter("c_in_str", inputParam, DbType.String), outputParam); // è·åè¾åºåæ°çå¼ var resultValue = outputParam.Value?.ToString(); // æ ¹æ®è¿åå¼å¤çé»è¾ if (resultValue.StartsWith("001")) { // æªå并å¤çç»æ // å»æåç¼ "001[" åæåç "]" var content = resultValue.Substring(4).TrimEnd(']'); // æå第ä¸ä¸ªéå·ä¹åçé¨å var parts = content.Split(','); var mesInvItemInCDetails = base.GetSingle(it => it.ItemBarcode == entity.barcode); if (mesInvItemInCDetails == null) throw new Exception("åºç°å¼å¸¸"); // æåºå¼å¸¸ä»¥ä¾åå°å¤ç var itemInId = mesInvItemInCDetails.ItemInId; entity.id = itemInId; entity.PageIndex = 1; entity.Limit = 1; var inventory = getPurchaseInventory(entity); inventory.ItemNo = parts[0]; inventory.SumQuantity = Convert.ToDecimal(parts[1]); return inventory; } if (resultValue.StartsWith("002")) { // æå并æåºå¼å¸¸ä¿¡æ¯ var errorMessage = resultValue.Substring(4); // è·å "002" åé¢çé¨å throw new Exception(errorMessage); // æåºå¼å¸¸ä»¥ä¾åå°å¤ç } throw new Exception("æªç¥é误: " + resultValue); } public PurchaseInventory getPurchaseInventory(WarehouseQuery query) { return new PurchaseInventory { ItemIns = GetInvItemInsList(query)[0], ItemInDetails = GetItemInDetails(query.id), InvItemInCDetails = GetInvItemInCDetails(query.id) }; } public List<MesInvItemIns> GetInvItemInsList(WarehouseQuery query) { return Db.Queryable<MesInvItemIns, MesDepots, MesSupplier>((a, b, c) => new JoinQueryInfos(JoinType.Left, a.DepotsCode == b.DepotCode && b.Factory == a.Factory && b.Company == a.Company, JoinType.Left, a.SuppNo == c.SuppNo)) .WhereIF(query.id > 0, (a, b, c) => a.Id == query.id) .Select((a, b, c) => new MesInvItemIns { Id = a.Id, SuppNo = a.SuppNo, InsDate = a.InsDate, PaperBillNo = a.PaperBillNo, Remark = a.Remark, DepotsCode = a.DepotsCode, CbillNo = a.CbillNo, Status = a.Status, BillNo = a.BillNo, CreateDate = a.CreateDate, CreateBy = a.CreateBy, DepotName = b.DepotName, SuppName = c.SuppName }).ToPageList(query.PageIndex, query.Limit); } public List<MesInvItemInCDetails> GetItemInDetails(decimal? pid) { var result = Db.Queryable<MesInvItemInCDetails, MesItems>( (g, c) => new JoinQueryInfos( JoinType.Left, g.ItemNo == c.ItemNo && g.Company == c.Company && g.Factory == c.Factory ) ) .WhereIF(pid > 0, (g, c) => g.ItemInId == pid) .GroupBy((g, c) => new { g.Company, g.Factory, g.ItemInId, g.WorkNo, g.ItemNo, g.BoardStyle, g.WorkLine, c.ItemName, c.ItemModel, c.ItemUnit }) .Select((g, c) => new MesInvItemInCDetails { Company = g.Company, Factory = g.Factory, ItemInId = g.ItemInId, WorkNo = g.WorkNo, ItemNo = g.ItemNo, ItemName = c.ItemName, ItemModel = c.ItemModel, ItemUnit = c.ItemUnit, BoardStyle = g.BoardStyle, WorkLine = g.WorkLine, SumQuantity = SqlFunc.AggregateSum(g.Quantity) // èåè®¡ç® }) .ToList(); return result; } public List<MesInvItemInCDetails> GetInvItemInCDetails(decimal? pid) { var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>( (g, c, d) => new JoinQueryInfos( JoinType.Left, g.ItemNo == c.ItemNo && g.Company == c.Company && g.Factory == c.Factory, JoinType.Inner, d.Id == Convert.ToDecimal(c.ItemUnit) ) ).WhereIF(pid > 0, (g, c, d) => g.ItemInId == pid) .Select((g, c, d) => new MesInvItemInCDetails { Id = g.Id, ItemName = c.ItemName, ItemModel = c.ItemModel, ItemUnit = d.Fname, DepotSectionCode = g.DepotSectionCode, CbillNo = g.CbillNo, ItemBarcode = g.ItemBarcode, UrgentFlag = g.UrgentFlag, ItemNo = g.ItemNo, WorkNo = g.WorkNo, Quantity = g.Quantity }) .ToList(); return result; } public MessageCenter MesToErpParam(WarehouseQuery query) { var erpParameters = ""; var title = ""; var tableName = "MES_INV_ITEM_INS_" + query.Type; if ("A".Equals(query.Type)) { erpParameters = GetErpParameters(query.billNo); title = "éè´å ¥åºå" + query.billNo + "å®¡æ ¸"; } else if ("B".Equals(query.Type)) { erpParameters = GetDeApprovePam(query.id); title = "éè´å ¥åºå" + query.billNo + "åå®¡æ ¸"; } var message = new MessageCenter { TableName = tableName, Url = "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo", Status = 1, CreateBy = query.userName, Route = query.billNo, Title = title, PageName = "Warehouse/PurchaseInventory/Add?id=" + query.id + "&billNo=" + query.billNo, CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), Method = "POST", Seq = 1, Data = erpParameters, ContentType = "application/x-www-form-urlencoded" }; return message; } public MessageCenter SaveMessageCenter(WarehouseQuery query) { var message = MesToErpParam(query); var executeReturnIdentity = Db.Insertable(message).ExecuteReturnIdentity(); if (executeReturnIdentity > 0) { message.Id = executeReturnIdentity; message.Pid = executeReturnIdentity; return message; } throw new Exception("è·åæ°æ®å¤±è´¥"); } //audit public bool audit(WarehouseQuery entity) { entity.date = DateTime.Now; entity.status = 1; return Update(entity); } public bool deApprove(WarehouseQuery entity) { entity.date = null; entity.status = 0; return Update(entity); } private bool Update(WarehouseQuery entity) { return Db.Updateable<MesInvItemIns>() .SetColumns(x => x.Status == entity.status) .SetColumns(x => x.InsDate == entity.date) .Where(x => x.BillNo == entity.billNo) .ExecuteCommand() > 0; } private string GetErpParameters(string? billNo) { var invItemIns = Db.Queryable<MesInvItemIns>() .Single(x => x.BillNo == billNo); if (invItemIns == null) throw new Exception("å ¥åºåå·ä¸åå¨"); if (invItemIns.Status == 1) throw new Exception("å ¥åºåå·²å®¡æ ¸ï¼ä¸è½éå¤æ¨é"); var materials = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit, MesInvItemArnDetail>( (g, c, d, a) => new JoinQueryInfos( JoinType.Left, g.ItemNo == c.ItemNo && g.Company == c.Company && g.Factory == c.Factory, JoinType.Inner, d.Id == Convert.ToDecimal(c.ItemUnit), JoinType.Inner, a.Ebeln == g.WorkNo && a.WorkLine == g.EbelnLineNo && g.CbillNo == a.CbillNo ) ).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>( (g, c, d, a) => new Material { FstockId = g.DepotCode, FuintId = d.Fnumber, FsrcEntryId = a.Id, FmesEntryId = g.Id, FmaterialId = a.ItemNo, DepotSectionCode = g.DepotSectionCode, WorkNo = g.WorkNo, Frealqty = g.Quantity }).ToList(); if (materials == null || materials.Count == 0) throw new Exception("没ææ¾å°ç¸å ³æ°æ®"); // æåºå¼å¸¸ä»¥ä¾åå°å¤ç // æé JSON var jsonEntries = materials.Select(d => new { FMaterialId = d.FmaterialId, FUintId = d.FuintId, FRealQty = d.Frealqty, FStockId = d.FstockId, FSRCENTRYID = d.FsrcEntryId.ToString(), F_MES_ENTRYID = d.FmesEntryId.ToString() }).ToList(); var fdate = DateTime.Now.ToString("yyyy-MM-dd"); var jsonString = JsonConvert.SerializeObject(jsonEntries); var encodedUrl = "taskname=CGRK&mesid=" + invItemIns.Id + "&optype=create&datajson={\"F_MES_ID\":\"" + invItemIns.Id + "\",\"FDate\":\"" + fdate + "\",\"cgrkentry\":" + jsonString + "}"; return encodedUrl; } private string GetDeApprovePam(decimal? id) { var sid = (int)id; var encodedUrl = "taskname=CGRK&mesid=" + sid + "&optype=delete&datajson={}"; return encodedUrl; } } MESApplication/Controllers/Base/MessageCenterController.cs
@@ -3,6 +3,7 @@ using MES.Service.service; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json.Linq; namespace MESApplication.Controllers.Base; @@ -10,6 +11,7 @@ [Route("api/[controller]")] public class MessageCenterController : ControllerBase { private readonly GetErpParametersServer ErpParametersServer = new(); private readonly MessageCenterManager m = new(); @@ -34,13 +36,60 @@ } } [HttpPost("GetByPid")] public ResponseResult ResetUpdate(int pid) //Resend [HttpPost("Resend")] public ResponseResult Resend(MessageCenter data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetList(it => it.Pid == pid); resultInfos.tbBillList = ErpParametersServer.Resend(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //saveError [HttpPost("SetError")] public ResponseResult SetError([FromBody] MessageCenter data) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.SetError(data); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("GetByPid")] public ResponseResult ResetUpdate([FromBody] JObject data) { var pid = Convert.ToDecimal(data["pid"].ToString()); try { dynamic resultInfos = new ExpandoObject(); var messageCenter = m.GetById(pid); var messageCenters = m.GetList(it => it.Pid == pid); messageCenters.Add(messageCenter); resultInfos.tbBillList = messageCenters; return new ResponseResult { status = 0, @@ -60,7 +109,7 @@ try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.getPushFailedPage(query); resultInfos.tbBillList = m.GetPushFailedPage(query); return new ResponseResult { status = 0, @@ -106,8 +155,9 @@ /// </summary> /// <returns></returns> [HttpPost("GetById")] public ResponseResult GetById(int id) public ResponseResult GetById([FromBody] JObject data) { var id = Convert.ToDecimal(data["id"].ToString()); try { dynamic resultInfos = new ExpandoObject(); MESApplication/Controllers/BasicData/MesItemsController.cs
@@ -32,6 +32,7 @@ entity.Data = JsonConvert.SerializeObject(unit); entity.Status = 1; entity.CreateBy = "PL017"; try { dynamic resultInfos = new ExpandoObject(); MESApplication/Controllers/Warehouse/MesInvItemBarcodesController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,163 @@ using System.Dynamic; using MES.Service.Modes; using MES.Service.service.Warehouse; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.Warehouse; [ApiController] [Route("api/[controller]")] public class MesInvItemBarcodesController : ControllerBase { private readonly MesInvItemBarcodesManager 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] MesInvItemBarcodes 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] MesInvItemBarcodes 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] MesInvItemBarcodes 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/Warehouse/MesInvItemInCDetailsController.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,288 @@ using System.Dynamic; using MES.Service.Dto.service; using MES.Service.Modes; using MES.Service.service.Warehouse; using MES.Service.util; using Microsoft.AspNetCore.Mvc; namespace MESApplication.Controllers.Warehouse; [ApiController] [Route("api/[controller]")] public class MesInvItemInCDetailsController : ControllerBase { private readonly MesInvItemInCDetailsManager m = new(); //audit [HttpPost("Audit")] public ResponseResult Audit(WarehouseQuery entity) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.audit(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //deApprove [HttpPost("DeApprove")] public ResponseResult DeApprove(WarehouseQuery entity) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.deApprove(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //getPurchaseInventory [HttpPost("GetPurchaseInventory")] public ResponseResult GetPurchaseInventory(WarehouseQuery entity) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.getPurchaseInventory(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("GetInvItemInsList")] public ResponseResult GetInvItemInsList(WarehouseQuery entity) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.GetInvItemInsList(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //SaveBarCodes [HttpPost("SaveBarCodes")] public ResponseResult SaveBarCodes(WarehouseQuery entity) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.SaveBarCodes(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //MesToErp [HttpPost("SaveMessageCenter")] public ResponseResult SaveMessageCenter(WarehouseQuery entity) { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.SaveMessageCenter(entity); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { 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] MesInvItemInCDetails 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] MesInvItemInCDetails 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] MesInvItemInCDetails 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/WomcaaController.cs
@@ -40,9 +40,13 @@ resultInfos.tbBillList = save; entity.Result = 0; if (save) entity.Result = 1; entity.DealWith = 0; if (save) { entity.Result = 1; entity.DealWith = 1; } entity.DealWith = 1; _manager.save(entity); return new ResponseResult 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
