From 9ac75d913f2d17ee4f24b6dc4282e8fb8461a57f Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 22 十月 2024 13:10:27 +0800
Subject: [PATCH] 清空
---
/dev/null | 180 ---------------------------------------------
MESApplication/MESApplication.csproj | 4 +
MES.Service/MES.Service.csproj | 6 +
MESApplication/appsettings.json | 2
4 files changed, 11 insertions(+), 181 deletions(-)
diff --git a/MES.Service/Dto/base/LoginModel.cs b/MES.Service/Dto/base/LoginModel.cs
deleted file mode 100644
index f458113..0000000
--- a/MES.Service/Dto/base/LoginModel.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-锘縩amespace MES.Service.Dto.@base;
-
-public class LoginModel
-{
- public string userID { get; set; }
- public string userPass { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/base/Page.cs b/MES.Service/Dto/base/Page.cs
deleted file mode 100644
index 183be13..0000000
--- a/MES.Service/Dto/base/Page.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Dto.@base;
-
-public class Page
-{
- [SugarColumn(IsIgnore = true)] public int PageIndex { get; set; }
-
- [SugarColumn(IsIgnore = true)] public int Limit { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/ImageDataDto.cs b/MES.Service/Dto/service/ImageDataDto.cs
deleted file mode 100644
index 23b46fe..0000000
--- a/MES.Service/Dto/service/ImageDataDto.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.service;
-
-public class ImageDataDto
-{
- public List<MesQsImage>? entity;
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/InventoryItem.cs b/MES.Service/Dto/service/InventoryItem.cs
deleted file mode 100644
index 581204a..0000000
--- a/MES.Service/Dto/service/InventoryItem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Dto.service;
-
-public class InventoryItem
-{
- [SugarColumn(ColumnName = "DEPOT")] public string Depot { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_MODEL")]
- public string ItemModel { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_NAME")]
- public string ItemName { get; set; }
-
- [SugarColumn(ColumnName = "QTY")] public decimal Qty { get; set; } // 浣跨敤 decimal 鏉ヨ〃绀烘暟閲�
-
- [SugarColumn(ColumnName = "sections_code")]
- public string SectionsCode { get; set; }
-
- [SugarColumn(ColumnName = "erp_item_no")]
- public string ErpItemNo { get; set; }
-
- [SugarColumn(ColumnName = "flist")] public string Flist { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/InventoryItemDetail.cs b/MES.Service/Dto/service/InventoryItemDetail.cs
deleted file mode 100644
index 360126b..0000000
--- a/MES.Service/Dto/service/InventoryItemDetail.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Dto.service;
-
-public class InventoryItemDetail
-{
- [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; }
-
- [SugarColumn(ColumnName = "WORK_LINE")]
- public string WorkLine { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_NAME")]
- public string ItemName { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_MODEL")]
- public string ItemModel { get; set; }
-
- [SugarColumn(ColumnName = "SUM_QUANTITY")]
- public decimal SumQuantity { get; set; }
-
- [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; }
-
- [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; }
-
- [SugarColumn(ColumnName = "QUANTITY")] public decimal Quantity { get; set; }
-
- [SugarColumn(ColumnName = "REFUNDABLE_QUANTITY")]
- public decimal RefundableQuantity { get; set; }
-
- [SugarColumn(ColumnName = "CBILL_NO")] public string CbillNo { get; set; }
-
- [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; }
-
- [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; }
-
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string CreateDate { get; set; } // 濡傛灉闇�瑕佹棩鏈熷鐞嗭紝鍙互鑰冭檻浣跨敤 DateTime 绫诲瀷
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/LLJDto.cs b/MES.Service/Dto/service/LLJDto.cs
deleted file mode 100644
index 6ee2a7b..0000000
--- a/MES.Service/Dto/service/LLJDto.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.service;
-
-public class LLJDto
-{
- public string? userNo { get; set; }
-
- //妫�楠屽崟鍙�
- public string? releaseNo { get; set; }
-
- //涓昏〃id
- public int? gid { get; set; }
-
- //瀛愯〃id
- public int? pid { get; set; }
-
- //瀛欒〃id
- public int? id { get; set; }
-
- //澶囨敞
- public string? Remarks { get; set; }
-
- //==========================================
- //宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁
- public QsItemOqcReq? from { get; set; }
-
- public List<MesQaItemsDetectDetail5>? items { get; set; }
-
- //==========================================
- //宸℃瀛愬瓩琛ㄩ渶瑕佺殑鏁版嵁
-
- public MesQaItemsDetectDetail5? ItemXj01 { get; set; }
-
- public List<MesQaItemsDetectDetail12>? ItemXj02s { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/MESInvItemOutItems.cs b/MES.Service/Dto/service/MESInvItemOutItems.cs
deleted file mode 100644
index 3297111..0000000
--- a/MES.Service/Dto/service/MESInvItemOutItems.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Dto.service;
-
-public class MESInvItemOutItems
-{
- [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; }
-
- [SugarColumn(ColumnName = "PBILL_NO")] public string PbillNo { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_OUT_ID")]
- public string ItemOutId { get; set; }
-
- [SugarColumn(ColumnName = "RK_QTY")] public decimal RkQty { get; set; }
-
- [SugarColumn(ColumnName = "TL_QTY")] public decimal TlQty { get; set; }
-
- [SugarColumn(ColumnName = "WORK_LINE")]
- public string WorkLine { get; set; }
-
- [SugarColumn(ColumnName = "QUANTITY")] public decimal Quantity { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; }
-
- [SugarColumn(ColumnName = "KT_QTY")] public decimal KtQty { get; set; } // 鍓╀綑鍙��
-
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
- public string DepotSectionCode { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_MODEL")]
- public string ItemModel { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_NAME")]
- public string ItemName { get; set; }
-
- [SugarColumn(ColumnName = "CGB014")] public string Cgb014 { get; set; }
-
- [SugarColumn(ColumnName = "STAFF_NAME")]
- public string StaffName { get; set; }
-
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string DepotCode { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/Material.cs b/MES.Service/Dto/service/Material.cs
deleted file mode 100644
index 183cedf..0000000
--- a/MES.Service/Dto/service/Material.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-锘縩amespace MES.Service.Dto.service;
-
-public class Material
-{
- public string? FmrMode { get; set; }
- public string? FngDesc { get; set; }
- public decimal? FsrcEntryId { get; set; }
- public decimal? FrmRealQty { get; set; }
- public string? FmaterialId { get; set; }
- public string? FstockId { get; set; }
- public string? Funit { get; set; }
- 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; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/MovesDto.cs b/MES.Service/Dto/service/MovesDto.cs
deleted file mode 100644
index a36d0d2..0000000
--- a/MES.Service/Dto/service/MovesDto.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.service;
-
-public class MovesDto
-{
- //鍑哄叆鍗�
- public List<MesInvItemMoves>? FromList { get; set; }
- public List<MesInvItemOutItems>? OutItems { get; set; }
- public List<MesInvItemMovesCDetails>? BarcodeList { get; set; }
-
- //鍏ュ簱鍗�
- public bool? InAudit { get; set; }
- public MesInvItemBarcodes? BarcodesInfo { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/OutItemDto.cs b/MES.Service/Dto/service/OutItemDto.cs
deleted file mode 100644
index 14bc886..0000000
--- a/MES.Service/Dto/service/OutItemDto.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.service;
-
-public class OutItemDto
-{
- public MesInvItemOuts? Form { get; set; }
- public List<MesInvItemOutItems>? SaveItems { get; set; }
- public List<MESInvItemOutItems>? SelectItems { get; set; }
-
- public string? ItemNo { get; set; }
-
- public decimal? Quantity { get; set; }
-
- public List<InventoryItem>? SumItem { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/PurchaseInventory.cs b/MES.Service/Dto/service/PurchaseInventory.cs
deleted file mode 100644
index 3067272..0000000
--- a/MES.Service/Dto/service/PurchaseInventory.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing 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<MesInvItemInCItems>? ItemInDetails { get; set; }
-
- public List<MesInvItemStocks>? ItemStocks { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/QAItemResult.cs b/MES.Service/Dto/service/QAItemResult.cs
deleted file mode 100644
index 205a235..0000000
--- a/MES.Service/Dto/service/QAItemResult.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縩amespace MES.Service.Dto.service;
-
-public class QAItemResult
-{
- public string? fcheckItem { get; set; }
- public decimal? checkQty { get; set; }
- public int? count { get; set; }
-
- public string? releaseNo { get; set; }
-
- public decimal? id { get; set; }
-
- public string fcheckResu { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/QsItem.cs b/MES.Service/Dto/service/QsItem.cs
deleted file mode 100644
index 944f631..0000000
--- a/MES.Service/Dto/service/QsItem.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.service;
-
-public class QsItem
-{
- public QsItemIpiReq? From { get; set; }
-
- public List<QsItemIpiItem>? Items { get; set; }
-
- //涓昏〃id
- public int? gid { get; set; }
-
- //瀛愯〃id
- public int? pid { get; set; }
-
- //瀛欒〃id
- public int? id { get; set; }
-
- //澶囨敞
- public string? Remarks { get; set; }
-
- public string? StatusUser { get; set; }
-
- public SJPageResult? Result { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/RKJDaa001.cs b/MES.Service/Dto/service/RKJDaa001.cs
deleted file mode 100644
index 2714b22..0000000
--- a/MES.Service/Dto/service/RKJDaa001.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-锘縰sing MES.Service.Dto.@base;
-using SqlSugar;
-
-namespace MES.Service.Dto.service;
-
-//鐟炲崱鍏ュ簱妫�閫夊彇宸ュ崟鐨勮鍥撅紝鍙檺鐟炲崱浣跨敤,鍥犱负宸ュ崟琛ㄤ笉鍚�
-
-[SugarTable("V_QS_RK_DAA001")] //鐢ㄤ簬SqlSugar
-public class RKJDaa001 : Page
-{
- // 閫佹鎵规
- [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; }
-
- // 浠诲姟鍗曞彿
- [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; }
-
- // 璁㈠崟鏁伴噺
- [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; }
-
- // 鐢熶骇璁㈠崟
- [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }
-
- // 瑙勬牸鍨嬪彿
- [SugarColumn(ColumnName = "BOARD_MODEL")]
- public string? BoardModel { get; set; }
-
- // 浜у搧绫诲瀷
- [SugarColumn(ColumnName = "CBILL_NO")] public string? cbillNo { get; set; }
-
- // 浜х嚎缂栫爜
- [SugarColumn(ColumnName = "LINE_NO")] public string? LineNo { get; set; }
-
-
- //ITEM_NO
- [SugarColumn(ColumnName = "ITEM_NO")] public string? itemNo { get; set; }
-
-
- [SugarColumn(ColumnName = "COLOR_NAME")]
- public string? ColorName { get; set; }
-
-
- [SugarColumn(ColumnName = "BOARD_NAME")]
- public string? BoardName { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/RKJDto.cs b/MES.Service/Dto/service/RKJDto.cs
deleted file mode 100644
index cab909f..0000000
--- a/MES.Service/Dto/service/RKJDto.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.service;
-
-public class RKJDto
-{
- public string? userNo { get; set; }
-
- //涓昏〃id
- public int? gid { get; set; }
-
- //瀛愯〃id
- public int? pid { get; set; }
-
- //瀛欒〃id
- public int? id { get; set; }
-
- //澶囨敞
- public string? Remarks { get; set; }
-
- //==========================================
- //宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁
- public QsItemOqcReq? from { get; set; }
-
- public List<QsItemOqcItem>? items { get; set; }
-
- //==========================================
- //宸℃瀛愬瓩琛ㄩ渶瑕佺殑鏁版嵁
-
- public QsItemOqcItem? ItemXj01 { get; set; }
-
- public List<QsItemOqcItemDetail>? ItemXj02s { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/ResultClass.cs b/MES.Service/Dto/service/ResultClass.cs
deleted file mode 100644
index 7f67997..0000000
--- a/MES.Service/Dto/service/ResultClass.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-锘縩amespace MES.Service.Dto.service;
-
-public class ResultClass
-{
- public decimal FSAMPLE_SIZE_WORD { get; set; }
- public decimal Result { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
deleted file mode 100644
index fb35a4c..0000000
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-锘縰sing MES.Service.Dto.@base;
-using SqlSugar;
-
-namespace MES.Service.Dto.service;
-
-[SugarTable("V_MES_SJ")] //鐢ㄤ簬SqlSugar
-public class SJPageResult : Page
-{
- public decimal? Id { get; set; }
-
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- public string? BillNo { get; set; }
-
-
- [SugarColumn(ColumnName = "STATUS_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? StatusDate { get; set; }
-
- public string? FName { get; set; }
- public string? Result { get; set; }
-
- [SugarColumn(ColumnName = "STATUS_USER")] //鐢ㄤ簬SqlSugar
- public string? StatusUser { get; set; }
-
-
- //WORKSHOP_CODE
- // [SugarColumn(ColumnName = "WORKSHOP_CODE")] //鐢ㄤ簬SqlSugar
- // public string? workshopCode { get; set; }
-
- //PBAID
- [SugarColumn(ColumnName = "PBAID")] //鐢ㄤ簬SqlSugar
- public string? Pbaid { get; set; }
-
- //COMPLETE_TIME
- // [SugarColumn(ColumnName = "COMPLETE_TIME")] //鐢ㄤ簬SqlSugar
- // public DateTime? CompleteTime { get; set; }
-
- [SugarColumn(ColumnName = "CREATE_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateTime { get; set; }
-
- [SugarColumn(ColumnName = "COMMENTS")] //鐢ㄤ簬SqlSugar
- public string? Comments { get; set; }
-
- // [SugarColumn(ColumnName = "WORKSHOP_NAME")] //鐢ㄤ簬SqlSugar
- // public string? WorkshopName { get; set; }
-
- //ITEM_MOD
- [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
- public string? ItemMod { get; set; }
-
- //ITEM_NAME
- // [SugarColumn(ColumnName = "ITEM_NAME")] //鐢ㄤ簬SqlSugar
- // public string? ItemName { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- public string? ItemNo { get; set; }
-
- [SugarColumn(ColumnName = "DAA001")] //鐢ㄤ簬SqlSugar
- public string? daa001 { get; set; }
-
- [SugarColumn(ColumnName = "CAT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? catQty { get; set; }
-
- [SugarColumn(ColumnName = "DETAIL_MEM")] //鐢ㄤ簬SqlSugar
- public string? detailMem { get; set; }
-
- [SugarColumn(ColumnName = "TASK_NO")] //鐢ㄤ簬SqlSugar
- public string? taskNo { get; set; }
-
- //LINE
- [SugarColumn(ColumnName = "LINE")] //鐢ㄤ簬SqlSugar
- public string? line { get; set; }
-
- /// <summary>
- /// 妯″叿鍙�
- /// </summary>
-
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- public string? MoidNum { get; set; }
-
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- public string? Remarks { get; set; }
-
- //BOARD_MODEL
- [SugarColumn(ColumnName = "BOARD_MODEL")]
- public string? BoardModel { get; set; }
-
- [SugarColumn(ColumnName = "PLAN_QTY")] public decimal? PlanQty { get; set; }
-
- [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }
-
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string? BoardStyle { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/WarehouseQuery.cs b/MES.Service/Dto/service/WarehouseQuery.cs
deleted file mode 100644
index a7422e3..0000000
--- a/MES.Service/Dto/service/WarehouseQuery.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing MES.Service.Dto.@base;
-
-namespace MES.Service.Dto.service;
-
-public class WarehouseQuery : Page
-{
- 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; }
- public string? DepotCode { get; set; }
- public string? SuppNo { get; set; }
-
- public string? Factory { get; set; }
-
- public string? Company { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/XJDto.cs b/MES.Service/Dto/service/XJDto.cs
deleted file mode 100644
index f36a69b..0000000
--- a/MES.Service/Dto/service/XJDto.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.service;
-
-public class XJDto
-{
- public string? userNo { get; set; }
-
- //涓昏〃id
- public int? gid { get; set; }
-
- //瀛愯〃id
- public int? pid { get; set; }
-
- //瀛欒〃id
- public int? id { get; set; }
-
- //澶囨敞
- public string? Remarks { get; set; }
-
- //==========================================
- //宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁
- public QsQaItemXj? from { get; set; }
-
- public List<QsQaItemXj01>? items { get; set; }
-
- //==========================================
- //宸℃瀛愬瓩琛ㄩ渶瑕佺殑鏁版嵁
-
- public QsQaItemXj01? ItemXj01 { get; set; }
-
- public List<QsQaItemXj02>? ItemXj02s { get; set; }
-
- public MesQsSuspend? entity { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/XJItemDto.cs b/MES.Service/Dto/service/XJItemDto.cs
deleted file mode 100644
index b186b3a..0000000
--- a/MES.Service/Dto/service/XJItemDto.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縩amespace MES.Service.Dto.service;
-
-public class XJItemDto
-{
- public string? id { get; set; }
- public string? fcheckLevel { get; set; }
- public string? fstand { get; set; }
- public string? fupAllow { get; set; }
- public string? fdownAllow { get; set; }
- public string? sampleSizeNo { get; set; }
- public string? fcheckItemDesc { get; set; }
- public string? fcheckItem { get; set; }
- public string? fspecRequ { get; set; }
- public string? checkQyt { get; set; }
- public string? facQty { get; set; }
- public string? freQty { get; set; }
- public string? fcheckTool { get; set; }
- public string? facLevel { get; set; }
- public string? releaseNo { get; set; }
-
- public string? itemNo { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/XJPageResult.cs b/MES.Service/Dto/service/XJPageResult.cs
deleted file mode 100644
index 04135f7..0000000
--- a/MES.Service/Dto/service/XJPageResult.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-锘縰sing MES.Service.Dto.@base;
-
-namespace MES.Service.Dto.service;
-
-public class XJPageResult : Page
-{
- public string? createUser { get; set; }
- public string? result { get; set; }
- public string? id { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/MES.Service.csproj b/MES.Service/MES.Service.csproj
index 5e01337..679c452 100644
--- a/MES.Service/MES.Service.csproj
+++ b/MES.Service/MES.Service.csproj
@@ -11,4 +11,10 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.158"/>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Dto\service\" />
+ <Folder Include="Modes\" />
+ <Folder Include="service\BasicData\" />
+ </ItemGroup>
+
</Project>
diff --git a/MES.Service/Modes/LtsLlj.cs b/MES.Service/Modes/LtsLlj.cs
deleted file mode 100644
index 8fec4dd..0000000
--- a/MES.Service/Modes/LtsLlj.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鏁版嵁婧愬鍏�
-///</summary>
-[SugarTable("LTS_LLJ")]
-public class LtsLlj
-{
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "Id")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏍囪瘑
- ///</summary>
- [SugarColumn(ColumnName = "MODIFY1_FLAG")]
- public decimal? Modify1Flag { get; set; }
-
- /// <summary>
- /// 閫佹鎵规
- ///</summary>
- [SugarColumn(ColumnName = "LOT_NO")]
- public string LotNo { get; set; }
-
- /// <summary>
- /// 澶勭悊鏂规硶
- ///</summary>
- [SugarColumn(ColumnName = "FNG_HANDLE")]
- public string FngHandle { get; set; }
-
- /// <summary>
- /// 鐗╂枡鐗堟湰
- ///</summary>
- [SugarColumn(ColumnName = "FVERSION")]
- public decimal? Fversion { get; set; }
-
- /// <summary>
- /// 澶囨敞淇℃伅
- ///</summary>
- [SugarColumn(ColumnName = "LOT_NO1")]
- public string LotNo1 { get; set; }
-
- /// <summary>
- /// 杞崲鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "FCOVERT_QTY")]
- public string FcovertQty { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
- public string FcheckResu { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- ///</summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string SuppNo { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- ///</summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
- public string ReleaseNo { get; set; }
-
- /// <summary>
- /// 閲囪喘鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "FBATCH_QTY")]
- public string FbatchQty { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 妫�楠屼汉鍛�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_BY")]
- public string FcheckBy { get; set; }
-
- /// <summary>
- /// 涓嶈壇鎻忚堪
- ///</summary>
- [SugarColumn(ColumnName = "FNG_DESC")]
- public string FngDesc { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- ///</summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string CreateDate { get; set; }
-
- /// <summary>
- /// 鏄惁鎬ユ枡
- ///</summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
- public short? UrgentFlag { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_NAME")]
- public string ItemName { get; set; }
-
- /// <summary>
- /// 妫�楠岀被鍨�
- ///</summary>
- [SugarColumn(ColumnName = "QATYPE")]
- public string Qatype { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- ///</summary>
- [SugarColumn(ColumnName = "DATE_01")]
- public string Date01 { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- ///</summary>
- [SugarColumn(ColumnName = "SUPP_NAME")]
- public string SuppName { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_MODEL")]
- public string ItemModel { get; set; }
-
- /// <summary>
- /// 搴撳瓨鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "KC_QTY")]
- public decimal? KcQty { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- ///</summary>
- [SugarColumn(ColumnName = "STATUS")]
- public string STATUS { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗�
- ///</summary>
- [SugarColumn(ColumnName = "SALES_ORDER_ID")]
- public string SalesOrderId { get; set; }
-
- /// <summary>
- /// 濮斿鏍囪瘑锛�0锛氶噰璐� 銆�1锛氬澶栵級
- ///</summary>
- [SugarColumn(ColumnName = "F_TYPE")]
- public int Ftype { get; set; }
-
- /// <summary>
- /// 濮斿鏍囪瘑锛�0锛氭湭鎻愪氦 銆�1锛氬凡鎻愪氦锛�
- ///</summary>
- [SugarColumn(ColumnName = "fsubmit")]
- public int Fsubmit { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesBoardBaseInfo.cs b/MES.Service/Modes/MesBoardBaseInfo.cs
deleted file mode 100644
index 1c8eaa0..0000000
--- a/MES.Service/Modes/MesBoardBaseInfo.cs
+++ /dev/null
@@ -1,467 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 浜у搧淇℃伅琛�
-/// </summary>
-[Table("MES_BOARD_BASE_INFO")]
-[SugarTable("MES_BOARD_BASE_INFO")] //鐢ㄤ簬SqlSugar
-public class MesBoardBaseInfo
-{
- /// <summary>
- /// ID
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鏉＄爜绫诲瀷ID
- /// </summary>
- [Column("BARCODE_TYPE_ID")]
- [SugarColumn(ColumnName = "BARCODE_TYPE_ID")] //鐢ㄤ簬SqlSugar
- public decimal? BarcodeTypeId { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [Column("BOARD_ITEM")]
- [SugarColumn(ColumnName = "BOARD_ITEM")] //鐢ㄤ簬SqlSugar
- [StringLength(64, ErrorMessage = "浜у搧缂栫爜闀垮害涓嶈兘瓒呭嚭64")]
- public string BoardItem { get; set; }
-
- /// <summary>
- /// 浜у搧鐢熶骇绾夸綋
- /// </summary>
- [Column("BOARD_LINENO")]
- [SugarColumn(ColumnName = "BOARD_LINENO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜у搧鐢熶骇绾夸綋闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardLineno { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [Column("BOARD_MODEL")]
- [SugarColumn(ColumnName = "BOARD_MODEL")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "浜у搧瑙勬牸闀垮害涓嶈兘瓒呭嚭500")]
- public string BoardModel { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О(鍘熷崟鏉垮悕绉�)
- /// </summary>
- [Column("BOARD_NAME")]
- [SugarColumn(ColumnName = "BOARD_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "浜у搧鍚嶇О(鍘熷崟鏉垮悕绉�)闀垮害涓嶈兘瓒呭嚭500")]
- public string BoardName { get; set; }
-
- /// <summary>
- /// 浜у搧鏈哄瀷
- /// </summary>
- [Column("BOARD_STYLE")]
- [SugarColumn(ColumnName = "BOARD_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "浜у搧鏈哄瀷闀垮害涓嶈兘瓒呭嚭500")]
- public string BoardStyle { get; set; }
-
- /// <summary>
- /// 閫傞厤璁′欢鍨嬪彿
- /// </summary>
- [Column("BOARD_STYLE_J")]
- [SugarColumn(ColumnName = "BOARD_STYLE_J")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "閫傞厤璁′欢鍨嬪彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardStyleJ { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [Column("BOARD_UNIT")]
- [SugarColumn(ColumnName = "BOARD_UNIT")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鍗曚綅闀垮害涓嶈兘瓒呭嚭10")]
- public string BoardUnit { get; set; }
-
- /// <summary>
- /// 鏄惁BOM鎵佸钩鍖�
- /// </summary>
- [Column("BOM_FLAT_FLAG")]
- [SugarColumn(ColumnName = "BOM_FLAT_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? BomFlatFlag { get; set; }
-
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [Column("COLOR_NAME")]
- [SugarColumn(ColumnName = "COLOR_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "棰滆壊闀垮害涓嶈兘瓒呭嚭500")]
- public string ColorName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 璁板綍鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "璁板綍鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 榛樿浠撳簱
- /// </summary>
- [Column("DEPOT_CODE")]
- [SugarColumn(ColumnName = "DEPOT_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "榛樿浠撳簱闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotCode { get; set; }
-
- /// <summary>
- /// 榛樿搴撲綅
- /// </summary>
- [Column("DEPOT_SECTION_CODE")]
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "榛樿搴撲綅闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotSectionCode { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("DESCRIPTION")]
- [SugarColumn(ColumnName = "DESCRIPTION")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Description { get; set; }
-
- /// <summary>
- /// 鍏冧欢鏁�
- /// </summary>
- [Column("ELEMENT_QTY")]
- [SugarColumn(ColumnName = "ELEMENT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ElementQty { get; set; }
-
- /// <summary>
- /// ERP鏂欏彿
- /// </summary>
- [Column("ERP_ITEM_NO")]
- [SugarColumn(ColumnName = "ERP_ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ERP鏂欏彿闀垮害涓嶈兘瓒呭嚭50")]
- public string ErpItemNo { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "宸ュ巶闀垮害涓嶈兘瓒呭嚭10")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("FCHECKED_BY1")]
- [SugarColumn(ColumnName = "FCHECKED_BY1")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�20")]
- public string FcheckedBy1 { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("FCHECKED_BY2")]
- [SugarColumn(ColumnName = "FCHECKED_BY2")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�20")]
- public string FcheckedBy2 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("FCHECKED_DATE1")]
- [SugarColumn(ColumnName = "FCHECKED_DATE1")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckedDate1 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("FCHECKED_DATE2")]
- [SugarColumn(ColumnName = "FCHECKED_DATE2")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckedDate2 { get; set; }
-
- /// <summary>
- /// 瀹℃壒鏍囪瘑
- /// </summary>
- [Column("FCHECK_FLAG1")]
- [SugarColumn(ColumnName = "FCHECK_FLAG1")] //鐢ㄤ簬SqlSugar
- public decimal? FcheckFlag1 { get; set; }
-
- /// <summary>
- /// 瀹℃壒鏍囪瘑
- /// </summary>
- [Column("FCHECK_FLAG2")]
- [SugarColumn(ColumnName = "FCHECK_FLAG2")] //鐢ㄤ簬SqlSugar
- public decimal? FcheckFlag2 { get; set; }
-
- /// <summary>
- /// 瀹℃壒鐘舵��
- /// </summary>
- [Column("FCHECK_TYP")]
- [SugarColumn(ColumnName = "FCHECK_TYP")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "瀹℃壒鐘舵�侀暱搴︿笉鑳借秴鍑�200")]
- public string FcheckTyp { get; set; }
-
- /// <summary>
- /// 棰滆壊鏍囪瘑(1锛氬伐搴廈OM缁存姢閿欒)
- /// </summary>
- [Column("FCOLOR")]
- [SugarColumn(ColumnName = "FCOLOR")] //鐢ㄤ簬SqlSugar
- public decimal? Fcolor { get; set; }
-
- /// <summary>
- /// MRPII棣栧伐搴忓簭鍙�
- /// </summary>
- [Column("FIRST_SEQ")]
- [SugarColumn(ColumnName = "FIRST_SEQ")] //鐢ㄤ簬SqlSugar
- public decimal? FirstSeq { get; set; }
-
- /// <summary>
- /// 鏈�杩戞洿鏂颁汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏈�杩戞洿鏂颁汉闀垮害涓嶈兘瓒呭嚭30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏈�杩戞洿鏂版椂闂�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 鏄惁绾冲叆MES绠＄悊
- /// </summary>
- [Column("MES_FLAG")]
- [SugarColumn(ColumnName = "MES_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? MesFlag { get; set; }
-
- /// <summary>
- /// 鏄惁MRPII鍗曟澘
- /// </summary>
- [Column("MRP_ITEM")]
- [SugarColumn(ColumnName = "MRP_ITEM")] //鐢ㄤ簬SqlSugar
- public decimal? MrpItem { get; set; }
-
- /// <summary>
- /// 璐熸瀬閰嶆柟鐢ㄩ噺
- /// </summary>
- [Column("NEG_QTY")]
- [SugarColumn(ColumnName = "NEG_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? NegQty { get; set; }
-
- /// <summary>
- /// 琛屼笟鏍囧噯鎻忚堪
- /// </summary>
- [Column("NORMT")]
- [SugarColumn(ColumnName = "NORMT")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "琛屼笟鏍囧噯鎻忚堪闀垮害涓嶈兘瓒呭嚭100")]
- public string Normt { get; set; }
-
- /// <summary>
- /// 缁勭粐
- /// </summary>
- [Column("ORG")]
- [SugarColumn(ColumnName = "ORG")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "缁勭粐闀垮害涓嶈兘瓒呭嚭10")]
- public string Org { get; set; }
-
- /// <summary>
- /// 姣忕鏁伴噺
- /// </summary>
- [Column("PACK_BOX_QTY")]
- [SugarColumn(ColumnName = "PACK_BOX_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PackBoxQty { get; set; }
-
- /// <summary>
- /// 姣忓崱鏉跨鏁�
- /// </summary>
- [Column("PACK_CB_QTY")]
- [SugarColumn(ColumnName = "PACK_CB_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PackCbQty { get; set; }
-
- /// <summary>
- /// 鍖呰娉ㄦ剰浜嬮」
- /// </summary>
- [Column("PACK_SHIP_MEMO")]
- [SugarColumn(ColumnName = "PACK_SHIP_MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "鍖呰娉ㄦ剰浜嬮」闀垮害涓嶈兘瓒呭嚭255")]
- public string PackShipMemo { get; set; }
-
- /// <summary>
- /// 鍑鸿揣鍖呰鏂瑰紡
- /// </summary>
- [Column("PACK_SHIP_NO")]
- [SugarColumn(ColumnName = "PACK_SHIP_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鍑鸿揣鍖呰鏂瑰紡闀垮害涓嶈兘瓒呭嚭10")]
- public string PackShipNo { get; set; }
-
- /// <summary>
- /// 姣忕浜у搧鏁伴噺
- /// </summary>
- [Column("PACK_SHIP_QTY")]
- [SugarColumn(ColumnName = "PACK_SHIP_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PackShipQty { get; set; }
-
- /// <summary>
- /// 閰嶆柟
- /// </summary>
- [Column("PEIFANG")]
- [SugarColumn(ColumnName = "PEIFANG")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "閰嶆柟闀垮害涓嶈兘瓒呭嚭20")]
- public string Peifang { get; set; }
-
- /// <summary>
- /// 浜у搧鍥剧墖璺緞
- /// </summary>
- [Column("PIC_PATH")]
- [SugarColumn(ColumnName = "PIC_PATH")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "浜у搧鍥剧墖璺緞闀垮害涓嶈兘瓒呭嚭255")]
- public string PicPath { get; set; }
-
- /// <summary>
- /// 姝ｆ瀬閰嶆柟鐢ㄩ噺
- /// </summary>
- [Column("POS_QTY")]
- [SugarColumn(ColumnName = "POS_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PosQty { get; set; }
-
- /// <summary>
- /// 鎴愬搧2锛屽崐鎴愬搧1
- /// </summary>
- [Column("PRD_FLAG")]
- [SugarColumn(ColumnName = "PRD_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? PrdFlag { get; set; }
-
- /// <summary>
- /// 宸ヨ壓灞炴��(鏁板�煎彧鑳芥槸1,2,3)
- /// </summary>
- [Column("PROC_CAPTION")]
- [SugarColumn(ColumnName = "PROC_CAPTION")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ヨ壓灞炴��(鏁板�煎彧鑳芥槸1,2,3)闀垮害涓嶈兘瓒呭嚭20")]
- public string ProcCaption { get; set; }
-
- /// <summary>
- /// 浜у搧绫诲埆
- /// </summary>
- [Column("PRODUCT_TYPE")]
- [SugarColumn(ColumnName = "PRODUCT_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "浜у搧绫诲埆闀垮害涓嶈兘瓒呭嚭20")]
- public string ProductType { get; set; }
-
- /// <summary>
- /// SAP鐗╂枡灏忕被
- /// </summary>
- [Column("PROPERTY_NO")]
- [SugarColumn(ColumnName = "PROPERTY_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "SAP鐗╂枡灏忕被闀垮害涓嶈兘瓒呭嚭50")]
- public string PropertyNo { get; set; }
-
- /// <summary>
- /// 宸ヨ壓绫诲埆缂栧彿
- /// </summary>
- [Column("PTYPE_NO")]
- [SugarColumn(ColumnName = "PTYPE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "宸ヨ壓绫诲埆缂栧彿闀垮害涓嶈兘瓒呭嚭10")]
- public string PtypeNo { get; set; }
-
- /// <summary>
- /// 妫�楠屾ā寮�(鍏ㄦ\鎶芥)
- /// </summary>
- [Column("QC_MODE")]
- [SugarColumn(ColumnName = "QC_MODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "妫�楠屾ā寮�(鍏ㄦ/鎶芥)闀垮害涓嶈兘瓒呭嚭20")]
- public string QcMode { get; set; }
-
- /// <summary>
- /// 榛樿鏀惰揣鍦板潃(瀹㈡埛鍦板潃)
- /// </summary>
- [Column("SHIP_TO")]
- [SugarColumn(ColumnName = "SHIP_TO")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "榛樿鏀惰揣鍦板潃(瀹㈡埛鍦板潃)闀垮害涓嶈兘瓒呭嚭200")]
- public string ShipTo { get; set; }
-
- /// <summary>
- /// 璐存斁鏁�
- /// </summary>
- [Column("SMT_QTY")]
- [SugarColumn(ColumnName = "SMT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? SmtQty { get; set; }
-
- /// <summary>
- /// 杞欢鐗堟湰
- /// </summary>
- [Column("SOFTVERSION")]
- [SugarColumn(ColumnName = "SOFTVERSION")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞欢鐗堟湰闀垮害涓嶈兘瓒呭嚭20")]
- public string Softversion { get; set; }
-
- /// <summary>
- /// 鍋滅敤鏃ユ湡
- /// </summary>
- [Column("STOPDATE")]
- [SugarColumn(ColumnName = "STOPDATE")] //鐢ㄤ簬SqlSugar
- public DateTime? Stopdate { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鏂瑰紡
- /// </summary>
- [Column("STORE_MODE")]
- [SugarColumn(ColumnName = "STORE_MODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍏ュ簱鏂瑰紡闀垮害涓嶈兘瓒呭嚭20")]
- public string StoreMode { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("STYLE_TMP1")]
- [SugarColumn(ColumnName = "STYLE_TMP1")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "StyleTmp1闀垮害涓嶈兘瓒呭嚭500")]
- public string StyleTmp1 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("STYLE_TMP2")]
- [SugarColumn(ColumnName = "STYLE_TMP2")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "StyleTmp2闀垮害涓嶈兘瓒呭嚭50")]
- public string StyleTmp2 { get; set; }
-
- /// <summary>
- /// 鐒婄偣鏁�
- /// </summary>
- [Column("THT_QTY")]
- [SugarColumn(ColumnName = "THT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ThtQty { get; set; }
-
- /// <summary>
- /// 鏈�鏂颁笅杞芥洿鏂版爣璇�
- /// </summary>
- [Column("UPDATE_FLG")]
- [SugarColumn(ColumnName = "UPDATE_FLG")] //鐢ㄤ簬SqlSugar
- public decimal? UpdateFlg { get; set; }
-
- /// <summary>
- /// 鍗曟澘鐗堟湰
- /// </summary>
- [Column("VERSION")]
- [SugarColumn(ColumnName = "VERSION")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍗曟澘鐗堟湰闀垮害涓嶈兘瓒呭嚭20")]
- public string Version { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesCustomer.cs b/MES.Service/Modes/MesCustomer.cs
deleted file mode 100644
index 82ccc5e..0000000
--- a/MES.Service/Modes/MesCustomer.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 瀹㈡埛淇℃伅
-/// </summary>
-[SugarTable("MES_CUSTOMER")]
-public class MesCustomer
-{
- /// <summary>
- /// ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { 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>
- /// 瀹㈡埛绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "CUST_SNAME")]
- public string? CustSname { get; set; }
-
- // <summary>
- /// 鐢佃瘽
- /// </summary>
- [SugarColumn(ColumnName = "TELF1")]
- public string? Telf1 { get; set; }
-
-
- /// <summary>
- /// 鑱旂郴浜�
- /// </summary>
- [SugarColumn(ColumnName = "ANRED")]
- public string? Anred { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鏈�鍚庝慨鏀规椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 鏈�鍚庝慨鏀逛汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string? LastupdateBy { get; set; }
-
-
- /// <summary>
- /// 鍏徃
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
-
- /// <summary>
- /// 鏄惁鎵规绠＄悊(鏄紝鍚�)
- /// </summary>
- [SugarColumn(ColumnName = "LOT_FLAG")]
- public short? LotFlag { get; set; }
-
-
- /// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string? Fforbidstatus { get; set; }
-
- /// <summary>
- /// 閿�鍞憳
- /// </summary>
- [SugarColumn(ColumnName = "FSELLER")]
- public string? Fseller { get; set; }
-
- /// <summary>
- /// 鍌欒ɑ
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "DATA_TYPE")]
- public string? DataType { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepTask.cs b/MES.Service/Modes/MesDepTask.cs
deleted file mode 100644
index cc4dc29..0000000
--- a/MES.Service/Modes/MesDepTask.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞鍗曡〃
-/// </summary>
-[Table("MES_DEP_TASK")]
-[SugarTable("MES_DEP_TASK")] //鐢ㄤ簬SqlSugar
-public class MesDepTask
-{
- /// <summary>
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 浠庤〃ID
- /// </summary>
- [Column("AUTOID")]
- [SugarColumn(ColumnName = "AUTOID")] //鐢ㄤ簬SqlSugar
- public decimal? Autoid { get; set; }
-
- /// <summary>
- /// 澶囨崯鏁伴噺
- /// </summary>
- [Column("BACKUP_QTY")]
- [SugarColumn(ColumnName = "BACKUP_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? BackupQty { get; set; }
-
- /// <summary>
- /// 鏉＄爜ID
- /// </summary>
- [Column("BARCODE_TYPE_ID")]
- [SugarColumn(ColumnName = "BARCODE_TYPE_ID")] //鐢ㄤ簬SqlSugar
- public decimal? BarcodeTypeId { get; set; }
-
- /// <summary>
- /// 鎴愬搧缂栧彿
- /// </summary>
- [Column("BOARD_ITEM")]
- [SugarColumn(ColumnName = "BOARD_ITEM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鎴愬搧缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardItem { get; set; }
-
- /// <summary>
- /// 鎴愬搧鍚嶇О
- /// </summary>
- [Column("BOARD_NAME")]
- [SugarColumn(ColumnName = "BOARD_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "鎴愬搧鍚嶇О闀垮害涓嶈兘瓒呭嚭200")]
- public string BoardName { get; set; }
-
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [Column("BOARD_STYLE")]
- [SugarColumn(ColumnName = "BOARD_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜у搧鍨嬪彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardStyle { get; set; }
-
- /// <summary>
- /// 鍏抽棴鏃ユ湡
- /// </summary>
- [Column("CLOSEDATE")]
- [SugarColumn(ColumnName = "CLOSEDATE")] //鐢ㄤ簬SqlSugar
- public DateTime? Closedate { get; set; }
-
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [Column("COLOR_NAME")]
- [SugarColumn(ColumnName = "COLOR_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "棰滆壊闀垮害涓嶈兘瓒呭嚭500")]
- public string ColorName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭50")]
- public string Company { get; set; }
-
- /// <summary>
- /// 瀹屽伐鏁伴噺
- /// </summary>
- [Column("COMPLETE_QTY")]
- [SugarColumn(ColumnName = "COMPLETE_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? CompleteQty { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鍒跺崟浜�
- /// </summary>
- [Column("CREATOR")]
- [SugarColumn(ColumnName = "CREATOR")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "鍒跺崟浜洪暱搴︿笉鑳借秴鍑�200")]
- public string Creator { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [Column("CUST_NO")]
- [SugarColumn(ColumnName = "CUST_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹㈡埛缂栧彿闀垮害涓嶈兘瓒呭嚭20")]
- public string CustNo { get; set; }
-
- /// <summary>
- /// 瀹㈡埛PO
- /// </summary>
- [Column("CUST_PO")]
- [SugarColumn(ColumnName = "CUST_PO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "瀹㈡埛PO闀垮害涓嶈兘瓒呭嚭50")]
- public string CustPo { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鏈哄瀷
- /// </summary>
- [Column("CUST_STYLE")]
- [SugarColumn(ColumnName = "CUST_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "瀹㈡埛鏈哄瀷闀垮害涓嶈兘瓒呭嚭100")]
- public string CustStyle { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("DATA_FROM")]
- [SugarColumn(ColumnName = "DATA_FROM")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "DataFrom闀垮害涓嶈兘瓒呭嚭10")]
- public string DataFrom { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("DOWN_FLAG")]
- [SugarColumn(ColumnName = "DOWN_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? DownFlag { get; set; }
-
- /// <summary>
- /// 涓嬭浇鏃堕棿
- /// </summary>
- [Column("DOWN_TIME")]
- [SugarColumn(ColumnName = "DOWN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? DownTime { get; set; }
-
- /// <summary>
- /// ERP鐗╂枡缂栧彿
- /// </summary>
- [Column("ERP_ITEM_NO")]
- [SugarColumn(ColumnName = "ERP_ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ERP鐗╂枡缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string ErpItemNo { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FCHECK_BY")]
- [SugarColumn(ColumnName = "FCHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "FcheckBy闀垮害涓嶈兘瓒呭嚭30")]
- public string FcheckBy { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FCHECK_DATE")]
- [SugarColumn(ColumnName = "FCHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FCHECK_STATUS")]
- [SugarColumn(ColumnName = "FCHECK_STATUS")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "FcheckStatus闀垮害涓嶈兘瓒呭嚭200")]
- public string FcheckStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FIRST_ITEM_READY_TIME")]
- [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? FirstItemReadyTime { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FIRST_ITEM_RECEIPT_TIME")]
- [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? FirstItemReceiptTime { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FLAG")]
- [SugarColumn(ColumnName = "FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? Flag { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("ISSUE_STATUS")]
- [SugarColumn(ColumnName = "ISSUE_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? IssueStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "LastupdateBy闀垮害涓嶈兘瓒呭嚭30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [Column("MOCODE")]
- [SugarColumn(ColumnName = "MOCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐢熶骇宸ュ崟闀垮害涓嶈兘瓒呭嚭50")]
- public string Mocode { get; set; }
-
- /// <summary>
- /// 涓昏〃ID
- /// </summary>
- [Column("MOID")]
- [SugarColumn(ColumnName = "MOID")] //鐢ㄤ簬SqlSugar
- public decimal? Moid { get; set; }
-
- /// <summary>
- /// 鍖呰璇存槑
- /// </summary>
- [Column("PACK_SHIP_MEMO")]
- [SugarColumn(ColumnName = "PACK_SHIP_MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "鍖呰璇存槑闀垮害涓嶈兘瓒呭嚭255")]
- public string PackShipMemo { get; set; }
-
- /// <summary>
- /// 鍖呰绫诲瀷
- /// </summary>
- [Column("PACK_SHIP_TYPE")]
- [SugarColumn(ColumnName = "PACK_SHIP_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍖呰绫诲瀷闀垮害涓嶈兘瓒呭嚭20")]
- public string PackShipType { get; set; }
-
- /// <summary>
- /// 璁″垝寮�濮嬫椂闂�
- /// </summary>
- [Column("PLAN_BEGIN_TIME")]
- [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanBeginTime { get; set; }
-
- /// <summary>
- /// 璁″垝瀹屽伐鏃堕棿
- /// </summary>
- [Column("PLAN_FINISH_TIME")]
- [SugarColumn(ColumnName = "PLAN_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanFinishTime { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [Column("PLAN_QTY")]
- [SugarColumn(ColumnName = "PLAN_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PlanQty { get; set; }
-
- /// <summary>
- /// 鎵撳嵃鍥炲畾鍊�
- /// </summary>
- [Column("PROC_PRINT_VALUE")]
- [SugarColumn(ColumnName = "PROC_PRINT_VALUE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鎵撳嵃鍥炲畾鍊奸暱搴︿笉鑳借秴鍑�50")]
- public string ProcPrintValue { get; set; }
-
- /// <summary>
- /// 宸ュ崟鐘舵��
- /// </summary>
- [Column("PRODUCE_STATE")]
- [SugarColumn(ColumnName = "PRODUCE_STATE")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "宸ュ崟鐘舵�侀暱搴︿笉鑳借秴鍑�10")]
- public string ProduceState { get; set; }
-
- /// <summary>
- /// 瀹為檯寮�濮嬫椂闂�
- /// </summary>
- [Column("REAL_BEGIN_TIME")]
- [SugarColumn(ColumnName = "REAL_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealBeginTime { get; set; }
-
- /// <summary>
- /// 瀹為檯瀹屽伐鏃堕棿
- /// </summary>
- [Column("REAL_FINISH_TIME")]
- [SugarColumn(ColumnName = "REAL_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealFinishTime { get; set; }
-
- /// <summary>
- /// 鐜繚浠ｇ爜
- /// </summary>
- [Column("ROHSE_CODE")]
- [SugarColumn(ColumnName = "ROHSE_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鐜繚浠ｇ爜闀垮害涓嶈兘瓒呭嚭20")]
- public string RohseCode { get; set; }
-
- /// <summary>
- /// 鑸瑰ご鏍�
- /// </summary>
- [Column("SHIP_QTY")]
- [SugarColumn(ColumnName = "SHIP_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ShipQty { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [Column("STATUS")]
- [SugarColumn(ColumnName = "STATUS")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鐘舵�侀暱搴︿笉鑳借秴鍑�10")]
- public string Status { get; set; }
-
- /// <summary>
- /// 璁㈠崟缂栧彿
- /// </summary>
- [Column("TASK_NO")]
- [SugarColumn(ColumnName = "TASK_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "璁㈠崟缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 宸ュ崟绫诲瀷
- /// </summary>
- [Column("TASK_TYPE")]
- [SugarColumn(ColumnName = "TASK_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ュ崟绫诲瀷闀垮害涓嶈兘瓒呭嚭20")]
- public string TaskType { get; set; }
-
- /// <summary>
- /// 鏈�鏂颁笅杞芥洿鏂版爣璇�
- /// </summary>
- [Column("UPDATE_FLG")]
- [SugarColumn(ColumnName = "UPDATE_FLG")] //鐢ㄤ簬SqlSugar
- public decimal? UpdateFlg { get; set; }
-
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- [Column("VERSION")]
- [SugarColumn(ColumnName = "VERSION")] //鐢ㄤ簬SqlSugar
- [StringLength(120, ErrorMessage = "鐗堟湰闀垮害涓嶈兘瓒呭嚭120")]
- public string Version { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [Column("WORK_LINE")]
- [SugarColumn(ColumnName = "WORK_LINE")] //鐢ㄤ簬SqlSugar
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [Column("WORK_NO")]
- [SugarColumn(ColumnName = "WORK_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浠诲姟鍗曞彿闀垮害涓嶈兘瓒呭嚭50")]
- public string WorkNo { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepotSections.cs b/MES.Service/Modes/MesDepotSections.cs
deleted file mode 100644
index 5cb98ee..0000000
--- a/MES.Service/Modes/MesDepotSections.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 浠撲綅淇℃伅
-/// </summary>
-[SugarTable("MES_DEPOT_SECTIONS")]
-public class MesDepotSections
-{
- /// <summary>
- /// ID(SEQ_INV_ID)锛圗RPID锛�
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTION_ID", IsPrimaryKey = true)]
- public decimal DepotSectionId { get; set; }
-
- /// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
- public string DepotSectionCode { get; set; }
-
- /// <summary>
- /// 璐т綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTION_NAME")]
- public string DepotSectionName { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_ID")]
- public decimal? DepotId { get; set; }
-
- /// <summary>
- /// 鍙備笌榻愬鏍￠獙(0:鍚�,1:鏄�)
- /// </summary>
- [SugarColumn(ColumnName = "COMPLETENESS_FLAG")]
- public short? CompletenessFlag { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "DESCRIPTION")]
- public string Description { 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 = "COMPANY")]
- public string Company { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 鍗℃澘鏁�
- /// </summary>
- [SugarColumn(ColumnName = "KB_QTY")]
- public decimal? KbQty { get; set; }
-
- /// <summary>
- /// 浠撲綅缁処D
- /// </summary>
- [SugarColumn(ColumnName = "ZUID")]
- public decimal? Zuid { get; set; }
-
- /// <summary>
- /// 浠撲綅鍏ㄥ悕
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTION_NAMET")]
- public string DepotSectionNamet { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
- public decimal? Erpid { get; set; }
-
- /// <summary>
- /// 浠撳簱绫诲埆缂栫爜
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// 浠撳簱绫诲埆鍚嶇О
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public string? DepotName { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
deleted file mode 100644
index fae92cb..0000000
--- a/MES.Service/Modes/MesDepots.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 浠撳簱淇℃伅
-/// </summary>
-[SugarTable("MES_DEPOTS")]
-public class MesDepots
-{
- /// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_ID", IsPrimaryKey = true)]
- public decimal DepotId { get; set; }
-
- /// <summary>
- /// 浠撳簱绫诲埆缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// 浠撳簱绫诲埆鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_NAME")]
- public string? DepotName { 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 = "DEPOTTYPE")]
- public string? Depottype { 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 = "IS_NG")]
- public string? IsNg { get; set; }
-
-
- /// <summary>
- /// 浠撲綅缁処D
- /// </summary>
- [SugarColumn(ColumnName = "ZUID")]
- public string? Zuid { get; set; }
-
- /// <summary>
- /// 鍏佽鍗虫椂搴撳瓨璐熷簱瀛�
- /// </summary>
- [SugarColumn(ColumnName = "IS_FKC")]
- public string? IsFkc { get; set; }
-
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvBusiness2.cs b/MES.Service/Modes/MesInvBusiness2.cs
deleted file mode 100644
index 20d3f47..0000000
--- a/MES.Service/Modes/MesInvBusiness2.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 搴撳瓨浜ゆ槗璁板綍琛�
-/// </summary>
-[SugarTable("MES_INV_BUSINESS2")]
-public class MesInvBusiness2
-{
- /// <summary>
- /// ID(seq_inv_id)
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄�
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
- public decimal? Status { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
- public decimal? BillTypeId { get; set; }
-
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_CODE")]
- public string TransactionCode { get; set; }
-
- /// <summary>
- /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_TYPE")]
- public decimal? BusinessType { get; set; }
-
- /// <summary>
- /// 鍗曟嵁ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_ID")]
- public decimal? BillId { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NO")]
- public string CustomerNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁琛孖D
- /// </summary>
- [SugarColumn(ColumnName = "BILL_LINE_ID")]
- public decimal? BillLineId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE")]
- public string ItemBarcode { get; set; }
-
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "C_ITEM_CODE")]
- public string CItemCode { get; set; }
-
- /// <summary>
- /// 鍘傚鎵规
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
- public string LotNo { get; set; }
-
- /// <summary>
- /// 鏄惁鐜繚(0:鍚�,1:鏄�)
- /// </summary>
- [SugarColumn(ColumnName = "EP_FLAG")]
- public short? EpFlag { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public decimal? Quantity { get; set; }
-
- /// <summary>
- /// 婧愬瓙搴揅ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
- public string FromInvDepotsCode { get; set; }
-
- /// <summary>
- /// 婧愯揣浣岰ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
- public string FromInvDepotSectionsCode { get; set; }
-
- /// <summary>
- /// 鐩殑瀛愬簱CODE
- /// </summary>
- [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
- public string ToInvDepotsCode { get; set; }
-
- /// <summary>
- /// 鐩殑璐т綅CODE
- /// </summary>
- [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
- public string ToInvDepotSectionsCode { get; set; }
-
- /// <summary>
- /// 浜ゆ槗寮傚父淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "DESCRIPTION")]
- public string Description { 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 = "ULLAGE_STAT_FLAG")]
- public short? UllageStatFlag { 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 = "ITEM_BARCODE2")]
- public string ItemBarcode2 { get; set; }
-
- /// <summary>
- /// 鍗℃澘鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE3")]
- public string ItemBarcode3 { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string WorkNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string SuppNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇绾�
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
- public string LineNo { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemArn.cs b/MES.Service/Modes/MesInvItemArn.cs
deleted file mode 100644
index 4d02989..0000000
--- a/MES.Service/Modes/MesInvItemArn.cs
+++ /dev/null
@@ -1,243 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡鍏ュ簱涓昏〃
-/// </summary>
-[SugarTable("MES_INV_ITEM_ARN")]
-public class MesInvItemArn
-{
- /// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { get; set; }
-
- /// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
- public short? Status { get; set; }
-
- /// <summary>
- /// 鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "REASON")]
- public string Reason { 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>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
- public decimal? BillTypeId { get; set; }
-
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_ID")]
- public decimal? TransactionId { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_BILL_NO")]
- public string PaperBillNo { get; set; }
-
- /// <summary>
- /// 閫�鏂欎汉宸ュ彿
- /// </summary>
- [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 = "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 = "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>
- /// 鏄惁宸插洖鍐橲AP
- /// </summary>
- [SugarColumn(ColumnName = "SAPSTATUS")]
- public short? Sapstatus { get; set; }
-
- /// <summary>
- /// 纭鍏ュ簱鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "INS_DATE")]
- public DateTime? Insdate { 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 = "COMPANY")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
- public short? UrgentFlag { get; set; }
-
- /// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "MTTRANSCTION_NO")]
- public decimal? MttransctionNo { get; set; }
-
- /// <summary>
- /// IQC妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
- public string IqcReleaseNo { get; set; }
-
- /// <summary>
- /// 鏄惁鏄剧ず
- /// </summary>
- [SugarColumn(ColumnName = "IS_VISUAL")]
- public decimal? IsVisual { get; set; }
-
- /// <summary>
- /// 0=閲囪喘锛�1=濮斿
- /// </summary>
- [SugarColumn(ColumnName = "F_TYPE")]
- public decimal? FType { get; set; }
-
- /// <summary>
- /// ERP鍒拌揣鍗旾D
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public string EbelnK3id { get; set; }
-
- /// <summary>
- /// 鏉＄爜鏉″嵃杩涘害
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_RATIO")]
- public decimal? BarcodeRatio { get; set; }
-
- /// <summary>
- /// ERP鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ERPNO")]
- public string Erpno { get; set; }
-
- /// <summary>
- /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
- /// </summary>
- [SugarColumn(ColumnName = "THSTATUS")]
- public short? Thstatus { get; set; }
-
- /// <summary>
- /// ERP閫�璐у崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "ERPTHNO")]
- public string Erpthno { get; set; }
-
-
- [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? SuppName { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemArnDetail.cs b/MES.Service/Modes/MesInvItemArnDetail.cs
deleted file mode 100644
index 7be265c..0000000
--- a/MES.Service/Modes/MesInvItemArnDetail.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// </summary>
-[SugarTable("MES_INV_ITEM_ARN_DETAIL")]
-public class MesInvItemArnDetail
-{
- /// <summary>
- /// SEQ_INV_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 涓昏〃ID
- /// </summary>
- [SugarColumn(ColumnName = "MID")]
- public decimal? Mid { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "EBELN")]
- public string Ebeln { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_LINE")]
- public decimal? EbelnLine { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_QTY")]
- public decimal? EbelnQty { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 鏀惰揣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public decimal? Quantity { 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 = "FACTORY")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string Company { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗旾D
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曡ID
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
-
- /// <summary>
- /// 鏈搴旀敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "SUB_QTY")]
- public decimal? SubQty { get; set; }
-
- /// <summary>
- /// 浣欓噺
- /// </summary>
- [SugarColumn(ColumnName = "MARGIN_QTY")]
- public decimal? MarginQty { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string WorkNo { get; set; }
-
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
- public decimal? UrgentFlag { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "MEMO")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_RES")]
- public string CheckRes { get; set; }
-
- /// <summary>
- /// 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_STATES")]
- public string CheckStates { get; set; }
-
- /// <summary>
- /// 鏀惰揣浣欓噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY_M")]
- public decimal? QuantityM { get; set; }
-
- /// <summary>
- /// 鏈搴旀敹浣欓噺
- /// </summary>
- [SugarColumn(ColumnName = "SUB_MQTY")]
- public decimal? SubMqty { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 鏄惁妫�楠�
- /// </summary>
- [SugarColumn(ColumnName = "ISCHECK")]
- public short? Ischeck { get; set; }
-
- /// <summary>
- /// 宸叉敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "OK_QTY")]
- public decimal? OkQty { get; set; }
-
- /// <summary>
- /// 宸叉敹浣欓噺
- /// </summary>
- [SugarColumn(ColumnName = "OK_MQTY")]
- public decimal? OkMqty { 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>
- /// 0銆侀噰璐崟锛�1銆佸澶栧崟
- /// </summary>
- [SugarColumn(ColumnName = "F_TYPE")]
- public decimal? FType { get; set; }
-
- /// <summary>
- /// 鏄惁鍏ュ簱
- /// </summary>
- [SugarColumn(ColumnName = "ISDEPS_IN")]
- public short? IsdepsIn { get; set; }
-
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHA001")]
- public string Dha001 { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [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; }
-
- [SugarColumn(IsIgnore = true)] public string? Fname { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemBarcodes.cs b/MES.Service/Modes/MesInvItemBarcodes.cs
deleted file mode 100644
index 4c1bbd9..0000000
--- a/MES.Service/Modes/MesInvItemBarcodes.cs
+++ /dev/null
@@ -1,460 +0,0 @@
-锘縰sing 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>
- /// 鍘烶SN鐗╂枡鏉＄爜
- /// </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>
- /// 鏀舵枡琛↖D
- /// </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; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemInCDetails.cs b/MES.Service/Modes/MesInvItemInCDetails.cs
deleted file mode 100644
index 0bf8253..0000000
--- a/MES.Service/Modes/MesInvItemInCDetails.cs
+++ /dev/null
@@ -1,362 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡鍏ュ簱鏉＄爜鏄庣粏
-/// </summary>
-[SugarTable("MES_INV_ITEM_IN_C_DETAILS")]
-public class MesInvItemInCDetails
-{
- /// <summary>
- /// SEQ_OUT
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗昳d
- /// </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; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemInCItems.cs b/MES.Service/Modes/MesInvItemInCItems.cs
deleted file mode 100644
index 2902881..0000000
--- a/MES.Service/Modes/MesInvItemInCItems.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡鍏ュ簱鏄庣粏
-/// </summary>
-[SugarTable("MES_INV_ITEM_IN_C_ITEMS")]
-public class MesInvItemInCItems
-{
- /// <summary>
- /// SEQ_OUT
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗昳d
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
- public decimal ItemInId { get; set; }
-
- /// <summary>
- /// 楠屾敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public decimal? Quantity { 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 = "ITEM_NO")]
- public string ItemNo { 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_SNAME")]
- public string ItemSname { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟
- /// </summary>
- [SugarColumn(ColumnName = "EBELN")]
- public string Ebeln { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { 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 = "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 = "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; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemIns.cs b/MES.Service/Modes/MesInvItemIns.cs
deleted file mode 100644
index 930e1a3..0000000
--- a/MES.Service/Modes/MesInvItemIns.cs
+++ /dev/null
@@ -1,316 +0,0 @@
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡鍏ュ簱涓昏〃
-/// </summary>
-[SugarTable("MES_INV_ITEM_INS")]
-public class MesInvItemIns
-{
- /// <summary>
- /// ID(SEQ_INV_ID)
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { get; set; }
-
- /// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
- public short? Status { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOTS_ID")]
- public decimal? DepotsId { get; set; }
-
- /// <summary>
- /// 鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "REASON")]
- public string Reason { 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>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
- public decimal? BillTypeId { get; set; }
-
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_ID")]
- public decimal? TransactionId { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 閫佽揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "PAPER_BILL_NO")]
- public string PaperBillNo { get; set; }
-
- /// <summary>
- /// 閫�鏂欎汉宸ュ彿
- /// </summary>
- [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>
- /// 鏄惁宸插洖鍐橲AP
- /// </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; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemMoves.cs b/MES.Service/Modes/MesInvItemMoves.cs
deleted file mode 100644
index c81d7b0..0000000
--- a/MES.Service/Modes/MesInvItemMoves.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡绉诲簱涓昏〃
-/// </summary>
-[SugarTable("MES_INV_ITEM_MOVES")]
-public class MesInvItemMoves
-{
- /// <summary>
- /// SEQ_INV_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 绉诲簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { get; set; }
-
- /// <summary>
- /// 绉诲叆瀛愬簱id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_ID")]
- public decimal? InvDepotsId { get; set; }
-
- /// <summary>
- /// 绉诲叆璐т綅id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")]
- public decimal? InvDepotSectionsId { 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 = "STATUS")]
- public decimal? Status { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
- public decimal? BillTypeId { get; set; }
-
- /// <summary>
- /// 浜嬪姟绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_ID")]
- public decimal? TransactionId { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECKUSER")]
- public string Checkuser { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECKDATE")]
- public DateTime? Checkdate { get; set; }
-
- /// <summary>
- /// 绉诲叆瀛愬簱code
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_CODE")]
- public string InvDepotsCode { get; set; }
-
- /// <summary>
- /// 绉诲叆璐т綅code
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")]
- public string InvDepotSectionsCode { get; set; }
-
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_NO")]
- public decimal? TransactionNo { get; set; }
-
- /// <summary>
- /// 绉诲嚭瀛愬簱code
- /// </summary>
- [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")]
- public string FromDepotsCode { get; set; }
-
- /// <summary>
- /// 宸ュ巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY_CODE")]
- public string FactoryCode { get; set; }
-
- /// <summary>
- /// SAP杩斿洖鍗曟嵁
- /// </summary>
- [SugarColumn(ColumnName = "SAPNO")]
- public string Sapno { get; set; }
-
- /// <summary>
- /// 宸插洖鍐橲AP
- /// </summary>
- [SugarColumn(ColumnName = "SAPSTATUS")]
- public short? Sapstatus { 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 = "FACTORY")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鍙嶅鏍镐簨鍔＄被鍨嬬紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "MTRANSACTION_NO")]
- public decimal? MtransactionNo { get; set; }
-
- /// <summary>
- /// 鑷姩淇濆瓨瀛楁
- /// </summary>
- [SugarColumn(ColumnName = "ZD_NUM")]
- public decimal? ZdNum { get; set; }
-
- /// <summary>
- /// 鏄惁鎺ㄩ�丒RP1-鏄紝2-鍚�
- /// </summary>
- [SugarColumn(ColumnName = "TS")]
- public decimal? Ts { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemMovesCDetails.cs b/MES.Service/Modes/MesInvItemMovesCDetails.cs
deleted file mode 100644
index 1fc798b..0000000
--- a/MES.Service/Modes/MesInvItemMovesCDetails.cs
+++ /dev/null
@@ -1,237 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡绉诲簱鏉＄爜鏄庣粏浠庤〃
-/// </summary>
-[SugarTable("MES_INV_ITEM_MOVES_C_DETAILS")]
-public class MesInvItemMovesCDetails
-{
- /// <summary>
- /// seq_inv_id
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_MOVE_ID")]
- public decimal? ItemMoveId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </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 = "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>
- /// 鍑哄簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�)
- /// </summary>
- [SugarColumn(ColumnName = "BARCODE_FLAG")]
- public short? BarcodeFlag { get; set; }
-
- /// <summary>
- /// 鐜繚鏍囧織锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- /// </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>
- /// 瀛愬簱id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_ID")]
- public decimal? InvDepotsId { get; set; }
-
- /// <summary>
- /// 璐т綅id
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")]
- public decimal? InvDepotSectionsId { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CUST_NO")]
- public string? CustNo { get; set; }
-
- /// <summary>
- /// 浠诲姟浠ゅ彿
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
- public string? TaskNo { get; set; }
-
- /// <summary>
- /// 绉诲嚭浠撳簱缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")]
- public string? FromDepotsCode { get; set; }
-
- /// <summary>
- /// 绉诲嚭搴撲綅缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FROM_DEPOT_SECTIONS_CODE")]
- public string? FromDepotSectionsCode { get; set; }
-
- /// <summary>
- /// 鏉＄爜澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string? Remark { 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 = "BOX_NO")]
- public string? BoxNo { get; set; }
-
- /// <summary>
- /// 鍗℃澘鍙�
- /// </summary>
- [SugarColumn(ColumnName = "KO_NO")]
- public string? KoNo { get; set; }
-
- /// <summary>
- /// 绉诲叆浠撳簱缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOTS_CODE")]
- public string? InvDepotsCode { get; set; }
-
- /// <summary>
- /// 绉诲叆搴撲綅缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")]
- public string? InvDepotSectionsCode { 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 = "INDEP_DATE")]
- public DateTime? IndepDate { get; set; }
-
- /// <summary>
- /// 鍐荤粨鎻愪氦閲嶆锛�0锛氬喕缁撴湭鎻愪氦閲嶆锛�1锛氬喕缁撳苟鎻愪氦閲嶆
- /// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT")]
- public short? VisableSubmit { get; set; }
-
- /// <summary>
- /// 鎻愪氦閲嶆浜�
- /// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT_BY")]
- public string? VisableSubmitBy { get; set; }
-
- /// <summary>
- /// 鎻愪氦閲嶆鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT_DATE")]
- public DateTime? VisableSubmitDate { get; set; }
-
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string? BoardStyle { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string? WorkNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string? SuppNo { get; set; }
-
- /// <summary>
- /// 璋冨叆
- /// </summary>
- [SugarColumn(ColumnName = "MOVE_OK")]
- public decimal? MoveOk { 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 string? SuppName { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemOutCDetails.cs b/MES.Service/Modes/MesInvItemOutCDetails.cs
deleted file mode 100644
index 13835d9..0000000
--- a/MES.Service/Modes/MesInvItemOutCDetails.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡鍑哄簱鏉＄爜鏄庣粏
-/// </summary>
-[SugarTable("MES_INV_ITEM_OUT_C_DETAILS")]
-public class MesInvItemOutCDetails
-{
- /// <summary>
- /// SEQ_INV_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗昳d
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_OUT_ID")]
- public decimal? ItemOutId { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </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 = "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 = "FORCE_OUT_FLAG")]
- public decimal? ForceOutFlag { 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 = "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>
- /// 鍏嶆鏍囪瘑(0-鍚︼紝1-鏄�)
- /// </summary>
- [SugarColumn(ColumnName = "FORCE_EXEMPT_FLAG")]
- public short? ForceExemptFlag { get; set; }
-
- /// <summary>
- /// 鎶曟枡鎵规
- /// </summary>
- [SugarColumn(ColumnName = "PRD_LOT_NO")]
- public string PrdLotNo { get; set; }
-
- /// <summary>
- /// 鏄惁鍋氭帴鏀舵鏌�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_STATUS")]
- public short? CheckStatus { 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 = "TASK_NOY")]
- public string TaskNoy { get; set; }
-
- /// <summary>
- /// 绠卞彿
- /// </summary>
- [SugarColumn(ColumnName = "BOX_NO")]
- public string BoxNo { get; set; }
-
- /// <summary>
- /// 鍖呰鎵规
- /// </summary>
- [SugarColumn(ColumnName = "TASK_PACK")]
- public string TaskPack { get; set; }
-
- /// <summary>
- /// 鍗℃澘
- /// </summary>
- [SugarColumn(ColumnName = "KB_NO")]
- public string KbNo { get; set; }
-
- /// <summary>
- /// 浜у搧鏈哄瀷
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string BoardStyle { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string WorkNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string SuppNo { get; set; }
-
- /// <summary>
- /// 棰嗘枡鍗曞彿/濮斿璁㈠崟
- /// </summary>
- [SugarColumn(ColumnName = "PBILL_NO")]
- public string PbillNo { get; set; }
-
- /// <summary>
- /// 鎺ユ敹鏍囪瘑/1宸叉帴鏀�
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVE")]
- public decimal? Receive { get; set; }
-
- /// <summary>
- /// 鎺ユ敹鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "RTIME")]
- public DateTime? Rtime { get; set; }
-
- /// <summary>
- /// 鎺ユ敹浜�
- /// </summary>
- [SugarColumn(ColumnName = "RCV_BY")]
- public string RcvBy { get; set; }
-
- /// <summary>
- /// 鎺ユ敹杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "RCV_PART")]
- public string RcvPart { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "RK_NO")]
- public string RkNo { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
- [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
- [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Unit { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemOutItems.cs b/MES.Service/Modes/MesInvItemOutItems.cs
deleted file mode 100644
index 51098b2..0000000
--- a/MES.Service/Modes/MesInvItemOutItems.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鍑哄簱鐢宠鐗╂枡琛�
-/// </summary>
-[SugarTable("MES_INV_ITEM_OUT_ITEMS")]
-public class MesInvItemOutItems
-{
- /// <summary>
- /// SEQ_ITEM_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍑哄簱ID
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_OUT_ID")]
- public decimal? ItemOutId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 鐢宠鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public decimal? Quantity { 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 = "REMARK")]
- public string? Remark { 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 = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// 鎺ㄤ粙搴撲綅
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
- public string? DepotSectionCode { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
- public string? TaskNo { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string? WorkNo { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// ERP 涓昏〃ID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public decimal? ErpId { get; set; }
-
- /// <summary>
- /// ERP 浠庤〃ID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_AUTOID")]
- public decimal? ErpAutoid { get; set; }
-
- /// <summary>
- /// ERP_鏂欏彿
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string? ErpItemNo { get; set; }
-
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [SugarColumn(ColumnName = "COLOR_NAME")]
- public string? ColorName { get; set; }
-
- /// <summary>
- /// 鏈�鏂颁笅杞芥洿鏂版爣璇�
- /// </summary>
- [SugarColumn(ColumnName = "UPDATE_FLG")]
- public decimal? UpdateFlg { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗旾D
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曡ID
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "EBELN")]
- public string? Ebeln { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_LINE")]
- public decimal? EbelnLine { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_QTY")]
- public decimal? EbelnQty { get; set; }
-
- /// <summary>
- /// 浜у搧缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_ITEM")]
- public string? BoardItem { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "F_TYPE")]
- public decimal? FType { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
- public decimal? Status { get; set; }
-
- /// <summary>
- /// 瀛愬瓙琛↖D
- /// </summary>
- [SugarColumn(ColumnName = "ALLOCATEID")]
- public decimal? Allocateid { get; set; }
-
- /// <summary>
- /// 棰嗘枡缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "PBILL_NO")]
- public string? PbillNo { get; set; }
-
- /// <summary>
- /// erp鎺ュ彛杩斿洖
- /// </summary>
- [SugarColumn(ColumnName = "ERP_MARK")]
- public string? ErpMark { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "RK_NO")]
- public string? RkNo { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟
- /// </summary>
- [SugarColumn(ColumnName = "RK_QTY")]
- public decimal? RkQty { get; set; }
-
- /// <summary>
- /// 宸叉壂鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "TL_QTY")]
- public decimal? TlQty { get; set; }
-
- [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { 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 string? QuantityOk { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemOuts.cs b/MES.Service/Modes/MesInvItemOuts.cs
deleted file mode 100644
index eeae84c..0000000
--- a/MES.Service/Modes/MesInvItemOuts.cs
+++ /dev/null
@@ -1,307 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡鍑哄簱琛�
-/// </summary>
-[SugarTable("MES_INV_ITEM_OUTS")]
-public class MesInvItemOuts
-{
- /// <summary>
- /// SEQ_INV_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_OUT_NO")]
- public string? ItemOutNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
- public string? TaskNo { get; set; }
-
- /// <summary>
- /// 宸ュ簭鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PROC_NO")]
- public string? ProcNo { get; set; }
-
- /// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
- public decimal? Status { 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>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
- public decimal? BillTypeId { get; set; }
-
- /// <summary>
- /// 浜嬪姟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_NO")]
- public decimal? TransactionNo { get; set; }
-
- /// <summary>
- /// 澶囨敞淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 鍑哄簱鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "REASON")]
- public string? Reason { get; set; }
-
- /// <summary>
- /// 鐢熶骇绾跨紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCE_LINE_NO")]
- public string? ProduceLineNo { 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 = "OUT_DATE")]
- public DateTime? OutDate { get; set; }
-
- /// <summary>
- /// 棰嗘枡宸ユ
- /// </summary>
- [SugarColumn(ColumnName = "MMLIST")]
- public string? Mmlist { get; set; }
-
- /// <summary>
- /// 瀛愬簱CODE
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// SAP杩斿洖鍗曟嵁
- /// </summary>
- [SugarColumn(ColumnName = "SAPNO")]
- public string? Sapno { get; set; }
-
- /// <summary>
- /// 鏄惁宸插洖鍐橲AP
- /// </summary>
- [SugarColumn(ColumnName = "SAPSTATUS")]
- public short? Sapstatus { 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 = "PROC_LINE_NO")]
- public string? ProcLineNo { get; set; }
-
- /// <summary>
- /// 棰嗘枡閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "OUT_PART")]
- public string? OutPart { get; set; }
-
- /// <summary>
- /// 0 鐢熶骇,1 濮斿
- /// </summary>
- [SugarColumn(ColumnName = "F_TYPE")]
- public long? FType { get; set; }
-
- /// <summary>
- /// 褰曞叆鎻愪氦
- /// </summary>
- [SugarColumn(ColumnName = "OUT_STATUS")]
- public decimal? OutStatus { get; set; }
-
- /// <summary>
- /// 鏄惁鍙
- /// </summary>
- [SugarColumn(ColumnName = "IS_VISUAL")]
- public decimal? IsVisual { get; set; }
-
- /// <summary>
- /// 鎺ユ敹浜�
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVER")]
- public string? Receiver { 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 = "MTRANSCTION_NO")]
- public decimal? MtransctionNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string? WorkNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string? SuppNo { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "CMPOCODE")]
- public string? Cmpocode { get; set; }
-
- /// <summary>
- /// 鍘熺墿鏂欏嚭璐ф爣璇�
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_FLAG")]
- public decimal? ItemFlag { get; set; }
-
- /// <summary>
- /// 1=鍗婃垚鍝佸嚭璐�
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_FLAG")]
- public decimal? BoardFlag { get; set; }
-
- /// <summary>
- /// 鍑哄簱绫诲埆
- /// </summary>
- [SugarColumn(ColumnName = "OUT_TYPE")]
- public string? OutType { get; set; }
-
- /// <summary>
- /// 涓氬姟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_TYPE")]
- public string? BusinessType { get; set; }
-
- /// <summary>
- /// 浜у搧缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_ITEM")]
- public string? BoardItem { get; set; }
-
- /// <summary>
- /// 浜ч噺
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_QTY")]
- public decimal? PlanQty { get; set; }
-
- /// <summary>
- /// 棰嗘枡缂栧彿/濮斿璁㈠崟
- /// </summary>
- [SugarColumn(ColumnName = "PBILL_NO")]
- public string? PbillNo { get; set; }
-
- /// <summary>
- /// 琛ユ枡鐢宠鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BBILL_NO")]
- public string? BbillNo { get; set; }
-
- /// <summary>
- /// 鏍囪瘑 /1宸叉帹閫�
- /// </summary>
- [SugarColumn(ColumnName = "NFLAG")]
- public short? Nflag { get; set; }
-
- /// <summary>
- /// 閫�鏂欐柟寮�
- /// </summary>
- [SugarColumn(ColumnName = "FMRMODE")]
- public string? Fmrmode { get; set; }
-
- /// <summary>
- /// erp杩斿洖淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "MSG")]
- public string? Msg { get; set; }
-
- /// <summary>
- /// 鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "STATES")]
- public string? States { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? SuppName { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? CreateByFname { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? CheckUserFname { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemStocks.cs b/MES.Service/Modes/MesInvItemStocks.cs
deleted file mode 100644
index 2a5a4d1..0000000
--- a/MES.Service/Modes/MesInvItemStocks.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡搴撳瓨琛�
-/// </summary>
-[SugarTable("MES_INV_ITEM_STOCKS")]
-public class MesInvItemStocks
-{
- /// <summary>
- /// SEQ_ME_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ME_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
- public string? TaskNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </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 = "ITEM_NO")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 瀛愬簱id
- /// </summary>
- [SugarColumn(ColumnName = "DEPOTS_ID")]
- public decimal? DepotsId { get; set; }
-
- /// <summary>
- /// 璐т綅id
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTIONS_ID")]
- public decimal? DepotSectionsId { 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 = "CUSTOMER_NO")]
- public string? CustomerNo { get; set; }
-
- /// <summary>
- /// 閲嶉噺
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_WT")]
- public decimal? ItemWt { get; set; }
-
- /// <summary>
- /// 瀛愬簱CODE
- /// </summary>
- [SugarColumn(ColumnName = "DEPOTS_CODE")]
- public string? DepotsCode { get; set; }
-
- /// <summary>
- /// 璐т綅CODE
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_SECTIONS_CODE")]
- public string? DepotSectionsCode { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 0 鐗╂枡 1 鍗婃垚鍝� 2 鎴愬搧
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_TYPE")]
- public short? ItemType { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "INDEP_DATE")]
- public DateTime? IndepDate { 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 = "IQC_STATUS")]
- public string? IqcStatus { get; set; }
-
- /// <summary>
- /// 灏忚溅鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "FCAR")]
- public string? Fcar { get; set; }
-
- /// <summary>
- /// 鍐荤粨鎻愪氦閲嶆锛�0锛氬喕缁撴湭鎻愪氦閲嶆锛�1锛氬喕缁撳苟鎻愪氦閲嶆
- /// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT")]
- public short? VisableSubmit { get; set; }
-
- /// <summary>
- /// 鎻愪氦閲嶆浜�
- /// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT_BY")]
- public string? VisableSubmitBy { get; set; }
-
- /// <summary>
- /// 鎻愪氦閲嶆鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "VISABLE_SUBMIT_DATE")]
- public DateTime? VisableSubmitDate { get; set; }
-
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string? BoardStyle { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string? WorkNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
- public decimal? WorkLine { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string? SuppNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇绾�
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
- public string? LineNo { get; set; }
-
- /// <summary>
- /// 鍗婃垚鍝佸叆搴撳崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItemType.cs b/MES.Service/Modes/MesItemType.cs
deleted file mode 100644
index 55b00b0..0000000
--- a/MES.Service/Modes/MesItemType.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡绫诲瀷
-/// </summary>
-[SugarTable("MES_ITEM_TYPE")]
-public class MesItemType
-{
- /// <summary>
- /// ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TCODE")]
- public string? Tcode { get; set; }
-
- /// <summary>
- /// 绫诲瀷鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "TNAME")]
- public string? Tname { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string? Remark { 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 = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
- /// <summary>
- /// IQC鍒嗙被
- /// </summary>
- [SugarColumn(ColumnName = "IQC_TYPE")]
- public string? IqcType { get; set; }
-
- /// <summary>
- /// IQC鍒嗙被鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "IQC_TYPE_NAME")]
- public string? IqcTypeName { get; set; }
-
- /// <summary>
- /// 涓婄骇鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "PGROUP")]
- public string? Pgroup { get; set; }
-
-/* /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }*/
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "DESCRIPTION")]
- public string? Description { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
deleted file mode 100644
index c63f30d..0000000
--- a/MES.Service/Modes/MesItems.cs
+++ /dev/null
@@ -1,276 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡淇℃伅
-/// </summary>
-[SugarTable("MES_ITEMS")]
-public class MesItems
-{
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
- /// <summary>
- /// 鍏徃缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NAME")]
- public string? ItemName { get; set; }
-
-
- /// <summary>
- /// 瑙勬牸鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_MODEL")]
- public string? ItemModel { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_UNIT")]
- public string? ItemUnit { 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 = "LOWLIMIT")]
- public double? Lowlimit { get; set; }
-
- /// <summary>
- /// 鏈�澶у簱瀛�
- /// </summary>
- [SugarColumn(ColumnName = "HIGHLIMIT")]
- public double? Highlimit { get; set; }
-
- /// <summary>
- /// 鏈�灏忓寘瑁呮暟
- /// </summary>
- [SugarColumn(ColumnName = "PRD_PACK")]
- public double? PrdPack { get; set; }
-
-
- /// <summary>
- /// 閿�鍞崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "SALEUNIT")]
- public string? Saleunit { get; set; }
-
- /// <summary>
- /// 搴撴埧鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "STOREUNIT")]
- public string? Storeunit { get; set; }
-
- /// <summary>
- /// 鐢熶骇鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCTUNIT")]
- public string? Productunit { get; set; }
-
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "E_ITEM_ID")]
- public decimal? EItemId { get; set; }
-
- /// <summary>
- /// ERP鏂欏彿
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string? ErpItemNo { get; set; }
-
- /// <summary>
- /// 榛樿浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 閲囪喘鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FPURCHASERID")]
- public string? Fpurchaserid { get; set; }
-
- /// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string? Fforbidstatus { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "FMATERIALGROUP")]
- public string? Fmaterialgroup { get; set; }
-
- /// <summary>
- /// 瀹屽伐瓒呮敹姣斾緥
- /// </summary>
- [SugarColumn(ColumnName = "FFINISHRECEIPTOVERRATE")]
- public decimal? Ffinishreceiptoverrate { get; set; }
-
- /// <summary>
- /// 鍙戞枡鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "FISSUETYPE")]
- public string? Fissuetype { get; set; }
-
- /// <summary>
- /// 鍚敤鎵瑰彿绠＄悊
- /// </summary>
- [SugarColumn(ColumnName = "FISBATCHMANAGE")]
- public int? Fisbatchmanage { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FPURCHASEUNITID")]
- public decimal? Fpurchaseunitid { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�1
- /// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�2
- /// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
-
- /// <summary>
- /// 鐢熶骇杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
- public string? ProductionWorkshop { get; set; }
-
- /// <summary>
- /// 鐗╂枡灞炴��
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
- public string? MaterialProperti { get; set; }
-
- /// <summary>
- /// 鐢熶骇鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCE_UNIT")]
- public string? ProduceUnit { get; set; }
-
- /// <summary>
- /// 濮斿鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "SUBCON_UNIT")]
- public string? SubconUnit { get; set; }
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
- /// <summary>
- /// 鎹熻�楃巼
- /// </summary>
- [SugarColumn(ColumnName = "FLOSSPERCENT")]
- public string? FLOSSPERCENT { get; set; }
-
- /// <summary>
- /// 鍔╄鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FMnemonicCode")]
-
- public string? FMnemonicCode { get; set; }
-
- /// <summary>
- /// 淇濊川鏈�
- /// </summary>
- [SugarColumn(ColumnName = "FExpPeriod")]
- public string? FExpPeriod { get; set; }
-
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [SugarColumn(ColumnName = "COLOR_NAME")]
- public string? ColorName { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesLine.cs b/MES.Service/Modes/MesLine.cs
deleted file mode 100644
index a1e3718..0000000
--- a/MES.Service/Modes/MesLine.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 绾夸綋
-/// </summary>
-[Table("MES_LINE")]
-[SugarTable("MES_LINE")] //鐢ㄤ簬SqlSugar
-public class MesLine
-{
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鏉＄爜绫诲瀷
- /// </summary>
- [Column("BARTYPE")]
- [SugarColumn(ColumnName = "BARTYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鏉＄爜绫诲瀷闀垮害涓嶈兘瓒呭嚭20")]
- public string Bartype { get; set; }
-
- /// <summary>
- /// 鍗℃澘鍒嗙被
- /// </summary>
- [Column("BK01")]
- [SugarColumn(ColumnName = "BK01")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍗℃澘鍒嗙被闀垮害涓嶈兘瓒呭嚭50")]
- public string Bk01 { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("CHECK_BY")]
- [SugarColumn(ColumnName = "CHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CheckBy { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("CHECK_DATE")]
- [SugarColumn(ColumnName = "CHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- [Column("CHECK_STATUS")]
- [SugarColumn(ColumnName = "CHECK_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? CheckStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [Column("DEPARTMENTCODE")]
- [SugarColumn(ColumnName = "DEPARTMENTCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "閮ㄩ棬缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string Departmentcode { get; set; }
-
- /// <summary>
- /// 绾胯竟浠撳簱
- /// </summary>
- [Column("DEPOT_CODE")]
- [SugarColumn(ColumnName = "DEPOT_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "绾胯竟浠撳簱闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotCode { get; set; }
-
- /// <summary>
- /// 榛樿搴撲綅
- /// </summary>
- [Column("DEPOT_SECTION_CODE")]
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "榛樿搴撲綅闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotSectionCode { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 鏍囩鏄剧ず鍊�
- /// </summary>
- [Column("LABEL")]
- [SugarColumn(ColumnName = "LABEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏍囩鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�100")]
- public string Label { get; set; }
-
- /// <summary>
- /// 鏈�鍚庝慨鏀逛汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏈�鍚庝慨鏀逛汉闀垮害涓嶈兘瓒呭嚭30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏈�鍚庝慨鏀规棩鏈�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 缁勯暱缂栧彿
- /// </summary>
- [Column("L_CODE")]
- [SugarColumn(ColumnName = "L_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "缁勯暱缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LCode { get; set; }
-
- /// <summary>
- /// 绾跨畝鐮�
- /// </summary>
- [Column("LINEJM")]
- [SugarColumn(ColumnName = "LINEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "绾跨畝鐮侀暱搴︿笉鑳借秴鍑�20")]
- public string Linejm { get; set; }
-
- /// <summary>
- /// 绾夸綋鍚嶇О
- /// </summary>
- [Column("LINE_NAME")]
- [SugarColumn(ColumnName = "LINE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(64, ErrorMessage = "绾夸綋鍚嶇О闀垮害涓嶈兘瓒呭嚭64")]
- public string LineName { get; set; }
-
- /// <summary>
- /// 绾夸綋缂栧彿
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "绾夸綋缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LineNo { get; set; }
-
- /// <summary>
- /// 浜х嚎绫诲埆
- /// </summary>
- [Column("LINE_STYLE")]
- [SugarColumn(ColumnName = "LINE_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "浜х嚎绫诲埆闀垮害涓嶈兘瓒呭嚭32")]
- public string LineStyle { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭1000")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鎵�灞炲伐搴�
- /// </summary>
- [Column("PROC_NO")]
- [SugarColumn(ColumnName = "PROC_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鎵�灞炲伐搴忛暱搴︿笉鑳借秴鍑�32")]
- public string ProcNo { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("SHOW_INDEX")]
- [SugarColumn(ColumnName = "SHOW_INDEX")] //鐢ㄤ簬SqlSugar
- public decimal? ShowIndex { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("SIMPLENAME")]
- [SugarColumn(ColumnName = "SIMPLENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Simplename闀垮害涓嶈兘瓒呭嚭20")]
- public string Simplename { get; set; }
-
- /// <summary>
- /// 鏍囧噯宸ユ椂
- /// </summary>
- [Column("STAND_TIME")]
- [SugarColumn(ColumnName = "STAND_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? StandTime { get; set; }
-
- /// <summary>
- /// 缁勯暱
- /// </summary>
- [Column("USERCODE")]
- [SugarColumn(ColumnName = "USERCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "缁勯暱闀垮害涓嶈兘瓒呭嚭50")]
- public string Usercode { get; set; }
-
- /// <summary>
- /// 鍖哄垎閿傞敯閿備簹
- /// </summary>
- [Column("WORKCENTERTYPE")]
- [SugarColumn(ColumnName = "WORKCENTERTYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍖哄垎閿傞敯閿備簹闀垮害涓嶈兘瓒呭嚭50")]
- public string Workcentertype { get; set; }
-
- /// <summary>
- /// 杞﹂棿绠�鐮�
- /// </summary>
- [Column("WORKHOMEJM")]
- [SugarColumn(ColumnName = "WORKHOMEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞﹂棿绠�鐮侀暱搴︿笉鑳借秴鍑�20")]
- public string Workhomejm { get; set; }
-
- /// <summary>
- /// 宸ヤ綔涓績缂栧彿
- /// </summary>
- [Column("WORKSHOP_CENTER_CODE")]
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ヤ綔涓績缂栧彿闀垮害涓嶈兘瓒呭嚭20")]
- public string WorkshopCenterCode { get; set; }
-
- /// <summary>
- /// 鎶ュ伐鏂瑰紡锛�0銆佺鏁ｆ姤宸ワ紝1銆佹暣绾挎姤宸ワ級
- /// </summary>
- [Column("WORK_TYPE")]
- [SugarColumn(ColumnName = "WORK_TYPE")] //鐢ㄤ簬SqlSugar
- public decimal? WorkType { get; set; }
-
- /// <summary>
- /// 寰俊鏄剧ず鍊�
- /// </summary>
- [Column("WX_LABLE")]
- [SugarColumn(ColumnName = "WX_LABLE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "寰俊鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�50")]
- public string WxLable { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesLineUser.cs b/MES.Service/Modes/MesLineUser.cs
deleted file mode 100644
index f96faf3..0000000
--- a/MES.Service/Modes/MesLineUser.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鏈哄彴涓庝汉鍛樺鐓�
-/// </summary>
-[SugarTable("MES_LINE_USER")]
-public class MesLineUser
-{
- /// <summary>
- /// 搴忓垪SEQ_LINE_US
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鏈哄彴缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
- public string? LineNo { get; set; }
-
- /// <summary>
- /// 鏈哄彴涓枃
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NAME")]
- public string? LineName { get; set; }
-
- /// <summary>
- /// 浜哄憳缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FCODE")]
- public string? Fcode { get; set; }
-
- /// <summary>
- /// 浜哄憳鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "FNAME")]
- public string? Fname { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesPosition.cs b/MES.Service/Modes/MesPosition.cs
deleted file mode 100644
index 5086bb0..0000000
--- a/MES.Service/Modes/MesPosition.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宀椾綅淇℃伅
-/// </summary>
-[SugarTable("MES_POSITION")]
-public class MesPosition
-{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 宀椾綅缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_ID")]
- public string? PositionId { get; set; }
-
- /// <summary>
- /// 宀椾綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_NAME")]
- public string? PositionName { get; set; }
-
- /// <summary>
- /// 宀椾綅鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_DESCRIPTION")]
- public string? PositionDescription { get; set; }
-
- /// <summary>
- /// 鎵�灞為儴闂�
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT")]
- public string? Department { get; set; }
-
- /// <summary>
- /// 寤虹珛鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATION_DATE")]
- public DateTime? CreationDate { get; set; }
-
- /// <summary>
- /// 绂佺敤浜�
- /// </summary>
- [SugarColumn(ColumnName = "DISABLED_BY")]
- public string? DisabledBy { get; set; }
-
- /// <summary>
- /// 绂佺敤鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DISABLED_DATE")]
- public DateTime? DisabledDate { get; set; }
-
- /// <summary>
- /// 绂佺敤鐘舵�� A 鍚敤 B绂佺敤
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string? Fforbidstatus { get; set; }
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSUBSIDIARY")]
- public string? FUseOrgId { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FUMBRELLA")]
- public string? FCreateOrgId { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQa.cs b/MES.Service/Modes/MesQa.cs
deleted file mode 100644
index 198761e..0000000
--- a/MES.Service/Modes/MesQa.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 妫�楠岄」鐩富琛�
-/// </summary>
-[Table("MES_QA")]
-[SugarTable("MES_QA")] //鐢ㄤ簬SqlSugar
-public class MesQa
-{
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�20")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- [Column("FSUBMIT")]
- [SugarColumn(ColumnName = "FSUBMIT")] //鐢ㄤ簬SqlSugar
- public decimal? Fsubmit { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("FSUBMIT_BY")]
- [SugarColumn(ColumnName = "FSUBMIT_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? FsubmitBy { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃堕棿
- /// </summary>
- [Column("FSUBMIT_DATE")]
- [SugarColumn(ColumnName = "FSUBMIT_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FsubmitDate { get; set; }
-
- /// <summary>
- /// 搴忓垪SEQ_QS
- /// </summary>
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐗╂枡缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴
- /// </summary>
- [Column("QS_TYPE")]
- [SugarColumn(ColumnName = "QS_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴闀垮害涓嶈兘瓒呭嚭1")]
- public string? QsType { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaIqc.cs b/MES.Service/Modes/MesQaIqc.cs
deleted file mode 100644
index 0ea62ff..0000000
--- a/MES.Service/Modes/MesQaIqc.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鏁版嵁婧愬鍏�
-///</summary>
-[SugarTable("Mes_Qa_Iqc")]
-public class MesQaIqc
-{
- /// <summary>
- /// 鎺ユ敹姘村钩
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 鎺ユ敹姘村钩
- ///</summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
- public string FacLevel { get; set; }
-
- /// <summary>
- /// 妫�楠岄」鐩�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM")]
- public string FcheckItem { get; set; }
-
- /// <summary>
- /// 妫�楠屽伐鍏�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_TOOL")]
- public string FcheckTool { get; set; }
-
- /// <summary>
- /// 涓嬮檺
- ///</summary>
- [SugarColumn(ColumnName = "FDOWN_ALLOW")]
- public string FdownAllow { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- ///</summary>
- [SugarColumn(ColumnName = "FREQUENCY")]
- public string FREQUENCY { get; set; }
-
- /// <summary>
- /// 鏍囧噯
- ///</summary>
- [SugarColumn(ColumnName = "FSTAND")]
- public string FSTAND { get; set; }
-
- /// <summary>
- /// 涓婇檺
- ///</summary>
- [SugarColumn(ColumnName = "FUP_ALLOW")]
- public string FupAllow { get; set; }
-
- /// <summary>
- /// 妫�楠屾按鍑嗙紪鐮�
- ///</summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
- public string SampleSizeNo { get; set; }
-
- /// <summary>
- /// 瑙勬牸瑕佹眰
- ///</summary>
- [SugarColumn(ColumnName = "FSPEC_REQU")]
- public string FspecRequ { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "ISENABLED")]
- public short? ISENABLED { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "EE")]
- public short? EE { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FTYPE")]
- public string FTYPE { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaIqcItem.cs b/MES.Service/Modes/MesQaIqcItem.cs
deleted file mode 100644
index d0362e3..0000000
--- a/MES.Service/Modes/MesQaIqcItem.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鏁版嵁婧愬鍏�
-///</summary>
-[SugarTable("MES_QA_IQC_ITEM")]
-public class MesQaIqcItem
-{
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
- public string ReleaseNo { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
- public string FacLevel { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM")]
- public string FcheckItem { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_TOOL")]
- public string FcheckTool { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FDOWN_ALLOW")]
- public string FdownAllow { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_LEVEL")]
- public string FcheckLevel { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FSTAND")]
- public string? Fstand { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FUP_ALLOW")]
- public string FupAllow { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
- public string SampleSizeNo { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FSPEC_REQU")]
- public string FspecRequ { 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 = "CHECK_QYT")]
- public decimal? CheckQyt { get; set; }
-
- /// <summary>
- ///
- ///</summary>
-
- [SugarColumn(ColumnName = "FRE_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? FreQty { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItem.cs b/MES.Service/Modes/MesQaItem.cs
deleted file mode 100644
index d1f62bc..0000000
--- a/MES.Service/Modes/MesQaItem.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// </summary>
-[Table("MES_QA_ITEM")]
-[SugarTable("MES_QA_ITEM")] //鐢ㄤ簬SqlSugar
-public class MesQaItem
-{
- /// <summary>
- /// 瀵瑰簲搴忓垪SEQ_QA
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐗╂枡缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 涓昏〃id
- /// </summary>
- [Column("QID")]
- [SugarColumn(ColumnName = "QID")] //鐢ㄤ簬SqlSugar
- public decimal? Qid { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItemsDetect01.cs b/MES.Service/Modes/MesQaItemsDetect01.cs
deleted file mode 100644
index 29c49b9..0000000
--- a/MES.Service/Modes/MesQaItemsDetect01.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鏉ユ枡鍏ュ簱妫�楠岃〃澶�
-/// </summary>
-[SugarTable("MES_QA_ITEMS_DETECT_01")]
-public class MesQaItemsDetect01
-{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
- public string ReleaseNo { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_DATE")]
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// 妫�楠屼汉鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_BY")]
- public string FcheckBy { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 鏉ユ枡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FBATCH_QTY")]
- public decimal? FbatchQty { get; set; }
-
- /// <summary>
- /// 鍒ゅ畾缁撴灉
- /// </summary>
- [SugarColumn(ColumnName = "FRECE_QTY")]
- public string FreceQty { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string SuppNo { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FNG_DESC")]
- public string FngDesc { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
- public string FcheckResu { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FREVIEW")]
- public string Freview { get; set; }
-
- /// <summary>
- /// 妫�楠屾按鍑�
- /// </summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
- public string SampleSizeNo { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_LEVEL")]
- public string FcheckLevel { get; set; }
-
- /// <summary>
- /// 鎷掓敹姘村钩
- /// </summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
- public string FacLevel { get; set; }
-
- /// <summary>
- /// 鎶芥鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QTY")]
- public string CheckQty { get; set; }
-
- /// <summary>
- /// 鎵规鍙� --鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
- public string LotNo { get; set; }
-
- /// <summary>
- /// 鏄惁鎺ㄩ��
- /// </summary>
- [SugarColumn(ColumnName = "FMOVE")]
- public string Fmove { get; set; }
-
- /// <summary>
- /// 鏄惁澶勭悊
- /// </summary>
- [SugarColumn(ColumnName = "FHANDLE")]
- public string Fhandle { 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 = "MODIFY1_FLAG")]
- public decimal? Modify1Flag { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_BY")]
- public string Modify1By { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_DATE")]
- public DateTime? Modify1Date { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string Factory { get; set; }
-
- /// <summary>
- /// XRF娴嬭瘯鎶ュ憡缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_REPNO")]
- public string FcheckRepno { get; set; }
-
- /// <summary>
- /// 绗笁鏂规姤鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FTHIRD_REP")]
- public string FthirdRep { get; set; }
-
- /// <summary>
- /// 鏄惁浣滃簾
- /// </summary>
- [SugarColumn(ColumnName = "FCANCEL")]
- public decimal? Fcancel { get; set; }
-
- /// <summary>
- /// 鎻愪氦鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "FSUBMIT")]
- public decimal? Fsubmit { get; set; }
-
- /// <summary>
- /// 妫�楠屼緷鎹�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ACCORD")]
- public string FcheckAccord { get; set; }
-
- /// <summary>
- /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
- /// </summary>
- [SugarColumn(ColumnName = "FTYPE")]
- public short? Ftype { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_UNIT")]
- public string ItemUnit { get; set; }
-
- /// <summary>
- /// 鍑鸿揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "OUT_DATE")]
- public string OutDate { get; set; }
-
- /// <summary>
- /// 鏄惁鍏嶆
- /// </summary>
- [SugarColumn(ColumnName = "FEXEMPTION")]
- public decimal? Fexemption { get; set; }
-
- /// <summary>
- /// 妗ｄ綅鏍囧噯
- /// </summary>
- [SugarColumn(ColumnName = "FGEAR_STAND")]
- public string FgearStand { get; set; }
-
- /// <summary>
- /// 涓嶈壇澶勭悊鏂规硶
- /// </summary>
- [SugarColumn(ColumnName = "FNG_HANDLE")]
- public string FngHandle { get; set; }
-
- /// <summary>
- /// 绠＄悊缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FMANAGE_NO")]
- public string FmanageNo { get; set; }
-
- /// <summary>
- /// 杞崲鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FCOVERT_QTY")]
- public string FcovertQty { get; set; }
-
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- [SugarColumn(ColumnName = "FVERSION")]
- public decimal? Fversion { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string Company { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FSECOND_RESU")]
- public string FsecondResu { get; set; }
-
- /// <summary>
- /// 鏈�澶ф娊妫�鏁�
- /// </summary>
- [SugarColumn(ColumnName = "MAX_CHECK_QTY")]
- public decimal? MaxCheckQty { get; set; }
-
- /// <summary>
- /// 鐗瑰畾淇敼鏄惁瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_FLAG1")]
- public decimal? Modify1Flag1 { get; set; }
-
- /// <summary>
- /// 鐗瑰畾淇敼瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_BY1")]
- public string Modify1By1 { get; set; }
-
- /// <summary>
- /// 鐗瑰畾淇敼瀹℃牳鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "MODIFY1_DATE1")]
- public DateTime? Modify1Date1 { get; set; }
-
- /// <summary>
- /// 灏忔壒娆″彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO1")]
- public string LotNo1 { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO2")]
- public string LotNo2 { get; set; }
-
- /// <summary>
- /// 浜у搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string BoardStyle { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string WorkNo { get; set; }
-
- /// <summary>
- /// 鍒拌揣鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DHA018")]
- public string Dha018 { get; set; }
-
- /// <summary>
- /// 琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB002")]
- public decimal? Dhb002 { get; set; }
-
- /// <summary>
- /// 鍒拌揣鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB001")]
- public string Dhb001 { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "LIFNR")]
- public string Lifnr { get; set; }
-
- /// <summary>
- /// 閫�鏂欐柟寮�
- /// </summary>
- [SugarColumn(ColumnName = "FMRMODE")]
- public string Fmrmode { get; set; }
-
- /// <summary>
- /// 涓嶈壇鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "Remarks")]
- public string Remarks { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItemsDetect02.cs b/MES.Service/Modes/MesQaItemsDetect02.cs
deleted file mode 100644
index d5e1b35..0000000
--- a/MES.Service/Modes/MesQaItemsDetect02.cs
+++ /dev/null
@@ -1,487 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// IQC鎶芥琛ㄥご
-/// </summary>
-[Table("MES_QA_ITEMS_DETECT_02")]
-[SugarTable("MES_QA_ITEMS_DETECT_02")] //鐢ㄤ簬SqlSugar
-public class MesQaItemsDetect02
-{
- /// <summary>
- /// SEQ_QM_ID
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QM_ID",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- /// </summary>
- [Column("AUFNR")]
- [SugarColumn(ColumnName = "AUFNR")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍏ュ簱鍗曞彿闀垮害涓嶈兘瓒呭嚭100")]
- public string? Aufnr { get; set; }
-
- /// <summary>
- /// 鏉＄爜
- /// </summary>
- [Column("BARCODE_A")]
- [SugarColumn(ColumnName = "BARCODE_A")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏉＄爜闀垮害涓嶈兘瓒呭嚭100")]
- public string? BarcodeA { get; set; }
-
- /// <summary>
- /// 鏉＄爜
- /// </summary>
- [Column("BARCODE_B")]
- [SugarColumn(ColumnName = "BARCODE_B")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏉＄爜闀垮害涓嶈兘瓒呭嚭100")]
- public string? BarcodeB { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [Column("BOARD_ITEM")]
- [SugarColumn(ColumnName = "BOARD_ITEM")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "浜у搧缂栫爜闀垮害涓嶈兘瓒呭嚭100")]
- public string? BoardItem { get; set; }
-
- /// <summary>
- /// 璁よ瘉瑕佹眰
- /// </summary>
- [Column("CARD")]
- [SugarColumn(ColumnName = "CARD")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "璁よ瘉瑕佹眰闀垮害涓嶈兘瓒呭嚭100")]
- public string? Card { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CLASS_NAME")]
- [SugarColumn(ColumnName = "CLASS_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "ClassName闀垮害涓嶈兘瓒呭嚭100")]
- public string? ClassName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CLASS_NO")]
- [SugarColumn(ColumnName = "CLASS_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "ClassNo闀垮害涓嶈兘瓒呭嚭100")]
- public string? ClassNo { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string? Company { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [Column("CUST_NAME")]
- [SugarColumn(ColumnName = "CUST_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "瀹㈡埛闀垮害涓嶈兘瓒呭嚭100")]
- public string? CustName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FAC_LEVEL")]
- [SugarColumn(ColumnName = "FAC_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "FacLevel闀垮害涓嶈兘瓒呭嚭100")]
- public string? FacLevel { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭100")]
- public string? Factory { get; set; }
-
- /// <summary>
- /// 閿�鍞柟鍚�
- /// </summary>
- [Column("FANG")]
- [SugarColumn(ColumnName = "FANG")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "閿�鍞柟鍚戦暱搴︿笉鑳借秴鍑�100")]
- public string? Fang { get; set; }
-
- /// <summary>
- /// 閫佹鏁伴噺
- /// </summary>
- [Column("FBATCH_QTY")]
- [SugarColumn(ColumnName = "FBATCH_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? FbatchQty { get; set; }
-
- /// <summary>
- /// 浣滃簾鏍囪瘑
- /// </summary>
- [Column("FCANCEL")]
- [SugarColumn(ColumnName = "FCANCEL")] //鐢ㄤ簬SqlSugar
- [StringLength(2, ErrorMessage = "浣滃簾鏍囪瘑闀垮害涓嶈兘瓒呭嚭2")]
- public string? Fcancel { get; set; }
-
- /// <summary>
- /// 浜х嚎鑷鍛�
- /// </summary>
- [Column("FCHECK_BY")]
- [SugarColumn(ColumnName = "FCHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "浜х嚎鑷鍛橀暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckBy { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [Column("FCHECK_DATE")]
- [SugarColumn(ColumnName = "FCHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// 涓嶅悎鏍肩▼搴�
- /// </summary>
- [Column("FCHECK_LEVEL")]
- [SugarColumn(ColumnName = "FCHECK_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "涓嶅悎鏍肩▼搴﹂暱搴︿笉鑳借秴鍑�50")]
- public string? FcheckLevel { get; set; }
-
- /// <summary>
- /// 鐗硅浜嬮」
- /// </summary>
- [Column("FCHECK_MEMO")]
- [SugarColumn(ColumnName = "FCHECK_MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "鐗硅浜嬮」闀垮害涓嶈兘瓒呭嚭500")]
- public string? FcheckMemo { get; set; }
-
- /// <summary>
- /// IPQC妫�楠屽憳
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "IPQC妫�楠屽憳闀垮害涓嶈兘瓒呭嚭100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// 璁惧缂栧彿
- /// </summary>
- [Column("FEQP")]
- [SugarColumn(ColumnName = "FEQP")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "璁惧缂栧彿闀垮害涓嶈兘瓒呭嚭100")]
- public string? Feqp { get; set; }
-
- /// <summary>
- /// 涓嶈壇鎻忚堪
- /// </summary>
- [Column("FNG_DESC")]
- [SugarColumn(ColumnName = "FNG_DESC")] //鐢ㄤ簬SqlSugar
- [StringLength(2000, ErrorMessage = "涓嶈壇鎻忚堪闀垮害涓嶈兘瓒呭嚭2000")]
- public string? FngDesc { get; set; }
-
- /// <summary>
- /// 澶勭悊鏂规硶
- /// </summary>
- [Column("FNG_HANDLE")]
- [SugarColumn(ColumnName = "FNG_HANDLE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "澶勭悊鏂规硶闀垮害涓嶈兘瓒呭嚭100")]
- public string? FngHandle { get; set; }
-
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [Column("FPROD_DATE")]
- [SugarColumn(ColumnName = "FPROD_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FprodDate { get; set; }
-
- /// <summary>
- /// 鐢熶骇绫诲瀷
- /// </summary>
- [Column("FPROD_TYPE")]
- [SugarColumn(ColumnName = "FPROD_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "鐢熶骇绫诲瀷闀垮害涓嶈兘瓒呭嚭200")]
- public string? FprodType { get; set; }
-
- /// <summary>
- /// 浜屾鍒ゅ畾缁撴灉
- /// </summary>
- [Column("FSECOND_RESU")]
- [SugarColumn(ColumnName = "FSECOND_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "浜屾鍒ゅ畾缁撴灉闀垮害涓嶈兘瓒呭嚭100")]
- public string? FsecondResu { get; set; }
-
- /// <summary>
- /// 1涓洪妫�锛�2涓哄畬宸ユ楠�
- /// </summary>
- [Column("FSTATUS")]
- [SugarColumn(ColumnName = "FSTATUS")] //鐢ㄤ簬SqlSugar
- public decimal? Fstatus { get; set; }
-
- /// <summary>
- /// 鎻愪氦鏍囪瘑锛堜骇绾匡級
- /// </summary>
- [Column("FSUBMIT")]
- [SugarColumn(ColumnName = "FSUBMIT")] //鐢ㄤ簬SqlSugar
- public decimal? Fsubmit { get; set; }
-
- /// <summary>
- /// 鎻愪氦浜�
- /// </summary>
- [Column("FSUBMIT_BY")]
- [SugarColumn(ColumnName = "FSUBMIT_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鎻愪氦浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? FsubmitBy { get; set; }
-
- /// <summary>
- /// 鎻愪氦鏃ユ湡
- /// </summary>
- [Column("FSUBMIT_DATE")]
- [SugarColumn(ColumnName = "FSUBMIT_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FsubmitDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FTYPE")]
- [SugarColumn(ColumnName = "FTYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "Ftype闀垮害涓嶈兘瓒呭嚭100")]
- public string? Ftype { get; set; }
-
- /// <summary>
- /// 鐗堟湰
- /// </summary>
- [Column("FVERSION")]
- [SugarColumn(ColumnName = "FVERSION")] //鐢ㄤ簬SqlSugar
- public decimal? Fversion { get; set; }
-
- /// <summary>
- /// 澶勭疆浜�
- /// </summary>
- [Column("IPQC_BY")]
- [SugarColumn(ColumnName = "IPQC_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "澶勭疆浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? IpqcBy { get; set; }
-
- /// <summary>
- /// 澶勭疆鏃ユ湡
- /// </summary>
- [Column("IPQC_DATE")]
- [SugarColumn(ColumnName = "IPQC_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? IpqcDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏍囪瘑
- /// </summary>
- [Column("IPQC_STATUS")]
- [SugarColumn(ColumnName = "IPQC_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? IpqcStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("ISMODIFY1")]
- [SugarColumn(ColumnName = "ISMODIFY1")] //鐢ㄤ簬SqlSugar
- public decimal? Ismodify1 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "ItemNo闀垮害涓嶈兘瓒呭嚭100")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃ユ湡
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 宸ヤ綅ID
- /// </summary>
- [Column("LINEINFO_ID")]
- [SugarColumn(ColumnName = "LINEINFO_ID")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ヤ綅ID闀垮害涓嶈兘瓒呭嚭20")]
- public string? LineinfoId { get; set; }
-
- /// <summary>
- /// 绾夸綋缂栧彿
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "绾夸綋缂栧彿闀垮害涓嶈兘瓒呭嚭100")]
- public string? LineNo { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("LOT_NO")]
- [SugarColumn(ColumnName = "LOT_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "LotNo闀垮害涓嶈兘瓒呭嚭100")]
- public string? LotNo { get; set; }
-
- /// <summary>
- /// 澶勭疆浜�
- /// </summary>
- [Column("MANAGE_BY")]
- [SugarColumn(ColumnName = "MANAGE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "澶勭疆浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? ManageBy { get; set; }
-
- /// <summary>
- /// 澶勭疆鏃ユ湡
- /// </summary>
- [Column("MANAGE_DATE")]
- [SugarColumn(ColumnName = "MANAGE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? ManageDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MAX_CHECK_QTY")]
- [SugarColumn(ColumnName = "MAX_CHECK_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? MaxCheckQty { get; set; }
-
- /// <summary>
- /// 鍘熷洜鍒嗘瀽
- /// </summary>
- [Column("MEMO_A")]
- [SugarColumn(ColumnName = "MEMO_A")] //鐢ㄤ簬SqlSugar
- [StringLength(4000, ErrorMessage = "鍘熷洜鍒嗘瀽闀垮害涓嶈兘瓒呭嚭4000")]
- public string? MemoA { get; set; }
-
- /// <summary>
- /// 涓存椂瀵圭瓥
- /// </summary>
- [Column("MEMO_B")]
- [SugarColumn(ColumnName = "MEMO_B")] //鐢ㄤ簬SqlSugar
- [StringLength(4000, ErrorMessage = "涓存椂瀵圭瓥闀垮害涓嶈兘瓒呭嚭4000")]
- public string? MemoB { get; set; }
-
- /// <summary>
- /// 闀挎湡瀵圭瓥
- /// </summary>
- [Column("MEMO_C")]
- [SugarColumn(ColumnName = "MEMO_C")] //鐢ㄤ簬SqlSugar
- [StringLength(4000, ErrorMessage = "闀挎湡瀵圭瓥闀垮害涓嶈兘瓒呭嚭4000")]
- public string? MemoC { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MENU_ID")]
- [SugarColumn(ColumnName = "MENU_ID")] //鐢ㄤ簬SqlSugar
- public decimal? MenuId { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("MODIFY1_BY")]
- [SugarColumn(ColumnName = "MODIFY1_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? Modify1By { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("MODIFY1_DATE")]
- [SugarColumn(ColumnName = "MODIFY1_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? Modify1Date { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏍囪瘑
- /// </summary>
- [Column("MODIFY1_FLAG")]
- [SugarColumn(ColumnName = "MODIFY1_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? Modify1Flag { get; set; }
-
- /// <summary>
- /// 鍝佺増
- /// </summary>
- [Column("PINGPAI")]
- [SugarColumn(ColumnName = "PINGPAI")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍝佺増闀垮害涓嶈兘瓒呭嚭100")]
- public string? Pingpai { get; set; }
-
- /// <summary>
- /// 璁″垝鏁伴噺
- /// </summary>
- [Column("PLAN_QTY")]
- [SugarColumn(ColumnName = "PLAN_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? PlanQty { get; set; }
-
- /// <summary>
- /// PQC绫诲瀷璇存槑
- /// </summary>
- [Column("PQC_TEXT")]
- [SugarColumn(ColumnName = "PQC_TEXT")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "PQC绫诲瀷璇存槑闀垮害涓嶈兘瓒呭嚭200")]
- public string? PqcText { get; set; }
-
- /// <summary>
- /// PQC妫�楠岀被鍨�
- /// </summary>
- [Column("PQC_TYPE")]
- [SugarColumn(ColumnName = "PQC_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "PQC妫�楠岀被鍨嬮暱搴︿笉鑳借秴鍑�30")]
- public string? PqcType { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("PROC_NAME")]
- [SugarColumn(ColumnName = "PROC_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "ProcName闀垮害涓嶈兘瓒呭嚭100")]
- public string? ProcName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("PROC_NO")]
- [SugarColumn(ColumnName = "PROC_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "ProcNo闀垮害涓嶈兘瓒呭嚭100")]
- public string? ProcNo { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [Column("RELEASE_NO")]
- [SugarColumn(ColumnName = "RELEASE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屽崟鍙烽暱搴︿笉鑳借秴鍑�100")]
- public string? ReleaseNo { get; set; }
-
- /// <summary>
- /// 宸ヤ綔涓績
- /// </summary>
- [Column("WORKSHOP_CENTER_CODE")]
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "宸ヤ綔涓績闀垮害涓嶈兘瓒呭嚭100")]
- public string? WorkshopCenterCode { get; set; }
-
- /// <summary>
- /// 宸ヤ綔涓績
- /// </summary>
- [Column("GID")]
- [SugarColumn(ColumnName = "GID")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "GID100")]
- public decimal? Gid { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItemsDetectDetail12.cs b/MES.Service/Modes/MesQaItemsDetectDetail12.cs
deleted file mode 100644
index aec9516..0000000
--- a/MES.Service/Modes/MesQaItemsDetectDetail12.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// IQC妫�楠�
-///</summary>
-[SugarTable("MES_QA_ITEMS_DETECT_DETAIL12")]
-public class MesQaItemsDetectDetail12
-{
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// 妫�楠岄」鐩�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM")]
- public string? FcheckItem { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- ///</summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
- public string? ReleaseNo { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "MAIN_ID")]
- public decimal? MainId { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FSTAND")]
- public string? Fstand { get; set; }
-
- /// <summary>
- /// 鐢熸垚浜�
- ///</summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
- public string? CreateBy { get; set; }
-
- [SugarColumn(IsIgnore = true)] public int? count { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItemsDetectDetail5.cs b/MES.Service/Modes/MesQaItemsDetectDetail5.cs
deleted file mode 100644
index 9eb5967..0000000
--- a/MES.Service/Modes/MesQaItemsDetectDetail5.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鏉ユ枡妫�楠屼粠琛�
-///</summary>
-[SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")]
-public class MesQaItemsDetectDetail5
-{
- /// <summary>
- ///
- ///</summary>
- [Column("ID")]
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_QM_ID", IsPrimaryKey = true)]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍊肩被鍨�
- ///</summary>
- [SugarColumn(ColumnName = "FTEXT_TYPE")]
- public string? FtextType { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍊�
- ///</summary>
- [SugarColumn(ColumnName = "FSTAND")]
- public string? Fstand { get; set; }
-
- /// <summary>
- /// 涓婂叕宸�
- ///</summary>
- [SugarColumn(ColumnName = "FUP_ALLOW")]
- public string? FupAllow { get; set; }
-
- /// <summary>
- /// 涓嬪叕宸�
- ///</summary>
- [SugarColumn(ColumnName = "FDOWN_ALLOW")]
- public string? FdownAllow { get; set; }
-
- /// <summary>
- /// 妫�楠屾按鍑�
- ///</summary>
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
- public string? SampleSizeNo { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_LEVEL")]
- public string? FcheckLevel { get; set; }
-
- /// <summary>
- /// 鎷掓敹姘村钩
- ///</summary>
- [SugarColumn(ColumnName = "FAC_LEVEL")]
- public string? FacLevel { get; set; }
-
- /// <summary>
- /// 妫�楠岄」鐩�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM")]
- public string? FcheckItem { get; set; }
-
- /// <summary>
- /// 瑙勬牸瑕佹眰
- ///</summary>
- [SugarColumn(ColumnName = "FSPEC_REQU")]
- public string? FspecRequ { get; set; }
-
- /// <summary>
- /// 鎶芥鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "CHECK_QYT")]
- public decimal? CheckQyt { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// AC鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "FAC_QTY")]
- public decimal? FacQty { get; set; }
-
- /// <summary>
- /// RE鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "FRE_QTY")]
- public decimal? FreQty { get; set; }
-
- /// <summary>
- /// 涓嶅悎鏍兼暟
- ///</summary>
- [SugarColumn(ColumnName = "FNG_QTY")]
- public decimal? FngQty { get; set; }
-
- /// <summary>
- /// 涓嶈壇鐜�
- ///</summary>
- [SugarColumn(ColumnName = "FNG_RATE")]
- public decimal? FngRate { get; set; }
-
- /// <summary>
- /// 宸插綍鍏ユ暟閲�
- ///</summary>
- [SugarColumn(ColumnName = "FENTER_QTY")]
- public decimal? FenterQty { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
- public string? ReleaseNo { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
- /// <summary>
- /// 妫�楠岄」鐩弿杩�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")]
- public string? FcheckItemDesc { get; set; }
-
- /// <summary>
- /// 宸ュ簭鍙�
- ///</summary>
- [SugarColumn(ColumnName = "PROC_NO")]
- public string? ProcNo { get; set; }
-
- /// <summary>
- /// 宸ヤ綔涓績缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
- public string? WorkshopCenterCode { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- ///</summary>
- [SugarColumn(ColumnName = "FUNIT")]
- public string? Funit { get; set; }
-
- /// <summary>
- /// 鐗瑰畾淇敼
- ///</summary>
- [SugarColumn(ColumnName = "GIVEN_MODIFY")]
- public short? GivenModify { get; set; }
-
- /// <summary>
- /// 妫�楠屽伐鍏�
- ///</summary>
- [SugarColumn(ColumnName = "FCHECK_TOOL")]
- public string? FcheckTool { 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 = "REMARKS")]
- public string? Remarks { get; set; }
-
- [SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQmAql1.cs b/MES.Service/Modes/MesQmAql1.cs
deleted file mode 100644
index cf40e09..0000000
--- a/MES.Service/Modes/MesQmAql1.cs
+++ /dev/null
@@ -1,172 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// AQL鎶芥牱鍩哄噯
-/// </summary>
-[Table("MES_QM_AQL1")]
-[SugarTable("MES_QM_AQL1")] //鐢ㄤ簬SqlSugar
-public class MesQmAql1
-{
- /// <summary>
- /// ID(seq_me_id)
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍏徃
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍏徃闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�32")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜哄鍚�
- /// </summary>
- [Column("CREATE_NAME")]
- [SugarColumn(ColumnName = "CREATE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鍒涘缓浜哄鍚嶉暱搴︿笉鑳借秴鍑�32")]
- public string CreateName { get; set; }
-
- /// <summary>
- /// 淇敼/鏂板鐘舵��
- /// </summary>
- [Column("EDIT_STATUS")]
- [SugarColumn(ColumnName = "EDIT_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? EditStatus { get; set; }
-
- /// <summary>
- /// 鎵�灞炲伐鍘�
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鎵�灞炲伐鍘傞暱搴︿笉鑳借秴鍑�100")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 瀹℃壒鏃ユ湡
- /// </summary>
- [Column("FONE_CHECKDATE")]
- [SugarColumn(ColumnName = "FONE_CHECKDATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FoneCheckdate { get; set; }
-
- /// <summary>
- /// 瀹℃壒鏍囪
- /// </summary>
- [Column("FONE_CHECKED")]
- [SugarColumn(ColumnName = "FONE_CHECKED")] //鐢ㄤ簬SqlSugar
- public decimal? FoneChecked { get; set; }
-
- /// <summary>
- /// 瀹℃壒浜�
- /// </summary>
- [Column("FONE_CHECKOR")]
- [SugarColumn(ColumnName = "FONE_CHECKOR")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "瀹℃壒浜洪暱搴︿笉鑳借秴鍑�50")]
- public string FoneCheckor { get; set; }
-
- /// <summary>
- /// 纭鏃ユ湡
- /// </summary>
- [Column("FTWO_CHECKDATE")]
- [SugarColumn(ColumnName = "FTWO_CHECKDATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FtwoCheckdate { get; set; }
-
- /// <summary>
- /// 纭鏍囪
- /// </summary>
- [Column("FTWO_CHECKED")]
- [SugarColumn(ColumnName = "FTWO_CHECKED")] //鐢ㄤ簬SqlSugar
- public decimal? FtwoChecked { get; set; }
-
- /// <summary>
- /// 纭浜�
- /// </summary>
- [Column("FTWO_CHECKOR")]
- [SugarColumn(ColumnName = "FTWO_CHECKOR")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "纭浜洪暱搴︿笉鑳借秴鍑�50")]
- public string FtwoCheckor { get; set; }
-
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- [Column("FVERSION")]
- [SugarColumn(ColumnName = "FVERSION")] //鐢ㄤ簬SqlSugar
- public decimal? Fversion { get; set; }
-
- /// <summary>
- /// 鏄惁鍙敤
- /// </summary>
- [Column("ISENABLED")]
- [SugarColumn(ColumnName = "ISENABLED")] //鐢ㄤ簬SqlSugar
- public decimal? Isenabled { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鏈�鍚庢洿鏂颁汉闀垮害涓嶈兘瓒呭嚭32")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 鏇存柊浜哄鍚�
- /// </summary>
- [Column("LASTUPDATE_NAME")]
- [SugarColumn(ColumnName = "LASTUPDATE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鏇存柊浜哄鍚嶉暱搴︿笉鑳借秴鍑�32")]
- public string LastupdateName { get; set; }
-
- /// <summary>
- /// 澶囨敞淇℃伅
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞淇℃伅闀垮害涓嶈兘瓒呭嚭255")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍚嶇О
- /// </summary>
- [Column("SAMPLE_SIZE_NAME")]
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鏍囧噯鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string SampleSizeName { get; set; }
-
- /// <summary>
- /// 鏍囧噯缂栫爜
- /// </summary>
- [Column("SAMPLE_SIZE_NO")]
- [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鏍囧噯缂栫爜闀垮害涓嶈兘瓒呭嚭50")]
- public string SampleSizeNo { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQmAql2.cs b/MES.Service/Modes/MesQmAql2.cs
deleted file mode 100644
index 3078fc3..0000000
--- a/MES.Service/Modes/MesQmAql2.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// AQL鎶芥牱鍩哄噯鏍锋湰閲忓瓙鐮�
-/// </summary>
-[Table("MES_QM_AQL2")]
-[SugarTable("MES_QM_AQL2")] //鐢ㄤ簬SqlSugar
-public class MesQmAql2
-{
- /// <summary>
- /// ID(seq_me_id)
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// AQL鎶芥牱鍩哄噯ID
- /// </summary>
- [Column("AQL1_ID")]
- [SugarColumn(ColumnName = "AQL1_ID")] //鐢ㄤ簬SqlSugar
- public decimal? Aql1Id { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�32")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜哄鍚�
- /// </summary>
- [Column("CREATE_NAME")]
- [SugarColumn(ColumnName = "CREATE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鍒涘缓浜哄鍚嶉暱搴︿笉鑳借秴鍑�32")]
- public string CreateName { get; set; }
-
- /// <summary>
- /// 淇敼/鏂板鐘舵��
- /// </summary>
- [Column("EDIT_STATUS")]
- [SugarColumn(ColumnName = "EDIT_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? EditStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 涓�鑸楠屾按骞硘I
- /// </summary>
- [Column("FLEVEL_I")]
- [SugarColumn(ColumnName = "FLEVEL_I")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "涓�鑸楠屾按骞硘I闀垮害涓嶈兘瓒呭嚭1")]
- public string FlevelI { get; set; }
-
- /// <summary>
- /// 涓�鑸楠屾按骞硘II
- /// </summary>
- [Column("FLEVEL_II")]
- [SugarColumn(ColumnName = "FLEVEL_II")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "涓�鑸楠屾按骞硘II闀垮害涓嶈兘瓒呭嚭1")]
- public string FlevelIi { get; set; }
-
- /// <summary>
- /// 涓�鑸楠屾按骞硘III
- /// </summary>
- [Column("FLEVEL_III")]
- [SugarColumn(ColumnName = "FLEVEL_III")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "涓�鑸楠屾按骞硘III闀垮害涓嶈兘瓒呭嚭1")]
- public string FlevelIii { get; set; }
-
- /// <summary>
- /// 鐗规畩妫�楠屾按骞硘S-1
- /// </summary>
- [Column("FLEVEL_S1")]
- [SugarColumn(ColumnName = "FLEVEL_S1")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "鐗规畩妫�楠屾按骞硘S-1闀垮害涓嶈兘瓒呭嚭1")]
- public string FlevelS1 { get; set; }
-
- /// <summary>
- /// 鐗规畩妫�楠屾按骞硘S-2
- /// </summary>
- [Column("FLEVEL_S2")]
- [SugarColumn(ColumnName = "FLEVEL_S2")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "鐗规畩妫�楠屾按骞硘S-2闀垮害涓嶈兘瓒呭嚭1")]
- public string FlevelS2 { get; set; }
-
- /// <summary>
- /// 鐗规畩妫�楠屾按骞硘S-3
- /// </summary>
- [Column("FLEVEL_S3")]
- [SugarColumn(ColumnName = "FLEVEL_S3")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "鐗规畩妫�楠屾按骞硘S-3闀垮害涓嶈兘瓒呭嚭1")]
- public string FlevelS3 { get; set; }
-
- /// <summary>
- /// 鐗规畩妫�楠屾按骞硘S-4
- /// </summary>
- [Column("FLEVEL_S4")]
- [SugarColumn(ColumnName = "FLEVEL_S4")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "鐗规畩妫�楠屾按骞硘S-4闀垮害涓嶈兘瓒呭嚭1")]
- public string FlevelS4 { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鏈�鍚庢洿鏂颁汉闀垮害涓嶈兘瓒呭嚭32")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 鏇存柊浜哄鍚�
- /// </summary>
- [Column("LASTUPDATE_NAME")]
- [SugarColumn(ColumnName = "LASTUPDATE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鏇存柊浜哄鍚嶉暱搴︿笉鑳借秴鍑�32")]
- public string LastupdateName { get; set; }
-
- /// <summary>
- /// 鎵归噺寮�濮�
- /// </summary>
- [Column("LOT_FROM")]
- [SugarColumn(ColumnName = "LOT_FROM")] //鐢ㄤ簬SqlSugar
- public decimal? LotFrom { get; set; }
-
- /// <summary>
- /// 鎵归噺缁撴潫
- /// </summary>
- [Column("LOT_TO")]
- [SugarColumn(ColumnName = "LOT_TO")] //鐢ㄤ簬SqlSugar
- public decimal? LotTo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Memo { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQmAql3.cs b/MES.Service/Modes/MesQmAql3.cs
deleted file mode 100644
index ae288e3..0000000
--- a/MES.Service/Modes/MesQmAql3.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// AQL鎶芥牱鍩哄噯鎶芥牱鏂规
-/// </summary>
-[Table("MES_QM_AQL3")]
-[SugarTable("MES_QM_AQL3")] //鐢ㄤ簬SqlSugar
-public class MesQmAql3
-{
- /// <summary>
- /// ID(seq_me_id)
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0
- /// </summary>
- [Column("AQL_0_0")]
- [SugarColumn(ColumnName = "AQL_0_0")] //鐢ㄤ簬SqlSugar
- public decimal? Aql00 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.0010
- /// </summary>
- [Column("AQL_0_00010")]
- [SugarColumn(ColumnName = "AQL_0_00010")] //鐢ㄤ簬SqlSugar
- public decimal? Aql000010 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.010
- /// </summary>
- [Column("AQL_0_0010")]
- [SugarColumn(ColumnName = "AQL_0_0010")] //鐢ㄤ簬SqlSugar
- public decimal? Aql00010 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.015
- /// </summary>
- [Column("AQL_0_0015")]
- [SugarColumn(ColumnName = "AQL_0_0015")] //鐢ㄤ簬SqlSugar
- public decimal? Aql00015 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.025
- /// </summary>
- [Column("AQL_0_0025")]
- [SugarColumn(ColumnName = "AQL_0_0025")] //鐢ㄤ簬SqlSugar
- public decimal? Aql00025 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.040
- /// </summary>
- [Column("AQL_0_0040")]
- [SugarColumn(ColumnName = "AQL_0_0040")] //鐢ㄤ簬SqlSugar
- public decimal? Aql00040 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.065
- /// </summary>
- [Column("AQL_0_0065")]
- [SugarColumn(ColumnName = "AQL_0_0065")] //鐢ㄤ簬SqlSugar
- public decimal? Aql00065 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.10
- /// </summary>
- [Column("AQL_0_010")]
- [SugarColumn(ColumnName = "AQL_0_010")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0010 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.15
- /// </summary>
- [Column("AQL_0_015")]
- [SugarColumn(ColumnName = "AQL_0_015")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0015 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.25
- /// </summary>
- [Column("AQL_0_025")]
- [SugarColumn(ColumnName = "AQL_0_025")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0025 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.40
- /// </summary>
- [Column("AQL_0_040")]
- [SugarColumn(ColumnName = "AQL_0_040")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0040 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩0.65
- /// </summary>
- [Column("AQL_0_065")]
- [SugarColumn(ColumnName = "AQL_0_065")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0065 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩1.0
- /// </summary>
- [Column("AQL_0_100")]
- [SugarColumn(ColumnName = "AQL_0_100")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0100 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩1.5
- /// </summary>
- [Column("AQL_0_150")]
- [SugarColumn(ColumnName = "AQL_0_150")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0150 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩2.5
- /// </summary>
- [Column("AQL_0_250")]
- [SugarColumn(ColumnName = "AQL_0_250")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0250 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩4.0
- /// </summary>
- [Column("AQL_0_400")]
- [SugarColumn(ColumnName = "AQL_0_400")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0400 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩6.5
- /// </summary>
- [Column("AQL_0_650")]
- [SugarColumn(ColumnName = "AQL_0_650")] //鐢ㄤ簬SqlSugar
- public decimal? Aql0650 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩10
- /// </summary>
- [Column("AQL_1_000")]
- [SugarColumn(ColumnName = "AQL_1_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql1000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩100
- /// </summary>
- [Column("AQL_10_000")]
- [SugarColumn(ColumnName = "AQL_10_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql10000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩1000
- /// </summary>
- [Column("AQL_100_000")]
- [SugarColumn(ColumnName = "AQL_100_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql100000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩10000
- /// </summary>
- [Column("AQL_1000_000")]
- [SugarColumn(ColumnName = "AQL_1000_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql1000000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩15
- /// </summary>
- [Column("AQL_1_500")]
- [SugarColumn(ColumnName = "AQL_1_500")] //鐢ㄤ簬SqlSugar
- public decimal? Aql1500 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩150
- /// </summary>
- [Column("AQL_15_000")]
- [SugarColumn(ColumnName = "AQL_15_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql15000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩1500
- /// </summary>
- [Column("AQL_150_000")]
- [SugarColumn(ColumnName = "AQL_150_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql150000 { get; set; }
-
- /// <summary>
- /// AQL鎶芥牱鍩哄噯ID
- /// </summary>
- [Column("AQL1_ID")]
- [SugarColumn(ColumnName = "AQL1_ID")] //鐢ㄤ簬SqlSugar
- public decimal? Aql1Id { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩25
- /// </summary>
- [Column("AQL_2_500")]
- [SugarColumn(ColumnName = "AQL_2_500")] //鐢ㄤ簬SqlSugar
- public decimal? Aql2500 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩250
- /// </summary>
- [Column("AQL_25_000")]
- [SugarColumn(ColumnName = "AQL_25_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql25000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩2500
- /// </summary>
- [Column("AQL_250_000")]
- [SugarColumn(ColumnName = "AQL_250_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql250000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩40
- /// </summary>
- [Column("AQL_4_000")]
- [SugarColumn(ColumnName = "AQL_4_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql4000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩400
- /// </summary>
- [Column("AQL_40_000")]
- [SugarColumn(ColumnName = "AQL_40_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql40000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩4000
- /// </summary>
- [Column("AQL_400_000")]
- [SugarColumn(ColumnName = "AQL_400_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql400000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩65
- /// </summary>
- [Column("AQL_6_500")]
- [SugarColumn(ColumnName = "AQL_6_500")] //鐢ㄤ簬SqlSugar
- public decimal? Aql6500 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩650
- /// </summary>
- [Column("AQL_65_000")]
- [SugarColumn(ColumnName = "AQL_65_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql65000 { get; set; }
-
- /// <summary>
- /// 鎺ユ敹璐ㄩ噺姘村钩6500
- /// </summary>
- [Column("AQL_650_000")]
- [SugarColumn(ColumnName = "AQL_650_000")] //鐢ㄤ簬SqlSugar
- public decimal? Aql650000 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�32")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜哄鍚�
- /// </summary>
- [Column("CREATE_NAME")]
- [SugarColumn(ColumnName = "CREATE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鍒涘缓浜哄鍚嶉暱搴︿笉鑳借秴鍑�32")]
- public string CreateName { get; set; }
-
- /// <summary>
- /// 淇敼/鏂板鐘舵��
- /// </summary>
- [Column("EDIT_STATUS")]
- [SugarColumn(ColumnName = "EDIT_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? EditStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 鏍锋湰澶у皬
- /// </summary>
- [Column("FSAMPLE_SIZE_WORD")]
- [SugarColumn(ColumnName = "FSAMPLE_SIZE_WORD")] //鐢ㄤ簬SqlSugar
- public decimal? FsampleSizeWord { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鏈�鍚庢洿鏂颁汉闀垮害涓嶈兘瓒呭嚭32")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 鏇存柊浜哄鍚�
- /// </summary>
- [Column("LASTUPDATE_NAME")]
- [SugarColumn(ColumnName = "LASTUPDATE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鏇存柊浜哄鍚嶉暱搴︿笉鑳借秴鍑�32")]
- public string LastupdateName { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鏍锋湰澶у皬瀛楃爜
- /// </summary>
- [Column("SAMPLE_SIZE_WORD")]
- [SugarColumn(ColumnName = "SAMPLE_SIZE_WORD")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "鏍锋湰澶у皬瀛楃爜闀垮害涓嶈兘瓒呭嚭1")]
- public string SampleSizeWord { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQsImage.cs b/MES.Service/Modes/MesQsImage.cs
deleted file mode 100644
index 3f627b2..0000000
--- a/MES.Service/Modes/MesQsImage.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鍥剧墖淇℃伅
-/// </summary>
-[Table("MES_QS_IMAGE")]
-[SugarTable("MES_QS_IMAGE")] //鐢ㄤ簬SqlSugar
-public class MesQsImage
-{
- /// <summary>
- /// 涓婚敭
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_IMG",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟id
- /// </summary>
- [Column("FID")]
- [SugarColumn(ColumnName = "FID")] //鐢ㄤ簬SqlSugar
- public decimal? Fid { get; set; }
-
- /// <summary>
- /// 闄勪欢鍐呭
- /// </summary>
- [Column("IMAGE_DATA")]
- [SugarColumn(ColumnName = "IMAGE_DATA")] //鐢ㄤ簬SqlSugar
- [StringLength(4000, ErrorMessage = "ImageData闀垮害涓嶈兘瓒呭嚭4000")]
- public byte[]? ImageData { get; set; }
-
- /// <summary>
- /// 1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴
- /// </summary>
- [Column("QS_TYPE")]
- [SugarColumn(ColumnName = "QS_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴闀垮害涓嶈兘瓒呭嚭1")]
- public string? QsType { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍚嶇О
- /// </summary>
- [Column("PICTURENAME")]
- [SugarColumn(ColumnName = "PICTURENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "Picturename闀垮害涓嶈兘瓒呭嚭200")]
- public string? Picturename { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? base64Date { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQsSuspend.cs b/MES.Service/Modes/MesQsSuspend.cs
deleted file mode 100644
index 23ff075..0000000
--- a/MES.Service/Modes/MesQsSuspend.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// </summary>
-[Table("MES_QS_SUSPEND")]
-[SugarTable("MES_QS_SUSPEND")] //鐢ㄤ簬SqlSugar
-public class MesQsSuspend
-{
- /// <summary>
- /// SEQ_QS_IMG
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_IMG",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [Column("DEPT_NAME")]
- [SugarColumn(ColumnName = "DEPT_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string? DeptName { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [Column("DEPT_NO")]
- [SugarColumn(ColumnName = "DEPT_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "閮ㄩ棬缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string? DeptNo { get; set; }
-
- /// <summary>
- /// 鏄惁鍋滄満
- /// </summary>
- [Column("IS_SUSPEND")]
- [SugarColumn(ColumnName = "IS_SUSPEND")] //鐢ㄤ簬SqlSugar
- public decimal? IsSuspend { get; set; }
-
- /// <summary>
- /// 浜х嚎鍚嶇О
- /// </summary>
- [Column("LINE_NAME")]
- [SugarColumn(ColumnName = "LINE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜х嚎鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string? LineName { get; set; }
-
- /// <summary>
- /// 浜х嚎缂栧彿
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜х嚎缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string? LineNo { get; set; }
-
- /// <summary>
- /// 鏆傚仠鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("REMARKS")]
- [SugarColumn(ColumnName = "REMARKS")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭500")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 寮�鍚椂闂�
- /// </summary>
- [Column("OPEN_DATE")]
- [SugarColumn(ColumnName = "OPEN_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? OpenDate { get; set; }
-
- /// <summary>
- /// 鏃跺樊闂撮殧(鍒�)
- /// </summary>
- [Column("TIME_DIFFERENCE")]
- [SugarColumn(ColumnName = "TIME_DIFFERENCE")] //鐢ㄤ簬SqlSugar
- public decimal? TimeDifference { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQualityStandard.cs b/MES.Service/Modes/MesQualityStandard.cs
deleted file mode 100644
index bf414fa..0000000
--- a/MES.Service/Modes/MesQualityStandard.cs
+++ /dev/null
@@ -1,204 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 璐ㄩ噺鏍囧噯琛�
-/// </summary>
-[Table("MES_QUALITY_STANDARD")]
-[SugarTable("MES_QUALITY_STANDARD")] //鐢ㄤ簬SqlSugar
-public class MesQualityStandard
-{
- /// <summary>
- /// 搴忓垪SEQ_QS
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�20")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鎺ユ敹姘村钩
- /// </summary>
- [Column("FAC_LEVEL")]
- [SugarColumn(ColumnName = "FAC_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鎺ユ敹姘村钩闀垮害涓嶈兘瓒呭嚭100")]
- public string FacLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [Column("FCHECK_LEVEL")]
- [SugarColumn(ColumnName = "FCHECK_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾按骞抽暱搴︿笉鑳借秴鍑�100")]
- public string FcheckLevel { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- [Column("FSUBMIT")]
- [SugarColumn(ColumnName = "FSUBMIT")] //鐢ㄤ簬SqlSugar
- public decimal? Fsubmit { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("FSUBMIT_BY")]
- [SugarColumn(ColumnName = "FSUBMIT_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�50")]
- public string FsubmitBy { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃堕棿
- /// </summary>
- [Column("FSUBMIT_DATE")]
- [SugarColumn(ColumnName = "FSUBMIT_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FsubmitDate { get; set; }
-
- /// <summary>
- /// 妯℃暟
- /// </summary>
- [Column("INSPECTION_LEVEL")]
- [SugarColumn(ColumnName = "INSPECTION_LEVEL")] //鐢ㄤ簬SqlSugar
- public decimal? InspectionLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾柟娉�
- /// </summary>
- [Column("INSPECTION_METHOD")]
- [SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
- public string InspectionMethod { get; set; }
-
- /// <summary>
- /// 璐ㄩ噺瑕佹眰
- /// </summary>
- [Column("ITEM_MOD")]
- [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "璐ㄩ噺瑕佹眰闀垮害涓嶈兘瓒呭嚭500")]
- public string ItemMod { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐗╂枡缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string ItemNo { get; set; }
-
- /// <summary>
- /// 姣忔ā澶氬皯涓�
- /// </summary>
- [Column("LEVEL_NUM")]
- [SugarColumn(ColumnName = "LEVEL_NUM")] //鐢ㄤ簬SqlSugar
- public decimal? LevelNum { get; set; }
-
- /// <summary>
- /// 鏈�澶у��
- /// </summary>
- [Column("MAX_VALUE")]
- [SugarColumn(ColumnName = "MAX_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MaxValue { get; set; }
-
- /// <summary>
- /// 鏈�灏忓��
- /// </summary>
- [Column("MIN_VALUE")]
- [SugarColumn(ColumnName = "MIN_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MinValue { get; set; }
-
- /// <summary>
- /// 妯″叿鍙�
- /// </summary>
- [Column("MOID_NUM")]
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妯″叿鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string MoidNum { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("NOTES")]
- [SugarColumn(ColumnName = "NOTES")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭100")]
- public string Notes { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍦板潃
- /// </summary>
- [Column("PICTURE")]
- [SugarColumn(ColumnName = "PICTURE")] //鐢ㄤ簬SqlSugar
- public byte[]? Picture { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍚嶇О
- /// </summary>
- [Column("PICTURENAME")]
- [SugarColumn(ColumnName = "PICTURENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "Picturename闀垮害涓嶈兘瓒呭嚭32")]
- public string? Picturename { get; set; }
-
- /// <summary>
- /// 椤圭洰鍚嶇О
- /// </summary>
- [Column("PROJ_NAME")]
- [SugarColumn(ColumnName = "PROJ_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string ProjName { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗙紪鐮�
- /// </summary>
- [Column("QS_CODE")]
- [SugarColumn(ColumnName = "QS_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗙紪鐮侀暱搴︿笉鑳借秴鍑�100")]
- public string QsCode { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗗悕绉�
- /// </summary>
- [Column("QS_NAME")]
- [SugarColumn(ColumnName = "QS_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗗悕绉伴暱搴︿笉鑳借秴鍑�100")]
- public string QsName { get; set; }
-
- /// <summary>
- /// 1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴
- /// </summary>
- [Column("QS_TYPE")]
- [SugarColumn(ColumnName = "QS_TYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(1, ErrorMessage = "1涓洪妫�锛�2涓哄贰妫�锛�3涓哄叆搴撴闀垮害涓嶈兘瓒呭嚭1")]
- public string QsType { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [Column("STANDARD_VALUE")]
- [SugarColumn(ColumnName = "STANDARD_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? StandardValue { get; set; }
-
- /// <summary>
- /// 浣跨敤浠〃
- /// </summary>
- [Column("USING_INSTRUMENTS")]
- [SugarColumn(ColumnName = "USING_INSTRUMENTS")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浣跨敤浠〃闀垮害涓嶈兘瓒呭嚭50")]
- public string UsingInstruments { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
deleted file mode 100644
index 20615ec..0000000
--- a/MES.Service/Modes/MesRohIn.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閲囪喘璁㈠崟琛�
-/// </summary>
-[SugarTable("MES_ROH_IN")]
-public class MesRohIn
-{
- /// <summary>
- /// SEQ_BASEINFO_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_STATUS")]
- public string? DocumentStatus { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_TYPE")]
- public string? DocumentType { get; set; }
-
- /// <summary>
- /// 涓氬姟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_TYPE")]
- public string? BusinessType { get; set; }
-
- /// <summary>
- /// 閲囪喘鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_DATE")]
- public DateTime? PurchaseDate { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLIER")]
- public string? Supplier { get; set; }
-
- /// <summary>
- /// 鍏抽棴鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "CLOSE_STATUS")]
- public string? CloseStatus { get; set; }
-
- /// <summary>
- /// 閲囪喘缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_ORG")]
- public string? PurchaseOrg { get; set; }
-
- /// <summary>
- /// 閲囪喘閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_DEPT")]
- public string? PurchaseDept { get; set; }
-
- /// <summary>
- /// 閲囪喘缁�
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_GROUP")]
- public string? PurchaseGroup { get; set; }
-
- /// <summary>
- /// 鏁伴噺楠屾敹
- /// </summary>
- [SugarColumn(ColumnName = "QTY_ACCEPTANCE")]
- public string? QtyAcceptance { get; set; }
-
- /// <summary>
- /// 閲囪喘鍛�
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASER")]
- public string? Purchaser { get; set; }
-
-
- /// <summary>
- /// 缁撶畻鏂�
- /// </summary>
- [SugarColumn(ColumnName = "SETTLEMENT_PARTY")]
- public string? SettlementParty { get; set; }
-
- /// <summary>
- /// 鏀舵鏂�
- /// </summary>
- [SugarColumn(ColumnName = "PAYMENT_PARTY")]
- public string? PaymentParty { get; set; }
-
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
-
-
- /// <summary>
- /// 浣滃簾鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "CANCELLATION_STATUS")]
- public string? CancellationStatus { get; set; }
-
- /// <summary>
- /// 浣滃簾浜�
- /// </summary>
- [SugarColumn(ColumnName = "CANCELLATION_PERSON")]
- public string? CancellationPerson { get; set; }
-
- /// <summary>
- /// 浣滃簾鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CANCELLATION_DATE")]
- public DateTime? CancellationDate { 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_DATE")]
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- /// ERP瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "ERP_CHECK_BY")]
- public string? ErpCheckBy { get; set; }
-
- /// <summary>
- /// ERP瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "ERP_CHECK_DATE")]
- public string? ErpCheckDate { get; set; }
-
- /// <summary>
- /// ERP鐨処D鍙�
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// 鍙樻洿鍘熷洜
- /// </summary>
- [SugarColumn(ColumnName = "changereason")]
- public string? Changereason { get; set; }
-
- /// <summary>
- /// 鍒拌揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "FPREARRIVALDATE")]
- public DateTime? FPREARRIVALDATE { get; set; }
-
- /// <summary>
- /// 鏀舵枡缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "FRECEIVEORGID")]
- public string? FRECEIVEORGID { get; set; }
-
- /// <summary>
- /// 鎵撳嵃娆℃暟
- /// </summary>
- [SugarColumn(ColumnName = "remark1")]
- public string? remark1 { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
deleted file mode 100644
index 61ae226..0000000
--- a/MES.Service/Modes/MesRohInData.cs
+++ /dev/null
@@ -1,361 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閲囪喘璁㈠崟鏄庣粏琛�
-/// </summary>
-[SugarTable("MES_ROH_IN_DATA")]
-public class MesRohInData
-{
- /// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER_ID")]
- public string? SalesOrderId { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_LINE_ID")]
- public string? OrderLineId { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public string? ItemId { get; set; }
-
-
- /// <summary>
- /// 閲囪喘鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_UNIT")]
- public string? PurchaseUnit { get; set; }
-
- /// <summary>
- /// 閲囪喘鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASE_QTY")]
- public decimal? PurchaseQty { get; set; }
-
- /// <summary>
- /// 搴撳瓨鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "INVENTORY_UNIT")]
- public string? InventoryUnit { get; set; }
-
-
- /// <summary>
- /// 浜よ揣鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_DATE")]
- public DateTime? DeliveryDate { get; set; }
-
- /// <summary>
- /// 鏈�鏃╀氦璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "EARLIEST_DELIVERY_DATE")]
- public DateTime? EarliestDeliveryDate { get; set; }
-
- /// <summary>
- /// 鏈�鏅氫氦璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "LATEST_DELIVERY_DATE")]
- public DateTime? LatestDeliveryDate { get; set; }
-
- /// <summary>
- /// 闇�姹傜粍缁�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_ORG")]
- public string? DemandOrg { get; set; }
-
- /// <summary>
- /// 鏀舵枡缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING_ORG")]
- public string? ReceivingOrg { get; set; }
-
- /// <summary>
- /// 缁撶畻缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "SETTLEMENT_ORG")]
- public string? SettlementOrg { get; set; }
-
- /// <summary>
- /// 鏄惁璧犲搧
- /// </summary>
- [SugarColumn(ColumnName = "IS_GIFT")]
- public string? IsGift { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙墿鏂欑紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")]
- public string? SupplierItemCode { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙墿鏂欏悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")]
- public string? SupplierItemName { get; set; }
-
- /// <summary>
- /// 濮斿璁㈠崟缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")]
- public string? OutsourcingOrderId { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "BATCH_NUMBER")]
- public string? BatchNumber { get; set; }
-
- /// <summary>
- /// 涓氬姟鍏抽棴 A:姝ｅ父锛孊:涓氬姟缁堟
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_CLOSE")]
- public string? BusinessClose { get; set; }
-
- /// <summary>
- /// 涓氬姟鍐荤粨 A:姝ｅ父锛孊:涓氬姟缁堟
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_FREEZE")]
- public string? BusinessFreeze { get; set; }
-
- /// <summary>
- /// 鍐荤粨浜�
- /// </summary>
- [SugarColumn(ColumnName = "FREEZER")]
- public string? Freezer { get; set; }
-
- /// <summary>
- /// 鍐荤粨鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "FREEZE_TIME")]
- public DateTime? FreezeTime { get; set; }
-
- /// <summary>
- /// 涓氬姟缁堟
- /// </summary>
- [SugarColumn(ColumnName = "BUSINESS_TERMINATE")]
- public string? BusinessTerminate { get; set; }
-
- /// <summary>
- /// 缁堟浜�
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATOR")]
- public string? Terminator { get; set; }
-
- /// <summary>
- /// 缁堟鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "TERMINATE_TIME")]
- public DateTime? TerminateTime { get; set; }
-
- /// <summary>
- /// 绱鏀舵枡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")]
- public decimal? TotalReceivedQty { get; set; }
-
- /// <summary>
- /// 鍓╀綑鏀舵枡鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")]
- public decimal? RemainingReceivedQty { get; set; }
-
- /// <summary>
- /// 绱鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_STORED_QTY")]
- public decimal? TotalStoredQty { get; set; }
-
- /// <summary>
- /// 鍓╀綑鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "REMAINING_STORED_QTY")]
- public decimal? RemainingStoredQty { get; set; }
-
- /// <summary>
- /// 绱閫�鏂欐暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")]
- public decimal? TotalReturnedQty { get; set; }
-
- /// <summary>
- /// 鏀舵枡鍙��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")]
- public decimal? ReturnableReceivedQty { get; set; }
-
- /// <summary>
- /// 搴撳瓨鍙��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")]
- public decimal? ReturnableStoredQty { get; set; }
-
- /// <summary>
- /// 婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")]
- public string? SourceDocumentType { get; set; }
-
- /// <summary>
- /// 婧愬崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")]
- public string? SourceDocumentId { get; set; }
-
- /// <summary>
- /// 闇�姹傝窡韪彿
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_TRACKING_ID")]
- public string? DemandTrackingId { get; set; }
-
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_TRACKING_ID")]
- public string? PlanTrackingId { get; set; }
-
- /// <summary>
- /// 鍙樻洿鏍囧織
- /// </summary>
- [SugarColumn(ColumnName = "CHANGE_FLAG")]
- public string? ChangeFlag { get; set; }
-
- /// <summary>
- /// 闇�姹傛潵婧�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_SOURCE")]
- public string? DemandSource { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")]
- public string? DemandDocumentId { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")]
- public string? DemandDocumentLineId { get; set; }
-
- /// <summary>
- /// ERP鐨処D鍙�
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// SEQ_BASEINFO_ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public decimal? ErpId { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "purchase_order_line_number")]
- public string? PurchaseOrderLineNumber { get; set; }
-
- /// <summary>
- /// 闇�姹傜粍缁�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND")]
- public string? Demand { get; set; }
-
- /// <summary>
- /// 鏀舵枡缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING")]
- public string? Receiving { get; set; }
-
- /// <summary>
- /// 缁撶畻缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "SETTLEMENT")]
- public string? Settlement { get; set; }
-
- /// <summary>
- /// 闇�姹傞儴闂�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
- public string? DemandDepartment { get; set; }
-
- /// <summary>
- /// 鏀舵枡閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
- public string? ReceivingDepartment { get; set; }
-
- /// <summary>
- /// 棰勮鍒拌揣鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "FPREARRIVALDATE")]
- public DateTime? FPREARRIVALDATE { get; set; }
-
- /// <summary>
- /// 瀹㈡埛璐у彿
- /// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
-
- /// <summary>
- /// 鍖呰鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
-
- /// <summary>
- /// 涓讳骇鍝�
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
-
- /// <summary>
- /// SMT澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")]
- public string? FdemandbillnoLine { get; set; }
-
- /// <summary>
- /// 鐢垫皵鎴愬搧鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_MODEL")]
- public string? ElectricalProductModel { get; set; }
-
- /// <summary>
- /// 鐢垫皵鎴愬搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_NAME")]
- public string? ElectricalProductName { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesSchemeResult.cs b/MES.Service/Modes/MesSchemeResult.cs
deleted file mode 100644
index 78a7967..0000000
--- a/MES.Service/Modes/MesSchemeResult.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鎺掍骇缁撴灉琛�
-/// </summary>
-[Table("MES_SCHEME_RESULT")]
-[SugarTable("MES_SCHEME_RESULT")] //鐢ㄤ簬SqlSugar
-public class MesSchemeResult
-{
- /// <summary>
- /// 鍙帓鏁伴噺
- /// </summary>
- [Column("ALLOW_QTY")]
- [SugarColumn(ColumnName = "ALLOW_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? AllowQty { get; set; }
-
- /// <summary>
- /// 璁″垝缂栧彿
- /// </summary>
- [Column("BILL_NO")]
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "璁″垝缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string BillNo { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [Column("BOARD_ITEM")]
- [SugarColumn(ColumnName = "BOARD_ITEM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜у搧缂栫爜闀垮害涓嶈兘瓒呭嚭50")]
- public string BoardItem { get; set; }
-
- /// <summary>
- /// 鏉块潰
- /// </summary>
- [Column("BOARD_SIDE")]
- [SugarColumn(ColumnName = "BOARD_SIDE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鏉块潰闀垮害涓嶈兘瓒呭嚭20")]
- public string BoardSide { get; set; }
-
- /// <summary>
- /// 鏍囧噯浜ц兘
- /// </summary>
- [Column("CAT_QTY")]
- [SugarColumn(ColumnName = "CAT_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? CatQty { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CHECK_BY")]
- [SugarColumn(ColumnName = "CHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "CheckBy闀垮害涓嶈兘瓒呭嚭20")]
- public string CheckBy { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CHECK_DATE")]
- [SugarColumn(ColumnName = "CHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// SMT榻愬鏍囧織(鏈鏌�,涓嶉綈濂�,榻愬,鎺ュ彛琛ㄦ棤鏁版嵁)
- /// </summary>
- [Column("CHECK_FLAG")]
- [SugarColumn(ColumnName = "CHECK_FLAG")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "SMT榻愬鏍囧織(鏈鏌�,涓嶉綈濂�,榻愬,鎺ュ彛琛ㄦ棤鏁版嵁)闀垮害涓嶈兘瓒呭嚭20")]
- public string CheckFlag { get; set; }
-
- /// <summary>
- /// 鐝鍙�
- /// </summary>
- [Column("CLASS_NO")]
- [SugarColumn(ColumnName = "CLASS_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鐝鍙烽暱搴︿笉鑳借秴鍑�20")]
- public string ClassNo { get; set; }
-
- /// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍏徃浠ｇ爜闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 娲惧伐鐗╂枡澶囨敞
- /// </summary>
- [Column("DETAIL_MEM")]
- [SugarColumn(ColumnName = "DETAIL_MEM")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "娲惧伐鐗╂枡澶囨敞闀垮害涓嶈兘瓒呭嚭500")]
- public string DetailMem { get; set; }
-
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鍒嗗巶缂栫爜闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// SEQ_MES_SCHEME_RESULT
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true,
- OracleSequenceName = "SEQ_MES_SCHEME_RESULT",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍙戝竷浜�
- /// </summary>
- [Column("ISSUED_BY")]
- [SugarColumn(ColumnName = "ISSUED_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍙戝竷浜洪暱搴︿笉鑳借秴鍑�50")]
- public string IssuedBy { get; set; }
-
- /// <summary>
- /// 鍙戝竷鏃堕棿
- /// </summary>
- [Column("ISSUED_DATE")]
- [SugarColumn(ColumnName = "ISSUED_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? IssuedDate { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 绾夸綋鍙�
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "绾夸綋鍙烽暱搴︿笉鑳借秴鍑�20")]
- public string LineNo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(255, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭255")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
- [Column("MOCODE")]
- [SugarColumn(ColumnName = "MOCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐢熶骇宸ュ崟闀垮害涓嶈兘瓒呭嚭50")]
- public string Mocode { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MOCODE_LINE")]
- [SugarColumn(ColumnName = "MOCODE_LINE")] //鐢ㄤ簬SqlSugar
- [StringLength(5, ErrorMessage = "MocodeLine闀垮害涓嶈兘瓒呭嚭5")]
- public string MocodeLine { get; set; }
-
- /// <summary>
- /// 鍔犲伐椤哄簭鍙�
- /// </summary>
- [Column("ORDER_NO")]
- [SugarColumn(ColumnName = "ORDER_NO")] //鐢ㄤ簬SqlSugar
- public decimal? OrderNo { get; set; }
-
- /// <summary>
- /// 杞ㄩ亾
- /// </summary>
- [Column("PATHWAY")]
- [SugarColumn(ColumnName = "PATHWAY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞ㄩ亾闀垮害涓嶈兘瓒呭嚭20")]
- public string Pathway { get; set; }
-
- /// <summary>
- /// 璁″垝寮�濮嬫椂闂�
- /// </summary>
- [Column("PLAN_BEGIN_TIME")]
- [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanBeginTime { get; set; }
-
- /// <summary>
- /// 璁″垝缁撴潫鏃堕棿
- /// </summary>
- [Column("PLAN_FINISH_TIME")]
- [SugarColumn(ColumnName = "PLAN_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PlanFinishTime { get; set; }
-
- /// <summary>
- /// 璁″垝杞嚎鏃堕棿(鍒嗛挓)
- /// </summary>
- [Column("PLAN_TURN_TIME")]
- [SugarColumn(ColumnName = "PLAN_TURN_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? PlanTurnTime { get; set; }
-
- /// <summary>
- /// 杞骇鏍囪瘑
- /// </summary>
- [Column("PMOVE_MK")]
- [SugarColumn(ColumnName = "PMOVE_MK")] //鐢ㄤ簬SqlSugar
- public decimal? PmoveMk { get; set; }
-
- /// <summary>
- /// 鍙帓浜ф暟閲�
- /// </summary>
- [Column("PROCESS_QTY")]
- [SugarColumn(ColumnName = "PROCESS_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? ProcessQty { get; set; }
-
- /// <summary>
- /// 宸ュ簭鍙�
- /// </summary>
- [Column("PROC_NO")]
- [SugarColumn(ColumnName = "PROC_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ュ簭鍙烽暱搴︿笉鑳借秴鍑�20")]
- public string ProcNo { get; set; }
-
- /// <summary>
- /// 宸ュ簭椤哄簭鍙�
- /// </summary>
- [Column("PROC_ORDER")]
- [SugarColumn(ColumnName = "PROC_ORDER")] //鐢ㄤ簬SqlSugar
- public decimal? ProcOrder { get; set; }
-
- /// <summary>
- /// 鐢熶骇鐘舵��
- /// </summary>
- [Column("PROC_STATUS")]
- [SugarColumn(ColumnName = "PROC_STATUS")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "鐢熶骇鐘舵�侀暱搴︿笉鑳借秴鍑�10")]
- public string ProcStatus { get; set; }
-
- /// <summary>
- /// 瀹為檯寮�宸ユ椂闂�
- /// </summary>
- [Column("REAL_BEGIN_TIME")]
- [SugarColumn(ColumnName = "REAL_BEGIN_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealBeginTime { get; set; }
-
- /// <summary>
- /// 瀹為檯瀹屽伐鏃堕棿
- /// </summary>
- [Column("REAL_FINISH_TIME")]
- [SugarColumn(ColumnName = "REAL_FINISH_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? RealFinishTime { get; set; }
-
- /// <summary>
- /// 瀹為檯杞嚎鏃堕棿(鍒嗛挓)
- /// </summary>
- [Column("REAL_TURN_TIME")]
- [SugarColumn(ColumnName = "REAL_TURN_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? RealTurnTime { get; set; }
-
- /// <summary>
- /// 瀹屽伐鍘熷洜
- /// </summary>
- [Column("REM")]
- [SugarColumn(ColumnName = "REM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "瀹屽伐鍘熷洜闀垮害涓嶈兘瓒呭嚭20")]
- public string Rem { get; set; }
-
- /// <summary>
- /// 鎺掍骇鏁伴噺
- /// </summary>
- [Column("SCHEME_QTY")]
- [SugarColumn(ColumnName = "SCHEME_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? SchemeQty { get; set; }
-
- /// <summary>
- /// 鐘舵��(0-鎺掍骇,10-鍙戝竷)
- /// </summary>
- [Column("STATUS")]
- [SugarColumn(ColumnName = "STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? Status { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟鍙�
- /// </summary>
- [Column("TASK_NO")]
- [SugarColumn(ColumnName = "TASK_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鐢熶骇璁㈠崟鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 鏄惁闃撮槼鏉�
- /// </summary>
- [Column("TB_FLAG")]
- [SugarColumn(ColumnName = "TB_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? TbFlag { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("WSCHEME_QTY")]
- [SugarColumn(ColumnName = "WSCHEME_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? WschemeQty { get; set; }
-
- /// <summary>
- /// 鍘熸帓璁″垝
- /// </summary>
- [Column("YBILL_NO")]
- [SugarColumn(ColumnName = "YBILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍘熸帓璁″垝闀垮害涓嶈兘瓒呭嚭50")]
- public string YbillNo { get; set; }
-
- /// <summary>
- /// 鍘熸帓浜х嚎
- /// </summary>
- [Column("YLINE_NO")]
- [SugarColumn(ColumnName = "YLINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍘熸帓浜х嚎闀垮害涓嶈兘瓒呭嚭50")]
- public string YlineNo { get; set; }
-
- /// <summary>
- /// 鍘熻鍒掓暟
- /// </summary>
- [Column("YSCHEME_QTY")]
- [SugarColumn(ColumnName = "YSCHEME_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? YschemeQty { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardModel { get; set; }
-
- [SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardStyle { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
deleted file mode 100644
index 4de05cc..0000000
--- a/MES.Service/Modes/MesStaff.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鍛樺伐淇℃伅琛�
-/// </summary>
-[SugarTable("MES_STAFF")]
-public class MesStaff
-{
- /// <summary>
- /// ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍛樺伐缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "STAFF_NO")]
- public string StaffNo { get; set; }
-
- /// <summary>
- /// 鍛樺伐濮撳悕
- /// </summary>
- [SugarColumn(ColumnName = "STAFF_NAME")]
- public string StaffName { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_NO")]
- public string DepartmentNo { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_NAME")]
- public string DepartmentName { get; set; }
-
- /// <summary>
- /// 宀椾綅缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_CODE")]
- public string PositionCode { get; set; }
-
- /// <summary>
- /// 宀椾綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "POSITION_NAME")]
- public string PositionName { get; set; }
-
- /// <summary>
- /// 鎵嬫満鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PHONE_NUMBER")]
- public string PhoneNumber { get; set; }
-
- /// <summary>
- /// 浠诲矖寮�濮嬫棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "START_DATE")]
- public DateTime? StartDate { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�1
- /// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string Remark1 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�2
- /// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string Remark2 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string Remark3 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string Remark4 { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string Remark5 { 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 = "MEMO")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鐢熶骇绾�
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
- public string LineNo { get; set; }
-
- /// <summary>
- /// 鐢熶骇鍛樺伐鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "WORK_MK")]
- public decimal? WorkMk { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [SugarColumn(ColumnName = "FFORBID_STATUS")]
- public string FforbidStatus { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesSupplier.cs b/MES.Service/Modes/MesSupplier.cs
deleted file mode 100644
index 044b776..0000000
--- a/MES.Service/Modes/MesSupplier.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 渚涘簲鍟嗕俊鎭�
-/// </summary>
-[SugarTable("MES_SUPPLIER")]
-public class MesSupplier
-{
- /// <summary>
- /// ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string? SuppNo { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NAME")]
- public string? SuppName { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗙畝绉�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_SNAME")]
- public string? SuppSname { get; set; }
-
-
- /// <summary>
- /// 鐢佃瘽
- /// </summary>
- [SugarColumn(ColumnName = "TELF1")]
- public string? Telf1 { 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 = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
-
- /// <summary>
- /// 鑱旂郴浜�
- /// </summary>
- [SugarColumn(ColumnName = "LXR")]
- public string? Lxr { get; set; }
-
- /// <summary>
- /// 璐熻矗浜�
- /// </summary>
- [SugarColumn(ColumnName = "FSTAFFID")]
- public string? Fstaffid { get; set; }
-
- /// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string? Fforbidstatus { get; set; }
-
- /// <summary>
- /// 鑷畾涔夊瓧娈�1
- /// </summary>
- [SugarColumn(ColumnName = "TYPE")]
- public string? type { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARK")]
- public string? Remarks { get; set; }
-
- /// <summary>
- /// 浣跨敤缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍒涘缓缁勭粐
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesUnit.cs b/MES.Service/Modes/MesUnit.cs
deleted file mode 100644
index 8169661..0000000
--- a/MES.Service/Modes/MesUnit.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閫氱敤鍗曚綅杞崲琛�
-/// </summary>
-[SugarTable("MES_UNIT")]
-public class MesUnit
-{
- /// <summary>
- /// BASEINFO
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍘熷崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "OLDUNIT")]
- public string? Oldunit { get; set; }
-
- /// <summary>
- /// 鐩殑鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "NEWUNIT")]
- public string? Newunit { get; set; }
-
- /// <summary>
- /// 鍘熷崟浣嶆暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "OLDQTY")]
- public decimal? Oldqty { get; set; }
-
- /// <summary>
- /// 鐩殑鍗曚綅鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "NEWQTY")]
- public decimal? Newqty { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
- /// <summary>
- /// 缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "FNUMBER")]
- public string? Fnumber { get; set; }
-
- /// <summary>
- /// 鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "FNAME")]
- public string? Fname { get; set; }
-
- /// <summary>
- /// 鎵�灞炵粍鍒�
- /// </summary>
- [SugarColumn(ColumnName = "FUNITGROUPID")]
- public string? Funitgroupid { get; set; }
-
- /// <summary>
- /// 鎹㈢畻鍒嗘瘝
- /// </summary>
- [SugarColumn(ColumnName = "FCONVERTDENOMINATOR")]
- public double? Fconvertdenominator { get; set; }
-
- /// <summary>
- /// 褰撳墠鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FCURRENTUNITID")]
- public string? Fcurrentunitid { get; set; }
-
- /// <summary>
- /// 鎹㈢畻鍒嗗瓙
- /// </summary>
- [SugarColumn(ColumnName = "FCONVERTNUMERATOR")]
- public double? Fconvertnumerator { get; set; }
-
- /// <summary>
- /// 鍩哄噯鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FBASEUNIT")]
- public string? Fbaseunit { get; set; }
-
- /// <summary>
- /// 鑸嶅叆绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "FROUNDTYPE")]
- public string? Froundtype { get; set; }
-
- /// <summary>
- /// 绮惧害
- /// </summary>
- [SugarColumn(ColumnName = "FPRECISION")]
- public decimal? Fprecision { get; set; }
-
- /// <summary>
- /// 鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "FDESCRIPTION")]
- public string? Fdescription { get; set; }
-
- /// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string? Fforbidstatus { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/MessageCenter.cs b/MES.Service/Modes/MessageCenter.cs
deleted file mode 100644
index 637de92..0000000
--- a/MES.Service/Modes/MessageCenter.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// </summary>
-[SugarTable("MESSAGE_CENTER")]
-public class MessageCenter
-{
- /// <summary>
- /// 瀵瑰簲搴忓垪SEQ_MSG
- /// </summary>
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_MSG",
- ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 琛ㄥ悕/瑙嗗浘鍚�
- /// </summary>
- [SugarColumn(ColumnName = "TABLE_NAME")]
- public string? TableName { get; set; }
-
- /// <summary>
- /// 璇锋眰鍦板潃
- /// </summary>
- [SugarColumn(ColumnName = "URL")]
- public string? Url { get; set; }
-
- /// <summary>
- /// 璇锋眰鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "METHOD")]
- public string? Method { get; set; }
-
- /// <summary>
- /// 璇锋眰鍐呭
- /// </summary>
- [SugarColumn(ColumnName = "DATA")]
- public string? Data { get; set; }
-
- /// <summary>
- /// 鏄惁鎴愬姛 0琛ㄧず澶辫触 1 琛ㄧず鎴愬姛
- /// </summary>
- [SugarColumn(ColumnName = "RESULT")]
- public short? Result { get; set; }
-
- /// <summary>
- /// 杩斿洖鐨凧SON
- /// </summary>
- [SugarColumn(ColumnName = "RESULT_DATA")]
- public string? ResultData { get; set; }
-
- /// <summary>
- /// 鐘舵�� 0琛ㄧず鏈帹閫� 1 琛ㄧず宸叉帹閫�
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
- public short? Status { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string? CreateDate { get; set; }
-
- /// <summary>
- /// 涓氬姟鏍囬
- /// </summary>
- [SugarColumn(ColumnName = "TITLE")]
- public string? Title { get; set; }
-
- /// <summary>
- /// 椤甸潰鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PAGE_NAME")]
- public string? PageName { get; set; }
-
- /// <summary>
- /// 鏄惁澶勭悊锛�0琛ㄧず鏈鐞� 1琛ㄧず宸插鐞�
- /// </summary>
- [SugarColumn(ColumnName = "DEAL_WITH")]
- public short? DealWith { get; set; }
-
- /// <summary>
- /// 鎵规
- /// </summary>
- [SugarColumn(ColumnName = "PID")]
- public int? Pid { get; set; }
-
-
- /// <summary>
- /// 鎵ц椤哄簭
- /// </summary>
- [SugarColumn(ColumnName = "SEQ")]
- public short? Seq { get; set; }
-
- /// <summary>
- /// 椤甸潰璺緞
- /// </summary>
- [SugarColumn(ColumnName = "ROUTE")]
- public string? Route { get; set; }
-
- /// <summary>
- /// 鍙傛暟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "Content_Type")]
- public string? ContentType { get; set; }
-
- //
- /// <summary>
- /// 鏄惁鏄秷鎭� 0涓烘帹閫佸け璐� 1涓烘秷鎭�,榛樿涓�0
- /// </summary>
- [SugarColumn(ColumnName = "is_message")]
- public short? IsMessage { get; set; }
-
-
- [SugarColumn(IsIgnore = true)] public int? isShow { get; set; }
-
- [SugarColumn(IsIgnore = true)] public decimal? Count { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Organize.cs b/MES.Service/Modes/Organize.cs
deleted file mode 100644
index 0188209..0000000
--- a/MES.Service/Modes/Organize.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 缁勭粐
-///</summary>
-[SugarTable("ORGANIZE")]
-public class Organize
-{
- /// <summary>
- /// 缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "FNUMBER")]
- public string Fnumber { get; set; }
-
- /// <summary>
- /// 鍚嶇О
- ///</summary>
- [SugarColumn(ColumnName = "FNAME")]
- public string Fname { get; set; }
-
- /// <summary>
- ///
- ///</summary>
- // [SugarColumn(ColumnName="ID" )]
- [SugarColumn(IsPrimaryKey = true)]
- public string Id { get; set; }
-
- /// <summary>
- /// 绂佺敤鐘舵�� A 鍚敤 B绂佺敤
- ///</summary>
- [SugarColumn(ColumnName = "Fforbidstatus")]
- public string Fforbidstatus { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- ///</summary>
- [SugarColumn(ColumnName = "TYPE")]
- public string Type { get; set; }
-
- /// <summary>
- /// 缁勭粐鎻忚堪
- ///</summary>
- [SugarColumn(ColumnName = "FDESCRIPTION")]
- public string FDescription { get; set; }
-
- /// <summary>
- /// 涓婄骇缁勭粐
- ///</summary>
- [SugarColumn(ColumnName = "FPARENTID")]
- public string? FParentID { get; set; }
-
- /// <summary>
- /// 寤虹珛鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName = "FCREATEDATE")]
- public DateTime? FCreateDate { get; set; }
-
- /// <summary>
- /// 绂佺敤浜�
- ///</summary>
- [SugarColumn(ColumnName = "FFORBIDORID")]
- public string? FFORBIDORID { get; set; }
-
- /// <summary>
- /// 绂佺敤鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName = "FFORBIDDATE")]
- public DateTime? FFORBIDDATE { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdhb.cs b/MES.Service/Modes/Purdhb.cs
deleted file mode 100644
index 5af5bf3..0000000
--- a/MES.Service/Modes/Purdhb.cs
+++ /dev/null
@@ -1,274 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閲囪喘鍒拌揣鍗曡〃韬�
-/// </summary>
-[SugarTable("PURDHB")]
-public class Purdhb
-{
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB001")]
- public string Dhb001 { get; set; }
-
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB002")]
- public string Dhb002 { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB003")]
- public string Dhb003 { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DHB004")]
- public string Dhb004 { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "DHB005")]
- public string Dhb005 { get; set; }
-
- /// <summary>
- /// 浜よ揣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB006")]
- public decimal? Dhb006 { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "DHB007")]
- public string Dhb007 { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DHB008")]
- public string Dhb008 { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DHB009")]
- public string Dhb009 { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB010")]
- public string Dhb010 { get; set; }
-
- /// <summary>
- /// 鏉ユ簮鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB011")]
- public string Dhb011 { get; set; }
-
- /// <summary>
- /// 鏉ユ簮搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB012")]
- public decimal? Dhb012 { get; set; }
-
- /// <summary>
- /// 娓呯偣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB013")]
- public decimal? Dhb013 { get; set; }
-
- /// <summary>
- /// 鍒板巶鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DHB014")]
- public string Dhb014 { get; set; }
-
- /// <summary>
- /// 楠屾敹鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB015")]
- public decimal? Dhb015 { get; set; }
-
- /// <summary>
- /// 楠岄��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB016")]
- public decimal? Dhb016 { get; set; }
-
- /// <summary>
- /// 杩涜揣鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "DHB017")]
- public decimal? Dhb017 { get; set; }
-
- /// <summary>
- /// 杩涜揣閲戦
- /// </summary>
- [SugarColumn(ColumnName = "DHB018")]
- public decimal? Dhb018 { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鏂欏彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB019")]
- public string Dhb019 { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB020")]
- public string Dhb020 { get; set; }
-
- /// <summary>
- /// 璧犲搧鏁�
- /// </summary>
- [SugarColumn(ColumnName = "DHB021")]
- public decimal? Dhb021 { get; set; }
-
- /// <summary>
- /// 鏇存柊ERP
- /// </summary>
- [SugarColumn(ColumnName = "DHB022")]
- public string Dhb022 { get; set; }
-
- /// <summary>
- /// 妫�楠岀姸鎬�
- /// </summary>
- [SugarColumn(ColumnName = "DHB023")]
- public string Dhb023 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "DHB024")]
- public string Dhb024 { get; set; }
-
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "AUDITING")]
- public decimal? Auditing { get; set; }
-
- /// <summary>
- /// ERP閲囪喘鍗曞彿ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB026")]
- public decimal? Dhb026 { get; set; }
-
- /// <summary>
- /// ERP閲囪喘搴忓彿ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB027")]
- public decimal? Dhb027 { get; set; }
-
- /// <summary>
- /// ERP鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "DHB028")]
- public decimal? Dhb028 { get; set; }
-
- /// <summary>
- /// 寰呮鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB029")]
- public decimal? Dhb029 { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DHB030")]
- public string Dhb030 { get; set; }
-
- /// <summary>
- /// 妫�楠屽憳
- /// </summary>
- [SugarColumn(ColumnName = "DHB031")]
- public string Dhb031 { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DHB032")]
- public decimal? Dhb032 { get; set; }
-
- /// <summary>
- /// 鍏ュ簱浜�
- /// </summary>
- [SugarColumn(ColumnName = "DHB033")]
- public string Dhb033 { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DHB034")]
- public string Dhb034 { get; set; }
-
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "DHB035")]
- public decimal? Dhb035 { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "DHB037")]
- public decimal? Dhb037 { get; set; }
-
- /// <summary>
- /// 閫�璐т汉
- /// </summary>
- [SugarColumn(ColumnName = "DHB036")]
- public string Dhb036 { get; set; }
-
- /// <summary>
- /// ERP鍘熷垎褰曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DHB038")]
- public decimal? Dhb038 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟鍐呯爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB039")]
- public decimal? Dhb039 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "DHB040")]
- public decimal? Dhb040 { get; set; }
-
- /// <summary>
- /// ERP璁㈠崟鍐呯爜
- /// </summary>
- [SugarColumn(ColumnName = "DHB041")]
- public decimal? Dhb041 { get; set; }
-
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鏄惁妫�楠岋紝1涓哄凡妫�
- /// </summary>
- [SugarColumn(ColumnName = "ISCHECK")]
- public decimal? Ischeck { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DHB042")]
- public string Dhb042 { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdka.cs b/MES.Service/Modes/Purdka.cs
deleted file mode 100644
index 9ffb101..0000000
--- a/MES.Service/Modes/Purdka.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閫�鏂欏崟澶�
-/// </summary>
-[SugarTable("PURDKA")]
-public class Purdka
-{
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜哄憳
- /// </summary>
- [SugarColumn(ColumnName = "CREATEUSER")]
- public string Createuser { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATETIME")]
- public string Createtime { get; set; }
-
- /// <summary>
- /// 淇敼鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "MODIFYTIME")]
- public string Modifytime { get; set; }
-
- /// <summary>
- /// 淇敼浜哄憳
- /// </summary>
- [SugarColumn(ColumnName = "MODIFYUSER")]
- public string Modifyuser { get; set; }
-
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "AUDITING")]
- public string Auditing { get; set; }
-
- /// <summary>
- /// 閫�璐у崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DKA001")]
- public string Dka001 { get; set; }
-
- /// <summary>
- /// 閫�璐х被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "DKA002")]
- public string Dka002 { get; set; }
-
- /// <summary>
- /// 閫�璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "DKA003")]
- public string Dka003 { get; set; }
-
- /// <summary>
- /// 閫�璐ф椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "DKA004")]
- public string Dka004 { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "DKA005")]
- public string Dka005 { get; set; }
-
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "DKA006")]
- public string Dka006 { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "DKA007")]
- public string Dka007 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鑰�
- /// </summary>
- [SugarColumn(ColumnName = "DKA008")]
- public string Dka008 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DKA009")]
- public string Dka009 { get; set; }
-
- /// <summary>
- /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹�
- /// </summary>
- [SugarColumn(ColumnName = "DKA010")]
- public string Dka010 { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
- public decimal? Erpid { get; set; }
-
- /// <summary>
- /// 淇濈鍛樼紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "DKA011")]
- public string Dka011 { get; set; }
-
- /// <summary>
- /// 楠屾敹鍛樼紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "DKA012")]
- public string Dka012 { get; set; }
-
- /// <summary>
- /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫�
- /// </summary>
- [SugarColumn(ColumnName = "DKA013")]
- public decimal? Dka013 { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdkb.cs b/MES.Service/Modes/Purdkb.cs
deleted file mode 100644
index 6a0cb38..0000000
--- a/MES.Service/Modes/Purdkb.cs
+++ /dev/null
@@ -1,142 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閫�鏂欏崟瀛愯〃
-/// </summary>
-[SugarTable("PURDKB")]
-public class Purdkb
-{
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 瀹℃牳
- /// </summary>
- [SugarColumn(ColumnName = "AUDITING")]
- public string Auditing { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATETIME")]
- public string Createtime { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜哄憳
- /// </summary>
- [SugarColumn(ColumnName = "CREATEUSER")]
- public string Createuser { get; set; }
-
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DKB001")]
- public string Dkb001 { get; set; }
-
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DKB002")]
- public string Dkb002 { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DKB003")]
- public string Dkb003 { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DKB004")]
- public string Dkb004 { get; set; }
-
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "DKB005")]
- public string Dkb005 { get; set; }
-
- /// <summary>
- /// 搴旈��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DKB006")]
- public decimal? Dkb006 { get; set; }
-
- /// <summary>
- /// 瀹為��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DKB007")]
- public decimal? Dkb007 { get; set; }
-
- /// <summary>
- /// 寰呴��鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DKB008")]
- public decimal? Dkb008 { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "DKB009")]
- public string Dkb009 { get; set; }
-
- /// <summary>
- /// 鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "DKB010")]
- public decimal? Dkb010 { get; set; }
-
- /// <summary>
- /// 閲戦
- /// </summary>
- [SugarColumn(ColumnName = "DKB011")]
- public decimal? Dkb011 { get; set; }
-
- /// <summary>
- /// 鏉ユ簮鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DKB012")]
- public string Dkb012 { get; set; }
-
- /// <summary>
- /// 鏉ユ簮搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DKB013")]
- public string Dkb013 { get; set; }
-
- /// <summary>
- /// 涓嶈壇鍒嗙被
- /// </summary>
- [SugarColumn(ColumnName = "DKB014")]
- public string Dkb014 { get; set; }
-
- /// <summary>
- /// 涓嶈壇椤圭洰
- /// </summary>
- [SugarColumn(ColumnName = "DKB015")]
- public string Dkb015 { get; set; }
-
- /// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DKB016")]
- public string Dkb016 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "DKB017")]
- public string Dkb017 { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DKB018")]
- public string Dkb018 { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemIpiItem.cs b/MES.Service/Modes/QsItemIpiItem.cs
deleted file mode 100644
index 59642a8..0000000
--- a/MES.Service/Modes/QsItemIpiItem.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 棣栨瀛愯〃
-/// </summary>
-[Table("QS_ITEM_IPI_ITEM")]
-[SugarTable("QS_ITEM_IPI_ITEM")] //鐢ㄤ簬SqlSugar
-public class QsItemIpiItem
-{
- /// <summary>
- /// 搴忓垪SEQ_QS_IPI
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_IPI",
- ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鎺ユ敹姘村钩
- /// </summary>
- [Column("FAC_LEVEL")]
- [SugarColumn(ColumnName = "FAC_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鎺ユ敹姘村钩闀垮害涓嶈兘瓒呭嚭100")]
- public string? FacLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [Column("FCHECK_LEVEL")]
- [SugarColumn(ColumnName = "FCHECK_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾按骞抽暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾柟娉�
- /// </summary>
- [Column("INSPECTION_METHOD")]
- [SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
- public string? InspectionMethod { get; set; }
-
- /// <summary>
- /// 璐ㄩ噺瑕佹眰
- /// </summary>
- [Column("ITEM_MOD")]
- [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "璐ㄩ噺瑕佹眰闀垮害涓嶈兘瓒呭嚭500")]
- public string? ItemMod { get; set; }
-
- /// <summary>
- /// 妫�楠屼釜鏁�
- /// </summary>
- [Column("LEVEL_NUM")]
- [SugarColumn(ColumnName = "LEVEL_NUM")] //鐢ㄤ簬SqlSugar
- public decimal? LevelNum { get; set; }
-
- /// <summary>
- /// 鏈�澶у��
- /// </summary>
- [Column("MAX_VALUE")]
- [SugarColumn(ColumnName = "MAX_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MaxValue { get; set; }
-
- /// <summary>
- /// 鏈�灏忓��
- /// </summary>
- [Column("MIN_VALUE")]
- [SugarColumn(ColumnName = "MIN_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MinValue { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("NOTES")]
- [SugarColumn(ColumnName = "NOTES")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭100")]
- public string? Notes { get; set; }
-
- /// <summary>
- /// 妫�楠屼富琛╥d
- /// </summary>
- [Column("PID")]
- [SugarColumn(ColumnName = "PID")] //鐢ㄤ簬SqlSugar
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// 椤圭洰鍚嶇О
- /// </summary>
- [Column("PROJ_NAME")]
- [SugarColumn(ColumnName = "PROJ_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string? ProjName { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗙紪鐮�
- /// </summary>
- [Column("QS_CODE")]
- [SugarColumn(ColumnName = "QS_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗙紪鐮侀暱搴︿笉鑳借秴鍑�100")]
- public string? QsCode { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗗悕绉�
- /// </summary>
- [Column("QS_NAME")]
- [SugarColumn(ColumnName = "QS_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗗悕绉伴暱搴︿笉鑳借秴鍑�100")]
- public string? QsName { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [Column("STANDARD_VALUE")]
- [SugarColumn(ColumnName = "STANDARD_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? StandardValue { get; set; }
-
- /// <summary>
- /// 浣跨敤浠〃
- /// </summary>
- [Column("USING_INSTRUMENTS")]
- [SugarColumn(ColumnName = "USING_INSTRUMENTS")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浣跨敤浠〃闀垮害涓嶈兘瓒呭嚭50")]
- public string? UsingInstruments { get; set; }
-
- /// <summary>
- /// 0琛ㄧず涓嶅悎鏍�,1琛ㄧず鍚堟牸
- /// </summary>
- [Column("IS_PASS")]
- [SugarColumn(ColumnName = "IS_PASS")] //鐢ㄤ簬SqlSugar
- public decimal? IsPass { get; set; }
-
-
- /// <summary>
- /// 宸叉楠屼釜鏁�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public int? isCheck { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍦板潃
- /// </summary>
- [Column("PICTURE")]
- [SugarColumn(ColumnName = "PICTURE")] //鐢ㄤ簬SqlSugar
- public byte[]? Picture { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍚嶇О
- /// </summary>
- [Column("PICTURENAME")]
- [SugarColumn(ColumnName = "PICTURENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "Picturename闀垮害涓嶈兘瓒呭嚭32")]
- public string? Picturename { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? result { get; set; }
- [SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemIpiItemDetail.cs b/MES.Service/Modes/QsItemIpiItemDetail.cs
deleted file mode 100644
index 0d1c504..0000000
--- a/MES.Service/Modes/QsItemIpiItemDetail.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 棣栨瀛欒〃
-/// </summary>
-[Table("QS_ITEM_IPI_ITEM_DETAIL")]
-[SugarTable("QS_ITEM_IPI_ITEM_DETAIL")] //鐢ㄤ簬SqlSugar
-public class QsItemIpiItemDetail
-{
- /// <summary>
- /// 搴忓垪SEQ_QS_IPI
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_IPI",
- ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠岀粨鏋滈暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FSTAND")]
- [SugarColumn(ColumnName = "FSTAND")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "Fstand闀垮害涓嶈兘瓒呭嚭50")]
- public string? Fstand { get; set; }
-
- /// <summary>
- /// 棣栨涓昏〃id
- /// </summary>
- [Column("GID")]
- [SugarColumn(ColumnName = "GID")] //鐢ㄤ簬SqlSugar
- public decimal? Gid { get; set; }
-
- /// <summary>
- /// 棣栨瀛愯〃id
- /// </summary>
- [Column("PID")]
- [SugarColumn(ColumnName = "PID")] //鐢ㄤ簬SqlSugar
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("UPDATE_BY")]
- [SugarColumn(ColumnName = "UPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? UpdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [Column("UPDATE_DATE")]
- [SugarColumn(ColumnName = "UPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? UpdateDate { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
-
- [SugarColumn(IsIgnore = true)] public decimal? IsPass { get; set; }
-
- [SugarColumn(IsIgnore = true)] public int? count { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemIpiReq.cs b/MES.Service/Modes/QsItemIpiReq.cs
deleted file mode 100644
index 0daac60..0000000
--- a/MES.Service/Modes/QsItemIpiReq.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 棣栨涓昏〃
-/// </summary>
-[Table("QS_ITEM_IPI_REQ")]
-[SugarTable("QS_ITEM_IPI_REQ")] //鐢ㄤ簬SqlSugar
-public class QsItemIpiReq
-{
- /// <summary>
- /// 棣栨鍗曞彿
- /// </summary>
- [Column("BILL_NO")]
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "棣栨鍗曞彿闀垮害涓嶈兘瓒呭嚭50")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("COMMENTS")]
- [SugarColumn(ColumnName = "COMMENTS")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭500")]
- public string? Comments { get; set; }
-
- /// <summary>
- /// 瀹屾垚鏃堕棿
- /// </summary>
- [Column("COMPLETE_TIME")]
- [SugarColumn(ColumnName = "COMPLETE_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? CompleteTime { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_TIME")]
- [SugarColumn(ColumnName = "CREATE_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateTime { get; set; }
-
- /// <summary>
- /// 搴忓垪SEQ_QS_IPI
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_IPI",
- ColumnName = "ID")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 0琛ㄧず涓嶅悎鏍�,1琛ㄧず鍚堟牸
- /// </summary>
- [Column("IS_PASS")]
- [SugarColumn(ColumnName = "IS_PASS")] //鐢ㄤ簬SqlSugar
- public decimal? IsPass { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [Column("ITEM_MOD")]
- [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "浜у搧瑙勬牸闀垮害涓嶈兘瓒呭嚭1000")]
- public string? ItemMod { get; set; }
-
- /// <summary>
- /// 浜у搧鍚�
- /// </summary>
- [Column("ITEM_NAME")]
- [SugarColumn(ColumnName = "ITEM_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "浜у搧鍚嶉暱搴︿笉鑳借秴鍑�200")]
- public string? ItemName { get; set; }
-
- /// <summary>
- /// 浜у搧缂栧彿
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜у搧缂栧彿闀垮害涓嶈兘瓒呭嚭50")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 浜х嚎
- /// </summary>
- [Column("LINE")]
- [SugarColumn(ColumnName = "LINE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜х嚎闀垮害涓嶈兘瓒呭嚭50")]
- public string? Line { get; set; }
-
- /// <summary>
- /// 浜х嚎鍚�
- /// </summary>
- [Column("LINE_NAME")]
- [SugarColumn(ColumnName = "LINE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浜х嚎鍚嶉暱搴︿笉鑳借秴鍑�50")]
- public string? LineName { get; set; }
-
- /// <summary>
- /// 鎺掍骇鍗曞彿
- /// </summary>
- [Column("PBAID")]
- [SugarColumn(ColumnName = "PBAID")] //鐢ㄤ簬SqlSugar
- public decimal? Pbaid { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [Column("STATUS_DATE")]
- [SugarColumn(ColumnName = "STATUS_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? StatusDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [Column("STATUS_USER")]
- [SugarColumn(ColumnName = "STATUS_USER")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? StatusUser { get; set; }
-
- /// <summary>
- /// 杞﹂棿缂栫爜
- /// </summary>
- [Column("WORKSHOP_CODE")]
- [SugarColumn(ColumnName = "WORKSHOP_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "杞﹂棿缂栫爜闀垮害涓嶈兘瓒呭嚭50")]
- public string? WorkshopCode { get; set; }
-
- /// <summary>
- /// 杞﹂棿鍚�
- /// </summary>
- [Column("WORKSHOP_NAME")]
- [SugarColumn(ColumnName = "WORKSHOP_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "杞﹂棿鍚嶉暱搴︿笉鑳借秴鍑�50")]
- public string? WorkshopName { get; set; }
-
-
- /// <summary>
- /// 妯″叿鍙�
- /// </summary>
- [Column("MOID_NUM")]
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妯″叿鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string? MoidNum { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemOqcItem.cs b/MES.Service/Modes/QsItemOqcItem.cs
deleted file mode 100644
index 663083a..0000000
--- a/MES.Service/Modes/QsItemOqcItem.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鍏ュ簱妫�瀛愯〃
-/// </summary>
-[Table("QS_ITEM_OQC_ITEM")]
-[SugarTable("QS_ITEM_OQC_ITEM")] //鐢ㄤ簬SqlSugar
-public class QsItemOqcItem
-{
- private string? result;
-
- /// <summary>
- /// 鎺ユ敹姘村钩
- /// </summary>
- [Column("FAC_LEVEL")]
- [SugarColumn(ColumnName = "FAC_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鎺ユ敹姘村钩闀垮害涓嶈兘瓒呭嚭100")]
- public string? FacLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [Column("FCHECK_LEVEL")]
- [SugarColumn(ColumnName = "FCHECK_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾按骞抽暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckLevel { get; set; }
-
- /// <summary>
- /// 搴忓垪SEQ_QS_RKJ
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_RKJ",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 妫�楠屾柟娉�
- /// </summary>
- [Column("INSPECTION_METHOD")]
- [SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
- public string? InspectionMethod { get; set; }
-
- /// <summary>
- /// 0琛ㄧず涓嶅悎鏍�,1琛ㄧず鍚堟牸
- /// </summary>
- [Column("IS_PASS")]
- [SugarColumn(ColumnName = "IS_PASS")] //鐢ㄤ簬SqlSugar
- public decimal? IsPass { get; set; }
-
- /// <summary>
- /// 璐ㄩ噺瑕佹眰
- /// </summary>
- [Column("ITEM_MOD")]
- [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "璐ㄩ噺瑕佹眰闀垮害涓嶈兘瓒呭嚭500")]
- public string? ItemMod { get; set; }
-
- /// <summary>
- /// 妫�楠屼釜鏁�
- /// </summary>
- [Column("LEVEL_NUM")]
- [SugarColumn(ColumnName = "LEVEL_NUM")] //鐢ㄤ簬SqlSugar
- public decimal? LevelNum { get; set; }
-
- /// <summary>
- /// 鏈�澶у��
- /// </summary>
- [Column("MAX_VALUE")]
- [SugarColumn(ColumnName = "MAX_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MaxValue { get; set; }
-
- /// <summary>
- /// 鏈�灏忓��
- /// </summary>
- [Column("MIN_VALUE")]
- [SugarColumn(ColumnName = "MIN_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MinValue { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("NOTES")]
- [SugarColumn(ColumnName = "NOTES")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭100")]
- public string? Notes { get; set; }
-
- /// <summary>
- /// 妫�楠屼富琛╥d
- /// </summary>
- [Column("PID")]
- [SugarColumn(ColumnName = "PID")] //鐢ㄤ簬SqlSugar
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// 椤圭洰鍚嶇О
- /// </summary>
- [Column("PROJ_NAME")]
- [SugarColumn(ColumnName = "PROJ_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string? ProjName { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗙紪鐮�
- /// </summary>
- [Column("QS_CODE")]
- [SugarColumn(ColumnName = "QS_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗙紪鐮侀暱搴︿笉鑳借秴鍑�100")]
- public string? QsCode { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗗悕绉�
- /// </summary>
- [Column("QS_NAME")]
- [SugarColumn(ColumnName = "QS_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗗悕绉伴暱搴︿笉鑳借秴鍑�100")]
- public string? QsName { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [Column("STANDARD_VALUE")]
- [SugarColumn(ColumnName = "STANDARD_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? StandardValue { get; set; }
-
- /// <summary>
- /// 浣跨敤浠〃
- /// </summary>
- [Column("USING_INSTRUMENTS")]
- [SugarColumn(ColumnName = "USING_INSTRUMENTS")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浣跨敤浠〃闀垮害涓嶈兘瓒呭嚭50")]
- public string? UsingInstruments { get; set; }
-
-
- /// <summary>
- /// 宸叉楠屼釜鏁�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public int? isCheck { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍦板潃
- /// </summary>
- [Column("PICTURE")]
- [SugarColumn(ColumnName = "PICTURE")] //鐢ㄤ簬SqlSugar
- public byte[]? Picture { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍚嶇О
- /// </summary>
- [Column("PICTURENAME")]
- [SugarColumn(ColumnName = "PICTURENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "Picturename闀垮害涓嶈兘瓒呭嚭32")]
- public string? Picturename { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
- [Column("FRE_QTY")]
- [SugarColumn(ColumnName = "FRE_QTY")] //鐢ㄤ簬SqlSugar
- public decimal? FreQty { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Result { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
-
- [SugarColumn(IsIgnore = true)] public int? Unqualified { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemOqcItemDetail.cs b/MES.Service/Modes/QsItemOqcItemDetail.cs
deleted file mode 100644
index c0e169d..0000000
--- a/MES.Service/Modes/QsItemOqcItemDetail.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鍏ュ簱妫�瀛欒〃
-/// </summary>
-[Table("QS_ITEM_OQC_ITEM_DETAIL")]
-[SugarTable("QS_ITEM_OQC_ITEM_DETAIL")] //鐢ㄤ簬SqlSugar
-public class QsItemOqcItemDetail
-{
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠岀粨鏋滈暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FSTAND")]
- [SugarColumn(ColumnName = "FSTAND")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "Fstand闀垮害涓嶈兘瓒呭嚭50")]
- public string? Fstand { get; set; }
-
- /// <summary>
- /// 棣栨涓昏〃id
- /// </summary>
- [Column("GID")]
- [SugarColumn(ColumnName = "GID")] //鐢ㄤ簬SqlSugar
- public decimal? Gid { get; set; }
-
- /// <summary>
- /// 搴忓垪SEQ_QS_RKJ
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_RKJ",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 棣栨瀛愯〃id
- /// </summary>
- [Column("PID")]
- [SugarColumn(ColumnName = "PID")] //鐢ㄤ簬SqlSugar
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("UPDATE_BY")]
- [SugarColumn(ColumnName = "UPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? UpdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [Column("UPDATE_DATE")]
- [SugarColumn(ColumnName = "UPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? UpdateDate { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
- [SugarColumn(IsIgnore = true)] public int? count { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
deleted file mode 100644
index 82a24fd..0000000
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鍏ュ簱妫�妫�楠岃〃澶�
-/// </summary>
-[Table("QS_ITEM_OQC_REQ")]
-[SugarTable("QS_ITEM_OQC_REQ")] //鐢ㄤ簬SqlSugar
-public class QsItemOqcReq
-{
- /// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
- [Column("BILL_NO")]
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "宸ュ崟鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 妫�楠屼汉鍛�
- /// </summary>
- [Column("FCHECK_BY")]
- [SugarColumn(ColumnName = "FCHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屼汉鍛橀暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckBy { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [Column("FCHECK_DATE")]
- [SugarColumn(ColumnName = "FCHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠岀粨鏋滈暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// 搴忓垪SEQ_QS_RKJ
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_RKJ",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鐗╂枡缂栫爜闀垮害涓嶈兘瓒呭嚭100")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃ユ湡
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MODIFY1_BY")]
- [SugarColumn(ColumnName = "MODIFY1_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "Modify1By闀垮害涓嶈兘瓒呭嚭100")]
- public string? Modify1By { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [Column("RELEASE_NO")]
- [SugarColumn(ColumnName = "RELEASE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屽崟鍙烽暱搴︿笉鑳借秴鍑�100")]
- public string? ReleaseNo { get; set; }
-
- /// <summary>
- /// 妯″叿鍙�
- /// </summary>
- [Column("MOID_NUM")]
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妯″叿鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string? MoidNum { get; set; }
-
-
- //Remarks
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? LineName { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardName { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Mocode { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardModel { get; set; }
-
- [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }
-
- //colorName
- [SugarColumn(IsIgnore = true)] public string? ColorName { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsQaItemXj.cs b/MES.Service/Modes/QsQaItemXj.cs
deleted file mode 100644
index 8ee9853..0000000
--- a/MES.Service/Modes/QsQaItemXj.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸℃妫�楠岃〃澶�
-/// </summary>
-[Table("QS_QA_ITEM_XJ")]
-[SugarTable("QS_QA_ITEM_XJ")] //鐢ㄤ簬SqlSugar
-public class QsQaItemXj
-{
- /// <summary>
- /// 搴忓垪SEQ_QS_XJ
- /// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_XJ",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
- [Column("BILL_NO")]
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "宸ュ崟鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 妫�楠屼汉鍛�
- /// </summary>
- [Column("FCHECK_BY")]
- [SugarColumn(ColumnName = "FCHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屼汉鍛橀暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckBy { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [Column("FCHECK_DATE")]
- [SugarColumn(ColumnName = "FCHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠岀粨鏋滈暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鐗╂枡缂栫爜闀垮害涓嶈兘瓒呭嚭100")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [Column("ITEM_UNIT")]
- [SugarColumn(ColumnName = "ITEM_UNIT")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍗曚綅闀垮害涓嶈兘瓒呭嚭100")]
- public string? ItemUnit { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃ユ湡
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MODIFY1_BY")]
- [SugarColumn(ColumnName = "MODIFY1_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "Modify1By闀垮害涓嶈兘瓒呭嚭100")]
- public string? Modify1By { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [Column("RELEASE_NO")]
- [SugarColumn(ColumnName = "RELEASE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屽崟鍙烽暱搴︿笉鑳借秴鍑�100")]
- public string? ReleaseNo { get; set; }
-
- /// <summary>
- /// 妯″叿鍙�
- /// </summary>
- [Column("MOID_NUM")]
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妯″叿鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string? MoidNum { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
- [SugarColumn(IsIgnore = true)] public decimal? CatQty { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Daa020 { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? DetailMem { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardModel { get; set; }
- [SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Mocode { get; set; }
- [SugarColumn(IsIgnore = true)] public string? BoardStyle { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsQaItemXj01.cs b/MES.Service/Modes/QsQaItemXj01.cs
deleted file mode 100644
index 95a65e9..0000000
--- a/MES.Service/Modes/QsQaItemXj01.cs
+++ /dev/null
@@ -1,165 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸℃瀛愯〃
-/// </summary>
-[Table("QS_QA_ITEM_XJ01")]
-[SugarTable("QS_QA_ITEM_XJ01")] //鐢ㄤ簬SqlSugar
-public class QsQaItemXj01
-{
- /// <summary>
- /// 鎺ユ敹姘村钩
- /// </summary>
- [Column("FAC_LEVEL")]
- [SugarColumn(ColumnName = "FAC_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鎺ユ敹姘村钩闀垮害涓嶈兘瓒呭嚭100")]
- public string? FacLevel { get; set; }
-
- /// <summary>
- /// 妫�楠屾按骞�
- /// </summary>
- [Column("FCHECK_LEVEL")]
- [SugarColumn(ColumnName = "FCHECK_LEVEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾按骞抽暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckLevel { get; set; }
-
- /// <summary>
- /// 搴忓垪SEQ_QS_XJ
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_XJ",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 妫�楠屾柟娉�
- /// </summary>
- [Column("INSPECTION_METHOD")]
- [SugarColumn(ColumnName = "INSPECTION_METHOD")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妫�楠屾柟娉曢暱搴︿笉鑳借秴鍑�50")]
- public string? InspectionMethod { get; set; }
-
- /// <summary>
- /// 0琛ㄧず涓嶅悎鏍�,1琛ㄧず鍚堟牸
- /// </summary>
- [Column("IS_PASS")]
- [SugarColumn(ColumnName = "IS_PASS")] //鐢ㄤ簬SqlSugar
- public decimal? IsPass { get; set; }
-
- /// <summary>
- /// 璐ㄩ噺瑕佹眰
- /// </summary>
- [Column("ITEM_MOD")]
- [SugarColumn(ColumnName = "ITEM_MOD")] //鐢ㄤ簬SqlSugar
- [StringLength(500, ErrorMessage = "璐ㄩ噺瑕佹眰闀垮害涓嶈兘瓒呭嚭500")]
- public string? ItemMod { get; set; }
-
- /// <summary>
- /// 妫�楠屼釜鏁�
- /// </summary>
- [Column("LEVEL_NUM")]
- [SugarColumn(ColumnName = "LEVEL_NUM")] //鐢ㄤ簬SqlSugar
- public decimal? LevelNum { get; set; }
-
- /// <summary>
- /// 鏈�澶у��
- /// </summary>
- [Column("MAX_VALUE")]
- [SugarColumn(ColumnName = "MAX_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MaxValue { get; set; }
-
- /// <summary>
- /// 鏈�灏忓��
- /// </summary>
- [Column("MIN_VALUE")]
- [SugarColumn(ColumnName = "MIN_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? MinValue { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("NOTES")]
- [SugarColumn(ColumnName = "NOTES")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭100")]
- public string? Notes { get; set; }
-
- /// <summary>
- /// 妫�楠屼富琛╥d
- /// </summary>
- [Column("PID")]
- [SugarColumn(ColumnName = "PID")] //鐢ㄤ簬SqlSugar
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// 椤圭洰鍚嶇О
- /// </summary>
- [Column("PROJ_NAME")]
- [SugarColumn(ColumnName = "PROJ_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "椤圭洰鍚嶇О闀垮害涓嶈兘瓒呭嚭50")]
- public string? ProjName { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗙紪鐮�
- /// </summary>
- [Column("QS_CODE")]
- [SugarColumn(ColumnName = "QS_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗙紪鐮侀暱搴︿笉鑳借秴鍑�100")]
- public string? QsCode { get; set; }
-
- /// <summary>
- /// 妫�楠屾爣鍑嗗悕绉�
- /// </summary>
- [Column("QS_NAME")]
- [SugarColumn(ColumnName = "QS_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屾爣鍑嗗悕绉伴暱搴︿笉鑳借秴鍑�100")]
- public string? QsName { get; set; }
-
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [Column("STANDARD_VALUE")]
- [SugarColumn(ColumnName = "STANDARD_VALUE")] //鐢ㄤ簬SqlSugar
- public decimal? StandardValue { get; set; }
-
- /// <summary>
- /// 浣跨敤浠〃
- /// </summary>
- [Column("USING_INSTRUMENTS")]
- [SugarColumn(ColumnName = "USING_INSTRUMENTS")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "浣跨敤浠〃闀垮害涓嶈兘瓒呭嚭50")]
- public string? UsingInstruments { get; set; }
-
- /// <summary>
- /// 宸叉楠屼釜鏁�
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public int? isCheck { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍦板潃
- /// </summary>
- [Column("PICTURE")]
- [SugarColumn(ColumnName = "PICTURE")] //鐢ㄤ簬SqlSugar
- public byte[]? Picture { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍚嶇О
- /// </summary>
- [Column("PICTURENAME")]
- [SugarColumn(ColumnName = "PICTURENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "Picturename闀垮害涓嶈兘瓒呭嚭32")]
- public string? Picturename { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? result { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? imageData { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsQaItemXj02.cs b/MES.Service/Modes/QsQaItemXj02.cs
deleted file mode 100644
index 02d930c..0000000
--- a/MES.Service/Modes/QsQaItemXj02.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸℃瀛欒〃
-/// </summary>
-[Table("QS_QA_ITEM_XJ02")]
-[SugarTable("QS_QA_ITEM_XJ02")] //鐢ㄤ簬SqlSugar
-public class QsQaItemXj02
-{
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠岀粨鏋滈暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FSTAND")]
- [SugarColumn(ColumnName = "FSTAND")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "Fstand闀垮害涓嶈兘瓒呭嚭50")]
- public string? Fstand { get; set; }
-
- /// <summary>
- /// 棣栨涓昏〃id
- /// </summary>
- [Column("GID")]
- [SugarColumn(ColumnName = "GID")] //鐢ㄤ簬SqlSugar
- public decimal? Gid { get; set; }
-
- /// <summary>
- /// 搴忓垪SEQ_QS_IPI
- /// </summary>
- [Column("ID")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "SEQ_QS_XJ",
- ColumnName = "ID")] //鐢ㄤ簬SqlSugar
- public decimal? Id { get; set; }
-
- /// <summary>
- /// 棣栨瀛愯〃id
- /// </summary>
- [Column("PID")]
- [SugarColumn(ColumnName = "PID")] //鐢ㄤ簬SqlSugar
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("UPDATE_BY")]
- [SugarColumn(ColumnName = "UPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�50")]
- public string? UpdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [Column("UPDATE_DATE")]
- [SugarColumn(ColumnName = "UPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? UpdateDate { get; set; }
-
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
- public string? Remarks { get; set; }
-
- [SugarColumn(IsIgnore = true)] public int? count { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs
deleted file mode 100644
index 304b4ec..0000000
--- a/MES.Service/Modes/SalesOrder.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞鍗曡〃
-/// </summary>
-[SugarTable("SALES_ORDER")]
-public class SalesOrder
-{
- /// <summary>
- /// SEQ_sales搴忓垪
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_ID")]
- public string OrderId { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍗曞埆
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_TYPE")]
- public string OrderType { get; set; }
-
- /// <summary>
- /// 鍙楄鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_DATE")]
- public DateTime? OrderDate { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鐗堟湰
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_VERSION")]
- public long? DocumentVersion { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_DATE")]
- public DateTime? DocumentDate { get; set; }
-
- /// <summary>
- /// 宸ュ巶缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY_ID")]
- public string FactoryId { get; set; }
-
- /// <summary>
- /// 宸ュ巶绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY_NAME")]
- public string FactoryName { get; set; }
-
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ID")]
- public string CustomerId { get; set; }
-
- /// <summary>
- /// 瀹㈡埛绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NAME")]
- public string CustomerName { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ORDER_ID")]
- public string CustomerOrderId { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_ID")]
- public string DepartmentId { get; set; }
-
- /// <summary>
- /// 鎬绘暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "TOTAL_QUANTITY")]
- public decimal? TotalQuantity { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string Remarks { get; set; }
-
- /// <summary>
- /// erp瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "APPROVAL_DATE")]
- public DateTime? ApprovalDate { get; set; }
-
- /// <summary>
- /// erp瀹℃牳鑰�
- /// </summary>
- [SugarColumn(ColumnName = "APPROVER")]
- public string Approver { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrderDetail.cs
deleted file mode 100644
index 0dd800e..0000000
--- a/MES.Service/Modes/SalesOrderDetail.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞鍗曟槑缁嗚〃
-/// </summary>
-[SugarTable("SALES_ORDER_DETAIL")]
-public class SalesOrderDetail
-{
- /// <summary>
- /// SEQ_sales搴忓垪
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 璁㈠崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_ID")]
- public string OrderId { get; set; }
-
- /// <summary>
- /// 搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NUMBER")]
- public long? LineNumber { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_CODE")]
- public string ProductCode { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_NAME")]
- public string ProductName { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_SPEC")]
- public string ProductSpec { get; set; }
-
- /// <summary>
- /// 棰勪氦璐ф棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "SCHEDULED_DELIVERY_DATE")]
- public DateTime? ScheduledDeliveryDate { get; set; }
-
- /// <summary>
- /// 璁㈠崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_QUANTITY")]
- public decimal? OrderQuantity { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
- public string Unit { get; set; }
-
- /// <summary>
- /// 鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "UNIT_PRICE")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 閲戦
- /// </summary>
- [SugarColumn(ColumnName = "AMOUNT")]
- public decimal? Amount { get; set; }
-
- /// <summary>
- /// 瀹㈡埛浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_PRODUCT_CODE")]
- public string CustomerProductCode { get; set; }
-
- /// <summary>
- /// 宸蹭氦璐ф暟
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERED_QUANTITY")]
- public decimal? DeliveredQuantity { get; set; }
-
- /// <summary>
- /// 缁撴潫
- /// </summary>
- [SugarColumn(ColumnName = "IS_CLOSED")]
- public string IsClosed { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string Remarks { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "ERP_HEAD_ID")]
- public string ErpHeadId { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesReturnNotice.cs b/MES.Service/Modes/SalesReturnNotice.cs
deleted file mode 100644
index f3c462d..0000000
--- a/MES.Service/Modes/SalesReturnNotice.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞��璐ч�氱煡鍗曡〃
-/// </summary>
-[SugarTable("SALES_RETURN_NOTICE")]
-public class SalesReturnNotice
-{
- /// <summary>
- /// SEQ_sales
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍒跺崟浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATED_BY")]
- public string CreatedBy { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DOCUMENT_ID")]
- public string DocumentId { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜哄悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "APPROVED_BY")]
- public string ApprovedBy { get; set; }
-
- /// <summary>
- /// 鍒跺崟/瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATED_OR_APPROVED_DATE")]
- public DateTime? CreatedOrApprovedDate { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_CODE")]
- public string DepartmentCode { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENT_NAME")]
- public string DepartmentName { get; set; }
-
- /// <summary>
- /// 璐揣鍗曚綅浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASER_CODE")]
- public string PurchaserCode { get; set; }
-
- /// <summary>
- /// 璐揣鍗曚綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PURCHASER_NAME")]
- public string PurchaserName { get; set; }
-
- /// <summary>
- /// 涓氬姟鍛樹唬鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SALESPERSON_CODE")]
- public string SalespersonCode { get; set; }
-
- /// <summary>
- /// 涓氬姟鍛樺悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SALESPERSON_NAME")]
- public string SalespersonName { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesReturnNoticeDetail.cs b/MES.Service/Modes/SalesReturnNoticeDetail.cs
deleted file mode 100644
index 3d64ef4..0000000
--- a/MES.Service/Modes/SalesReturnNoticeDetail.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞��璐ч�氱煡鍗曟槑缁嗚〃
-/// </summary>
-[SugarTable("SALES_RETURN_NOTICE_DETAIL")]
-public class SalesReturnNoticeDetail
-{
- /// <summary>
- /// SEQ_sales
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍗曟嵁琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NUMBER")]
- public long? LineNumber { get; set; }
-
- /// <summary>
- /// 浜у搧浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_CODE")]
- public string ProductCode { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_NAME")]
- public string ProductName { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCT_SPEC")]
- public string ProductSpec { get; set; }
-
- /// <summary>
- /// 閲戦
- /// </summary>
- [SugarColumn(ColumnName = "AMOUNT")]
- public decimal? Amount { get; set; }
-
- /// <summary>
- /// 鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "UNIT_PRICE")]
- public decimal? UnitPrice { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public decimal? Quantity { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "OUT_QUANTITY")]
- public decimal? OutQuantity { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "BATCH_NUMBER")]
- public string BatchNumber { get; set; }
-
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "RETURN_QUANTITY")]
- public decimal? ReturnQuantity { get; set; }
-
- /// <summary>
- /// 鍙戣揣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DELIVERY_QUANTITY")]
- public decimal? DeliveryQuantity { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string Remarks { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER_ID")]
- public string SalesOrderId { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞垎褰�
- /// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER_ENTRY")]
- public string SalesOrderEntry { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗旾D
- /// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER_DETAIL_ID")]
- public string SalesOrderDetailId { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "BASE_UNIT_PRICE")]
- public decimal? BaseUnitPrice { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "BASE_UNIT_QUANTITY")]
- public decimal? BaseUnitQuantity { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "WAREHOUSE_CODE")]
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "WAREHOUSE_NAME")]
- public string WarehouseName { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "BASE_UNIT_OUT_QUANTITY")]
- public decimal? BaseUnitOutQuantity { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
- public string Unit { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "ERP_HEAD_ID")]
- public string ErpHeadId { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/ShipmentDetail.cs b/MES.Service/Modes/ShipmentDetail.cs
deleted file mode 100644
index 7462202..0000000
--- a/MES.Service/Modes/ShipmentDetail.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞彂璐ч�氱煡鍗曟槑缁嗚〃
-/// </summary>
-[SugarTable("SHIPMENT_DETAIL")]
-public class ShipmentDetail
-{
- /// <summary>
- /// SEQ_sales
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-
- /// <summary>
- /// ERP澶碔D
- /// </summary>
- [SugarColumn(ColumnName = "ERP_HEAD_ID")]
- public string ErpHeadId { get; set; }
-
- /// <summary>
- /// 鍗曟嵁琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
- public long? LineNo { get; set; }
-
- /// <summary>
- /// 浜у搧浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "PROD_CODE")]
- public string ProdCode { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "PROD_NAME")]
- public string ProdName { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "PROD_SPEC")]
- public string ProdSpec { get; set; }
-
- /// <summary>
- /// 閲戦
- /// </summary>
- [SugarColumn(ColumnName = "AMOUNT")]
- public double? Amount { get; set; }
-
- /// <summary>
- /// 鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "UNIT_PRICE")]
- public double? UnitPrice { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public double? Quantity { get; set; }
-
- /// <summary>
- /// 鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "OUT_QTY")]
- public double? OutQty { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "BATCH_NO")]
- public string BatchNo { get; set; }
-
- /// <summary>
- /// 閫�璐ф暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "RETURN_QTY")]
- public double? ReturnQty { get; set; }
-
- /// <summary>
- /// 鍙戣揣鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "SHIP_QTY")]
- public double? ShipQty { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string Remarks { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_NO")]
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞垎褰�
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_ENTRY")]
- public string OrderEntry { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗旾D
- /// </summary>
- [SugarColumn(ColumnName = "ORDER_ID")]
- public string OrderId { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚环
- /// </summary>
- [SugarColumn(ColumnName = "BASE_PRICE")]
- public double? BasePrice { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "BASE_QTY")]
- public double? BaseQty { get; set; }
-
- /// <summary>
- /// 浠撳簱浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "WAREHOUSE_CODE")]
- public string WarehouseCode { get; set; }
-
- /// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "WAREHOUSE_NAME")]
- public string WarehouseName { get; set; }
-
- /// <summary>
- /// 鍩烘湰鍗曚綅鍑哄簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "BASE_OUT_QTY")]
- public double? BaseOutQty { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "UNIT")]
- public string Unit { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/ShipmentNotice.cs b/MES.Service/Modes/ShipmentNotice.cs
deleted file mode 100644
index 642a9ab..0000000
--- a/MES.Service/Modes/ShipmentNotice.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閿�鍞彂璐ч�氱煡鍗曡〃
-/// </summary>
-[SugarTable("SHIPMENT_NOTICE")]
-public class ShipmentNotice
-{
- /// <summary>
- /// SEQ_sales
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
- IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// 鍒跺崟浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATOR")]
- public string Creator { get; set; }
-
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DOC_ID")]
- public string DocId { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜哄悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "APPROVER")]
- public string Approver { get; set; }
-
- /// <summary>
- /// 鍒跺崟鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "APPROVE_DATE")]
- public DateTime? ApproveDate { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "DEPT_CODE")]
- public string DeptCode { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPT_NAME")]
- public string DeptName { get; set; }
-
- /// <summary>
- /// 璐揣鍗曚綅浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "BUYER_CODE")]
- public string BuyerCode { get; set; }
-
- /// <summary>
- /// 璐揣鍗曚綅鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "BUYER_NAME")]
- public string BuyerName { get; set; }
-
- /// <summary>
- /// 涓氬姟鍛樹唬鐮�
- /// </summary>
- [SugarColumn(ColumnName = "SALES_CODE")]
- public string SalesCode { get; set; }
-
- /// <summary>
- /// 涓氬姟鍛樺悕绉�
- /// </summary>
- [SugarColumn(ColumnName = "SALES_NAME")]
- public string SalesName { get; set; }
-
- /// <summary>
- /// 鍗曟嵁ID
- /// </summary>
- [SugarColumn(ColumnName = "UNIQUE_ID")]
- public string UniqueId { get; set; }
-
- /// <summary>
- /// 瀹㈡埛浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "CUST_CODE")]
- public string CustCode { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "CUST_NAME")]
- public string CustName { get; set; }
-
- /// <summary>
- /// 鍒楄〃澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "LIST_NOTE")]
- public string ListNote { get; set; }
-
- /// <summary>
- /// 閿�鍞憳浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "REP_CODE")]
- public string RepCode { get; set; }
-
- /// <summary>
- /// 閿�鍞憳鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "REP_NAME")]
- public string RepName { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
deleted file mode 100644
index b43a1ff..0000000
--- a/MES.Service/Modes/SysDepartment.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 閮ㄩ棬
-/// </summary>
-[SugarTable("SYS_DEPARTMENT")]
-public class SysDepartment
-{
- /// <summary>
- /// 鍏徃
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬ID
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENTID")]
- public decimal? Departmentid { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENTCODE")]
- public string? Departmentcode { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEPARTMENTNAME")]
- public string? Departmentname { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬灞炴��
- /// </summary>
- [SugarColumn(ColumnName = "DEPEXTR1")]
- public string? Depextr1 { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "DEPEXTR2")]
- public string? Depextr2 { get; set; }
-
- /// <summary>
- /// WIP浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPEXTR3")]
- public string? Depextr3 { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [SugarColumn(ColumnName = "DEPEXTR4")]
- public string? Depextr4 { 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 = "FParentID")]
- public string? FParentID { get; set; }
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
-
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysUser.cs b/MES.Service/Modes/SysUser.cs
deleted file mode 100644
index a318f0d..0000000
--- a/MES.Service/Modes/SysUser.cs
+++ /dev/null
@@ -1,347 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// </summary>
-[Table("SYS_USER")]
-[SugarTable("SYS_USER")] //鐢ㄤ簬SqlSugar
-public class SysUser
-{
- /// <summary>
- /// BASEINFO
- /// </summary>
- [Key]
- [Column("FID")]
- [StringLength(20, ErrorMessage = "Fid闀垮害涓嶈兘瓒呭嚭20")]
- [SugarColumn(IsPrimaryKey = true, OracleSequenceName = "BASEINFO",
- ColumnName = "FID")] //鐢ㄤ簬SqlSugar
- public string Fid { get; set; }
-
-
- [StringLength(20, ErrorMessage = "Sid闀垮害涓嶈兘瓒呭嚭20")]
- [SugarColumn(ColumnName = "SID")] //鐢ㄤ簬SqlSugar
- public decimal Sid { get; set; }
-
- /// <summary>
- /// 鎺ユ敹鐗╂枡鏄惁杩涜妫�鏌�
- /// </summary>
- [Column("CHECK_FLAG")]
- [SugarColumn(ColumnName = "CHECK_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? CheckFlag { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "CreateBy闀垮害涓嶈兘瓒呭嚭20")]
- public string CreateBy { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 鏄惁鏈夊垹闄ょ壒鏉�
- /// </summary>
- [Column("DEL_FLAG")]
- [SugarColumn(ColumnName = "DEL_FLAG")] //鐢ㄤ簬SqlSugar
- public decimal? DelFlag { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬
- /// </summary>
- [Column("DEPARTMENTID")]
- [SugarColumn(ColumnName = "DEPARTMENTID")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "閮ㄩ棬闀垮害涓嶈兘瓒呭嚭20")]
- public string Departmentid { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("DEV")]
- [SugarColumn(ColumnName = "DEV")] //鐢ㄤ簬SqlSugar
- public decimal? Dev { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("EXP_FIEL10")]
- [SugarColumn(ColumnName = "EXP_FIEL10")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ExpFiel10闀垮害涓嶈兘瓒呭嚭50")]
- public string ExpFiel10 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("EXP_FIEL11")]
- [SugarColumn(ColumnName = "EXP_FIEL11")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ExpFiel11闀垮害涓嶈兘瓒呭嚭50")]
- public string ExpFiel11 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("EXP_FIEL12")]
- [SugarColumn(ColumnName = "EXP_FIEL12")] //鐢ㄤ簬SqlSugar
- public decimal? ExpFiel12 { get; set; }
-
- /// <summary>
- /// 鐝
- /// </summary>
- [Column("EXP_FIELD1")]
- [SugarColumn(ColumnName = "EXP_FIELD1")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鐝闀垮害涓嶈兘瓒呭嚭20")]
- public string ExpField1 { get; set; }
-
- /// <summary>
- /// 绾夸綋
- /// </summary>
- [Column("EXP_FIELD2")]
- [SugarColumn(ColumnName = "EXP_FIELD2")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "绾夸綋闀垮害涓嶈兘瓒呭嚭20")]
- public string ExpField2 { get; set; }
-
- /// <summary>
- /// 鐓х墖
- /// </summary>
- [Column("EXP_FIELD3")]
- [SugarColumn(ColumnName = "EXP_FIELD3")] //鐢ㄤ簬SqlSugar
- public byte[] ExpField3 { get; set; }
-
- /// <summary>
- /// 鑱旂郴鏂瑰紡
- /// </summary>
- [Column("EXP_FIELD4")]
- [SugarColumn(ColumnName = "EXP_FIELD4")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鑱旂郴鏂瑰紡闀垮害涓嶈兘瓒呭嚭20")]
- public string ExpField4 { get; set; }
-
- /// <summary>
- /// 鍥剧墖鍚�
- /// </summary>
- [Column("EXP_FIELD5")]
- [SugarColumn(ColumnName = "EXP_FIELD5")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "鍥剧墖鍚嶉暱搴︿笉鑳借秴鍑�200")]
- public string ExpField5 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("EXP_FIELD6")]
- [SugarColumn(ColumnName = "EXP_FIELD6")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "ExpField6闀垮害涓嶈兘瓒呭嚭20")]
- public string ExpField6 { get; set; }
-
- /// <summary>
- /// 杞﹂棿缂栫爜
- /// </summary>
- [Column("EXP_FIELD7")]
- [SugarColumn(ColumnName = "EXP_FIELD7")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "杞﹂棿缂栫爜闀垮害涓嶈兘瓒呭嚭50")]
- public string ExpField7 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("EXP_FIELD8")]
- [SugarColumn(ColumnName = "EXP_FIELD8")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ExpField8闀垮害涓嶈兘瓒呭嚭50")]
- public string ExpField8 { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("EXP_FIELD9")]
- [SugarColumn(ColumnName = "EXP_FIELD9")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "ExpField9闀垮害涓嶈兘瓒呭嚭50")]
- public string ExpField9 { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "宸ュ巶闀垮害涓嶈兘瓒呭嚭1000")]
- public string Factory { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FBRANCH")]
- [SugarColumn(ColumnName = "FBRANCH")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Fbranch闀垮害涓嶈兘瓒呭嚭20")]
- public string Fbranch { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FCODE")]
- [SugarColumn(ColumnName = "FCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Fcode闀垮害涓嶈兘瓒呭嚭20")]
- public string Fcode { get; set; }
-
- /// <summary>
- /// 鍏徃
- /// </summary>
- [Column("FCOMPANY")]
- [SugarColumn(ColumnName = "FCOMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "鍏徃闀垮害涓嶈兘瓒呭嚭1000")]
- public string Fcompany { get; set; }
-
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [Column("FFACTORY")]
- [SugarColumn(ColumnName = "FFACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "宸ュ巶闀垮害涓嶈兘瓒呭嚭1000")]
- public string Ffactory { get; set; }
-
- /// <summary>
- /// 棣栨鐧婚檰
- /// </summary>
- [Column("FIRST_LOGIN")]
- [SugarColumn(ColumnName = "FIRST_LOGIN")] //鐢ㄤ簬SqlSugar
- public decimal? FirstLogin { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FLOGIN_NAME")]
- [SugarColumn(ColumnName = "FLOGIN_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "FloginName闀垮害涓嶈兘瓒呭嚭20")]
- public string FloginName { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FNAME")]
- [SugarColumn(ColumnName = "FNAME")] //鐢ㄤ簬SqlSugar
- [StringLength(40, ErrorMessage = "Fname闀垮害涓嶈兘瓒呭嚭40")]
- public string Fname { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FPASSWORD")]
- [SugarColumn(ColumnName = "FPASSWORD")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "Fpassword闀垮害涓嶈兘瓒呭嚭100")]
- public string Fpassword { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FPLANT")]
- [SugarColumn(ColumnName = "FPLANT")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Fplant闀垮害涓嶈兘瓒呭嚭20")]
- public string Fplant { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FREADONLY")]
- [SugarColumn(ColumnName = "FREADONLY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Freadonly闀垮害涓嶈兘瓒呭嚭20")]
- public string Freadonly { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FSYSTEM")]
- [SugarColumn(ColumnName = "FSYSTEM")] //鐢ㄤ簬SqlSugar
- [StringLength(10, ErrorMessage = "Fsystem闀垮害涓嶈兘瓒呭嚭10")]
- public string Fsystem { get; set; }
-
- /// <summary>
- /// 鏄惁涓洪噰闆嗕汉鍛�
- /// </summary>
- [Column("ISACQ")]
- [SugarColumn(ColumnName = "ISACQ")] //鐢ㄤ簬SqlSugar
- public decimal? Isacq { get; set; }
-
- /// <summary>
- /// 1涓虹鑱岋紝0涓烘甯稿憳宸�
- /// </summary>
- [Column("ISDEPARTURE")]
- [SugarColumn(ColumnName = "ISDEPARTURE")] //鐢ㄤ簬SqlSugar
- public decimal? Isdeparture { get; set; }
-
- /// <summary>
- /// 鏄惁涓虹鐞嗕汉鍛�
- /// </summary>
- [Column("ISMANAGER")]
- [SugarColumn(ColumnName = "ISMANAGER")] //鐢ㄤ簬SqlSugar
- public decimal? Ismanager { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("LASTLOGIN")]
- [SugarColumn(ColumnName = "LASTLOGIN")] //鐢ㄤ簬SqlSugar
- public DateTime? Lastlogin { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏈�鍚庢洿鏂颁汉闀垮害涓嶈兘瓒呭嚭30")]
- public string LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏈�鍚庢洿鏂版棩鏈�
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// 1涓哄紑鍙戠敤鎴凤紝0涓轰竴鑸搷浣滅敤鎴�
- /// </summary>
- [Column("LEVER")]
- [SugarColumn(ColumnName = "LEVER")] //鐢ㄤ簬SqlSugar
- public decimal? Lever { get; set; }
-
- /// <summary>
- /// 鏈夋晥鏈�
- /// </summary>
- [Column("PERIOD_VALIDITY")]
- [SugarColumn(ColumnName = "PERIOD_VALIDITY")] //鐢ㄤ簬SqlSugar
- public DateTime? PeriodValidity { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("PRD")]
- [SugarColumn(ColumnName = "PRD")] //鐢ㄤ簬SqlSugar
- public decimal? Prd { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("PSW_EDIT_TIME")]
- [SugarColumn(ColumnName = "PSW_EDIT_TIME")] //鐢ㄤ簬SqlSugar
- public DateTime? PswEditTime { get; set; }
-
- /// <summary>
- /// 璐ㄩ噺妯″潡棣栦欢纭-鍘熷洜鍒嗘瀽璐ｄ换浜�
- /// </summary>
- [Column("QM_USER")]
- [SugarColumn(ColumnName = "QM_USER")] //鐢ㄤ簬SqlSugar
- public decimal? QmUser { get; set; }
-
- /// <summary>
- /// 瑙掕壊
- /// </summary>
- [Column("ROLEID")]
- [SugarColumn(ColumnName = "ROLEID")] //鐢ㄤ簬SqlSugar
- public decimal? Roleid { get; set; }
-
- /// <summary>
- /// 鏄惁涓轰复鏃剁敤鎴�
- /// </summary>
- [Column("STATUS")]
- [SugarColumn(ColumnName = "STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? Status { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("TET")]
- [SugarColumn(ColumnName = "TET")] //鐢ㄤ簬SqlSugar
- public decimal? Tet { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
deleted file mode 100644
index 869e76a..0000000
--- a/MES.Service/Modes/Womcaa.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸ュ崟琛�
-/// </summary>
-[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>
- [SugarColumn(ColumnName = "CAA001")]
- public string? Caa001 { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷 1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� SCDD03_SYS2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 SCDD04_SYS3銆佸伐搴忔眹鎶�-鏅�氱敓浜�
- /// SCDD01_SYS4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇 SCDD02_SYS
- /// </summary>
- [SugarColumn(ColumnName = "CAA004")]
- public string? Caa004 { get; set; }
-
- /// <summary>
- /// 寮�鍗曟棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "CAA005")]
- public string? Caa005 { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CAA006")]
- public string? Caa006 { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "CAA009")]
- public string? Caa009 { get; set; }
-
- /// <summary>
- /// 棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "CAA010")]
- public string? Caa010 { get; set; }
-
- /// <summary>
- /// 棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA011")]
- public string? Caa011 { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA012")]
- public decimal? Caa012 { get; set; }
-
- /// <summary>
- /// BOM鐗堟
- /// </summary>
- [SugarColumn(ColumnName = "CAA013")]
- public string? Caa013 { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA015")]
- public string? Caa015 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "CAA016")]
- public string? Caa016 { get; set; }
-
- /// <summary>
- /// 宸叉帓鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA017")]
- public decimal? Caa017 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟ID
- /// </summary>
- [SugarColumn(ColumnName = "CAA018")]
- public decimal? Caa018 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA019")]
- public decimal? Caa019 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
- /// </summary>
- [SugarColumn(ColumnName = "CAA020")]
- public string? Caa020 { get; set; }
-
- /// <summary>
- /// 宸ヤ綔杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA021")]
- public string? Caa021 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FSTATUS")]
- public decimal? Fstatus { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_USER")]
- public string? CheckUser { get; set; }
-
- /// <summary>
- /// 鏈帓鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA022")]
- public decimal? Caa022 { get; set; }
-
- /// <summary>
- /// 鐘舵�� 瀹屽伐锛屾湭瀹屽伐
- /// </summary>
- [SugarColumn(ColumnName = "CAA023")]
- public string? Caa023 { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "CAA024")]
- public decimal? Caa024 { get; set; }
-
- /// <summary>
- /// 宸ヨ壓璺嚎
- /// </summary>
- [SugarColumn(ColumnName = "ROUTING_ID")]
- public string? RoutingId { get; set; }
-
- /// <summary>
- /// 浜х嚎
- /// </summary>
- [SugarColumn(ColumnName = "WORK_SHOP_ID")]
- public string? WorkShopId { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string? CreateDate { get; set; }
-
- /// <summary>
- /// 璁″垝缁�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_GROUP_ID")]
- public string? WorkGroupId { get; set; }
-
- /// <summary>
- /// 璁″垝鍛�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_ID")]
- public string? PlanId { get; set; }
-
- /// <summary>
- /// 鍏ュ簱涓婇檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITH")]
- public string? StockInlimith { get; set; }
-
- /// <summary>
- /// 鍏ュ簱涓嬮檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITL")]
- public string? StockInlimitl { 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 = "CAA015_HEAD")]
- public string? Caa015Head { get; set; }
-
- /// <summary>
- /// 鐢熸垚鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_TYPE")]
- public string? CreateType { get; set; }
-
- /// <summary>
- /// 婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
- public string? SrcBillType { get; set; }
-
- /// <summary>
- /// 婧愬崟缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_NO")]
- public string? SrcBillNo { get; set; }
-
- /// <summary>
- /// 婧愬崟鍒嗗綍琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
- public string? SrcBillentryseq { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹彿
- /// </summary>
- [SugarColumn(ColumnName = "SALE_ORDER_NO")]
- public string? SaleOrderNo { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹鍙�
- /// </summary>
- [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; }
-
-
- /// <summary>
- /// 鐢熶骇缁勭粐ID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_SCZZ")]
- public string? EerSczz { get; set; }
-
- /// <summary>
- /// 濮旀墭缁勭粐ID
- /// </summary>
- [SugarColumn(ColumnName = "ERP_WTZZ")]
- public string? EerWtzz { get; set; }
-
- /// <summary>
- /// 涓讳骇鍝佺紪鐮�
- /// </summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
- public string? MainProductNo { get; set; }
-
- /// <summary>
- /// 涓讳骇鍝佺敓浜ф暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
- public string? MainProductQty { get; set; }
-
- /// <summary>
- /// 瀹㈡埛璐у彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
- public string? CustomerItemNumber { get; set; }
-
- /// <summary>
- /// 鍖呰鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
- public string? PackingListNumber { get; set; }
-
- /// <summary>
- /// 瀹㈡埛鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NAME")]
- public string? CustomerName { get; set; }
-
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER")]
- public string? Customer { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
deleted file mode 100644
index 320f88b..0000000
--- a/MES.Service/Modes/Womcab.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-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澶碔D
- ///</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>
- /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
- ///</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; }
-
- /// <summary>
- /// 鍥哄畾鎹熻��
- ///</summary>
- [SugarColumn(ColumnName = "SCRAPQTY")]
- public string Scrapqty { get; set; }
-
- /// <summary>
- /// 鍙樺姩鎹熻�楃巼
- ///</summary>
- [SugarColumn(ColumnName = "SCRAPRATE")]
- public string Scraprate { get; set; }
-
- /// <summary>
- /// 瀹㈡埛璐у彿
- ///</summary>
- [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
- public string CustomerItemNumber { get; set; }
-
- /// <summary>
- /// 鍖呰鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
- public string PackingListNumber { get; set; }
-
- /// <summary>
- /// 涓讳骇鍝�
- ///</summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT")]
- public string MainProduct { get; set; }
-
- /// <summary>
- /// 涓讳骇鍝佹暟閲�
- ///</summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
- public decimal? MainProductQty { get; set; }
-
- /// <summary>
- /// 鐖堕」鐗╂枡鍚嶇О
- ///</summary>
- [SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
- public string ParentItemName { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗�
- ///</summary>
- [SugarColumn(ColumnName = "FSALEORDERNO")]
- public string Fsaleorderno { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womdaa.cs b/MES.Service/Modes/Womdaa.cs
deleted file mode 100644
index 8f613a1..0000000
--- a/MES.Service/Modes/Womdaa.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸ュ崟鎸囦护琛�
-/// </summary>
-[SugarTable("WOMDAA")]
-public class Womdaa
-{
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, IsIdentity = true)]
- public decimal Id { get; set; }
-
- /// <summary>
- /// PID
- /// </summary>
- [SugarColumn(ColumnName = "PID")]
- public decimal? Pid { get; set; }
-
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "DAA001")]
- public string? Daa001 { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DAA002")]
- public string? Daa002 { get; set; }
-
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DAA003")]
- public string? Daa003 { get; set; }
-
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "DAA004")]
- public string? Daa004 { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "DAA005")]
- public string? Daa005 { get; set; }
-
- /// <summary>
- /// 棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "DAA006")]
- public DateTime? Daa006 { get; set; }
-
- /// <summary>
- /// 棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DAA007")]
- public DateTime? Daa007 { get; set; }
-
- /// <summary>
- /// 宸ュ崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA008")]
- public decimal? Daa008 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "DAA009")]
- public string? Daa009 { get; set; }
-
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA010")]
- public decimal? Daa010 { get; set; }
-
- /// <summary>
- /// 宸茬敓浜ч噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA011")]
- public decimal? Daa011 { get; set; }
-
- /// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DAA012")]
- public decimal? Daa012 { get; set; }
-
- /// <summary>
- /// 宸ヤ綔杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "DAA013")]
- public string? Daa013 { get; set; }
-
- /// <summary>
- /// 鎶曟枡鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DAA014")]
- public string? Daa014 { get; set; }
-
- /// <summary>
- /// 鐢熶骇绾垮埆
- /// </summary>
- [SugarColumn(ColumnName = "DAA015")]
- public string? Daa015 { get; set; }
-
- /// <summary>
- /// 瀹為檯寮�宸ユ棩
- /// </summary>
- [SugarColumn(ColumnName = "DAA016")]
- public DateTime? Daa016 { get; set; }
-
- /// <summary>
- /// 瀹為檯瀹屽伐鏃�
- /// </summary>
- [SugarColumn(ColumnName = "DAA017")]
- public DateTime? Daa017 { get; set; }
-
- /// <summary>
- /// 宸ュ崟鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "DAA018")]
- public string? Daa018 { get; set; }
-
- /// <summary>
- /// 榻愬鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "DAA019")]
- public string? Daa019 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FSTATUS")]
- public decimal? Fstatus { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_USER")]
- public string? CheckUser { get; set; }
-
- /// <summary>
- /// 绾垮埆缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "DAA020")]
- public string? Daa020 { get; set; }
-
- /// <summary>
- /// 浠诲姟鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "DAA021")]
- public string? Daa021 { get; set; }
-
- /// <summary>
- /// 閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
- /// </summary>
- [SugarColumn(ColumnName = "DAA022")]
- public decimal? Daa022 { get; set; }
-
- /// <summary>
- /// 鐢熶骇搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "DAA023")]
- public decimal? Daa023 { get; set; }
-
- /// <summary>
- /// 鎺掍骇鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "DAA024")]
- public string? Daa024 { get; set; }
-
- /// <summary>
- /// 棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
- /// </summary>
- [SugarColumn(ColumnName = "DAA025")]
- public string? Daa025 { get; set; }
-
- /// <summary>
- /// 棣栦欢妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "DAA026")]
- public string? Daa026 { get; set; }
-
- /// <summary>
- /// 宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
- /// </summary>
- [SugarColumn(ColumnName = "IS_REPORTCHECK")]
- public decimal? IsReportcheck { get; set; }
-
- /// <summary>
- /// 鎶ユ浜�
- /// </summary>
- [SugarColumn(ColumnName = "USNAME")]
- public string? Usname { get; set; }
-
- /// <summary>
- /// 鎶ユ鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "REPORTTIME")]
- public DateTime? Reporttime { get; set; }
-
- /// <summary>
- /// 鏈哄彴缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "MACHINE_NO")]
- public string? MachineNo { get; set; }
-
- /// <summary>
- /// 澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
- /// </summary>
- [SugarColumn(ColumnName = "DAA027")]
- public decimal? Daa027 { get; set; }
-
- /// <summary>
- /// 澶囨枡瀹屾垚鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "DAA028")]
- public string? Daa028 { get; set; }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
deleted file mode 100644
index 7e4fc9a..0000000
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ /dev/null
@@ -1,209 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesCustomerManager : Repository<MesCustomer>
-{
- public bool Save(ErpCustomer customer)
- {
- var entity = GetSysDepartment(customer);
-
- return UseTransaction(db =>
- {
- switch (customer.Type)
- {
- case "0":
- if (UpdateCustomerStatus(db, entity.Id, "A"))
- return 1;
- break;
- case "1":
- if (UpdateCustomerStatus(db, entity.Id, "B"))
- return 1;
- break;
- case "2":
- if (InsertCustomer(db, entity))
- return 1;
- break;
- case "3":
- if (DeleteCustomer(db, entity.Id))
- return 1;
- break;
- case "4":
- if (InsertOrUpdate(db, entity))
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{customer.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- public bool SaveList(List<ErpCustomer> customers)
- {
- var list = customers.Select(GetSysDepartment).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var customerGroup in groupBy)
- switch (customerGroup.Key)
- {
- case "0":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
- "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
- "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertCustomerBatch(db, customerGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteCustomerBatch(db, customerGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db, customerGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{customerGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- private bool UpdateCustomerStatus(SqlSugarScope db, decimal customerId,
- string status)
- {
- var result = db.Updateable<MesCustomer>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == customerId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertCustomer(SqlSugarScope db, MesCustomer entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteCustomer(SqlSugarScope db, decimal customerId)
- {
- var deleteById = db.Deleteable<MesCustomer>().In(customerId)
- .ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private MesCustomer GetSysDepartment(ErpCustomer customer)
- {
- //ERP鍌宠几鐨勬帴鍙ｆ暩鎿氳綁鎻涚偤MES鏁告摎搴瓧娈�
-
- return new MesCustomer
- {
- Id = Convert.ToDecimal(customer.Id),
- CustNo = customer.FNumber,
- CustSname = customer.FShortName,
- CustName = customer.FName,
- Anred = customer.Fcontact,
- Telf1 = customer.Fmobilephone,
- Fseller = customer.Fseller,
- Fforbidstatus = customer.FForbidStatus,
- Remarks = customer.FDescription,
- FSubsidiary = customer.FUseOrgId,
- Fumbrella = customer.FCreateOrgId,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000",
- DataType = customer.FDocumentStatus
- };
- }
-
- private bool UpdateCustomerStatusBatch(SqlSugarScope db,
- List<MesCustomer> customerList, string status)
- {
- var ids = customerList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesCustomer>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertCustomerBatch(SqlSugarScope db,
- List<MesCustomer> customerList)
- {
- var insertRange = db.Insertable(customerList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteCustomerBatch(SqlSugarScope db,
- List<MesCustomer> customerList)
- {
- var ids = customerList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesCustomer>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, MesCustomer entity)
- {
- var exists = db.Queryable<MesCustomer>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db,
- List<MesCustomer> customerList)
- {
- foreach (var entity in customerList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
deleted file mode 100644
index f495080..0000000
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesDepotsManager : Repository<MesDepots>
-{
- // Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜浠撳簱璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
- public bool Save(ErpDepots depots)
- {
- var entity = GetMesDepots(depots); // 灏� ErpDepots 杞崲涓� MesDepots
- return UseTransaction(db =>
- {
- switch (depots.Type)
- {
- case "0":
- if (UpdateDepotStatus(db, entity.DepotId, "A")) return 1;
-
- break;
- case "1":
- if (UpdateDepotStatus(db, entity.DepotId, "B")) return 1;
-
- break;
- case "2":
- if (InsertDepot(db, entity)) return 1;
-
- break;
- case "3":
- if (DeleteDepot(db, entity.DepotId)) return 1;
-
- break;
- case "4":
- if (InsertOrUpdate(db, entity)) return 1;
-
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{depots.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- // 鏇存柊浠撳簱鐘舵�佺殑鏂规硶
- private bool UpdateDepotStatus(SqlSugarScope db, decimal depotId,
- string status)
- {
- var result = db.Updateable<MesDepots>()
- .SetColumns(s => s.IsNg == status)
- .Where(s => s.DepotId == depotId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎻掑叆鏂颁粨搴撶殑鏂规硶
- private bool InsertDepot(SqlSugarScope db, MesDepots entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("瀹℃牳澶辫触");
- }
-
- // 鍒犻櫎浠撳簱鐨勬柟娉�
- private bool DeleteDepot(SqlSugarScope db, decimal depotId)
- {
- var deleteById = db.Deleteable<MesDepots>().In(depotId)
- .ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍙嶅鏍稿け璐�");
- }
-
- // 鎻掑叆鎴栨洿鏂颁粨搴撶殑鏂规硶
- private bool InsertOrUpdate(SqlSugarScope db, MesDepots entity)
- {
- var exists = db.Queryable<MesDepots>()
- .Any(e => e.DepotId == entity.DepotId);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- // 灏� ErpDepots 瀵硅薄杞崲涓� MesDepots 瀵硅薄鐨勬柟娉�
- private MesDepots GetMesDepots(ErpDepots depots)
- {
- return new MesDepots
- {
- DepotCode = depots.FNumber,
- DepotName = depots.FName,
- DepotId = Convert.ToDecimal(depots.Id),
- IsFkc = depots.FAllowMinusQty,
- CreateBy = depots.FPrincipal,
- Depottype = depots.FStockProperty,
- IsNg = depots.FForbidStatus,
- Zuid = depots.FGroup,
- FSubsidiary = depots.FUseOrgId,
- Fumbrella = depots.FCreateOrgId,
-
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000"
- };
- }
-
- // SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜浠撳簱璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
- public bool SaveList(List<ErpDepots> erpDepots)
- {
- var list = new List<MesDepots>();
- erpDepots.ForEach(s =>
- {
- var entity = GetMesDepots(s); // 灏� ErpDepots 杞崲涓� MesDepots
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- return UseTransaction(db =>
- {
- foreach (var depotsGroup in groupBy)
- switch (depotsGroup.Key)
- {
- case "0":
- if (!UpdateDepotStatusBatch(db, depotsGroup.Value,
- "A")) // 鎵归噺鍚敤浠撳簱
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateDepotStatusBatch(db, depotsGroup.Value,
- "B")) // 鎵归噺绂佺敤浠撳簱
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertDepotBatch(db,
- depotsGroup.Value)) // 鎵归噺鎻掑叆浠撳簱
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteDepotBatch(db,
- depotsGroup.Value)) // 鎵归噺鍒犻櫎浠撳簱
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db,
- depotsGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴�
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{depotsGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- // 鎵归噺鏇存柊浠撳簱鐘舵�佺殑鏂规硶
- private bool UpdateDepotStatusBatch(SqlSugarScope db,
- List<MesDepots> depotList, string status)
- {
- var ids = depotList.Select(it => it.DepotId).ToArray();
- var result = db.Updateable<MesDepots>()
- .SetColumns(s => s.IsNg == status)
- .Where(s => ids.Contains(s.DepotId)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎵归噺鎻掑叆浠撳簱鐨勬柟娉�
- private bool InsertDepotBatch(SqlSugarScope db,
- List<MesDepots> depotList)
- {
- var insertRange = db.Insertable(depotList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("瀹℃牳澶辫触");
- }
-
- // 鎵归噺鍒犻櫎浠撳簱鐨勬柟娉�
- private bool DeleteDepotBatch(SqlSugarScope db,
- List<MesDepots> depotList)
- {
- var ids = depotList.Select(it => it.DepotId).ToArray();
- var deleteByIds =
- db.Deleteable<MesDepots>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍙嶅鏍稿け璐�");
- }
-
- // 鎵归噺鎻掑叆鎴栨洿鏂颁粨搴撶殑鏂规硶
- private bool InsertOrUpdateBatch(SqlSugarScope db,
- List<MesDepots> depotList)
- {
- foreach (var entity in depotList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
deleted file mode 100644
index 58af914..0000000
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-
-namespace MES.Service.service.BasicData;
-
-public class MesItemTypeManager : Repository<MesItemType>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- public bool Save(ErpItemType customer)
- {
- var entity = GetMesItemType(customer);
-
- try
- {
- switch (customer.Type)
- {
- case "0":
- return InsertItemType(entity);
- case "1":
- return DeleteItemType(entity.Id);
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{customer.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
- }
- catch (Exception ex)
- {
- throw new ApplicationException($"鎿嶄綔澶辫触: {ex.Message}", ex);
- }
- }
-
- private bool InsertItemType(MesItemType entity)
- {
- var insert = base.Insert(entity);
- if (insert)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemType(decimal id)
- {
- var deleteById = base.DeleteById(id);
- if (deleteById)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private MesItemType GetMesItemType(ErpItemType department)
- {
- return new MesItemType
- {
- Id = Convert.ToDecimal(department.Id),
- Pgroup = department.FPARENTID,
- Tcode = department.FNumber,
- Tname = department.FName,
- Description = department.FDescription,
- //FSubsidiary = department.FSubsidiary,
- //Fumbrella = department.Fumbrella,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000"
- };
- }
-
- public bool SaveList(List<ErpItemType> departments)
- {
- var list = new List<MesItemType>();
- departments.ForEach(s =>
- {
- var entity = GetMesItemType(s);
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- var result = new List<bool>();
-
- foreach (var itemTypeGroup in groupBy)
- try
- {
- switch (itemTypeGroup.Key)
- {
- case "0":
- result.Add(InsertItemTypeBatch(itemTypeGroup.Value));
- break;
- case "1":
- result.Add(DeleteItemTypeBatch(itemTypeGroup.Value));
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemTypeGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
- }
- catch (Exception ex)
- {
- throw new ApplicationException($"鎵归噺鎿嶄綔澶辫触: {ex.Message}", ex);
- }
-
- if (result.All(b => b))
- return true;
-
- throw new NotImplementedException("鎺ュ彛鎵ц澶辫触");
- }
-
- private bool InsertItemTypeBatch(List<MesItemType> itemTypeList)
- {
- var insertRange = base.InsertRange(itemTypeList);
- if (insertRange)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemTypeBatch(List<MesItemType> itemTypeList)
- {
- var ids = itemTypeList.Select(it => it.Id).ToArray();
- var deleteByIds =
- base.DeleteByIds(ids.Select(d => (dynamic)d).ToArray());
- if (deleteByIds)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
deleted file mode 100644
index 16761de..0000000
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesItemsManager : Repository<MesItems>
-{
- public bool Save(ErpItems item)
- {
- var entity = GetMesItems(item);
-
- return UseTransaction(db =>
- {
- switch (item.Type)
- {
- case "0":
- if (UpdateItemStatus(db, entity.Id, "A"))
- return 1;
- break;
- case "1":
- if (UpdateItemStatus(db, entity.Id, "B"))
- return 1;
- break;
- case "2":
- if (InsertItem(db, entity))
- return 1;
- break;
- case "3":
- if (DeleteItem(db, entity.Id))
- return 1;
- break;
- case "4":
- if (InsertOrUpdate(db, entity))
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- public bool SaveList(List<ErpItems> items)
- {
- var list = items.Select(GetMesItems).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var itemGroup in groupBy)
- switch (itemGroup.Key)
- {
- case "0":
- if (!UpdateItemStatusBatch(db, itemGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateItemStatusBatch(db, itemGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- private bool UpdateItemStatus(SqlSugarScope db, decimal itemId,
- string status)
- {
- var result = db.Updateable<MesItems>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == itemId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertItem(SqlSugarScope db, MesItems entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItem(SqlSugarScope db, decimal itemId)
- {
- var deleteById = db.Deleteable<MesItems>().In(itemId).ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private MesItems GetMesItems(ErpItems item)
- {
- return new MesItems
- {
- Id = Convert.ToDecimal(item.Id),
- ItemNo = item.FNumber,
- ItemName = item.FName,
- ItemModel = item.FSpecification,
- ItemUnit = item.FBaseUnitId,
- Lowlimit = item.FSafeStock,
- Highlimit = item.FMaxStock,
- PrdPack = item.FMinPackCount,
- DepotCode = item.FStockId,
- Fmaterialgroup = item.FMaterialGroup,
- Remarks = item.FDescription,
- Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
- Fissuetype = item.FIssueType,
- Fisbatchmanage = item.FIsBatchManage,
- Fpurchaserid = item.FPurchaserId,
- Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
- Storeunit = item.FStoreUnitID,
- Saleunit = item.FSaleUnitId,
- Fforbidstatus = item.FForbidStatus,
- MaterialProperti = item.FErpClsID,
- ProductionWorkshop = item.FWorkShopId,
- ProduceUnit = item.FPRODUCEUNITID,
- SubconUnit = item.FSUBCONUNITID,
- FSubsidiary = item.FUseOrgId,
- Fumbrella = item.FCreateOrgId,
- FLOSSPERCENT = item.FLOSSPERCENT,
- FMnemonicCode = item.FMnemonicCode,
- FExpPeriod = item.FExpPeriod,
- LastupdateDate = DateTime.Now,
- CreateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000",
- ColorName = item.FColor
- };
- }
-
- private bool UpdateItemStatusBatch(SqlSugarScope db,
- List<MesItems> itemList, string status)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesItems>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertItemBatch(SqlSugarScope db, List<MesItems> itemList)
- {
- var insertRange = db.Insertable(itemList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemBatch(SqlSugarScope db, List<MesItems> itemList)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesItems>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, MesItems entity)
- {
- var exists = db.Queryable<MesItems>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesItems> itemList)
- {
- foreach (var entity in itemList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
deleted file mode 100644
index 5cd83e4..0000000
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ /dev/null
@@ -1,220 +0,0 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesPositionManager : Repository<MesPosition>
-{
- // 褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- // Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜宀椾綅璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
- public bool Save(ErpPosition unit)
- {
- var entity = GetMesPosition(unit); // 灏� ErpPosition 杞崲涓� MesPosition
- return UseTransaction(db =>
- {
- switch (unit.Type)
- {
- case "0":
- if (UpdatePositionStatus(db, entity.Id, "A")) // 鍚敤宀椾綅
- return 1;
- break;
- case "1":
- if (UpdatePositionStatus(db, entity.Id, "B")) // 绂佺敤宀椾綅
- return 1;
- break;
- case "2":
- if (InsertOrUpdatePosition(db, entity)) // 鎻掑叆鎴栨洿鏂板矖浣�
- return 1;
- break;
- case "3":
- if (DeletePosition(db, entity.Id)) // 鍒犻櫎宀椾綅
- return 1;
- break;
- case "4":
- if (InsertOrUpdatePosition(db, entity)) // 鎻掑叆鎴栨洿鏂板矖浣�
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- // 鏇存柊宀椾綅鐘舵�佺殑鏂规硶
- private bool UpdatePositionStatus(SqlSugarScope db, decimal positionId,
- string status)
- {
- var result = db.Updateable<MesPosition>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == positionId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎻掑叆鎴栨洿鏂板矖浣嶇殑鏂规硶
- private bool InsertOrUpdatePosition(SqlSugarScope db, MesPosition entity)
- {
- var exists = db.Queryable<MesPosition>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- // 鍒犻櫎宀椾綅鐨勬柟娉�
- private bool DeletePosition(SqlSugarScope db, decimal positionId)
- {
- var deleteById = db.Deleteable<MesPosition>().In(positionId)
- .ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- // 灏� ErpPosition 瀵硅薄杞崲涓� MesPosition 瀵硅薄鐨勬柟娉�
- private MesPosition GetMesPosition(ErpPosition position)
- {
- return new MesPosition
- {
- Id = Convert.ToDecimal(position.Id),
- PositionId = position.FNumber,
- PositionName = position.FName,
- PositionDescription = position.FDESCRIPTIONS,
- Department = position.FDept,
- Fforbidstatus = position.FForbidStatus,
- FUseOrgId = position.FUseOrgId,
- FCreateOrgId = position.FCreateOrgId,
- CreationDate = position.FCreateDate != null
- ? DateTime.ParseExact(position.FCreateDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- DisabledBy = position.FForbidderId,
- DisabledDate = position.FForbidDate != null
- ? DateTime.ParseExact(position.FForbidDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null
- };
- }
-
- // SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜宀椾綅璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
- public bool SaveList(List<ErpPosition> positions)
- {
- var list = new List<MesPosition>();
- positions.ForEach(s =>
- {
- var entity = GetMesPosition(s); // 灏� ErpPosition 杞崲涓� MesPosition
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- return UseTransaction(db =>
- {
- foreach (var positionGroup in groupBy)
- switch (positionGroup.Key)
- {
- case "0":
- if (!UpdatePositionStatusBatch(db, positionGroup.Value,
- "A")) // 鎵归噺鍚敤宀椾綅
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdatePositionStatusBatch(db, positionGroup.Value,
- "B")) // 鎵归噺绂佺敤宀椾綅
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertPositionBatch(db,
- positionGroup.Value)) // 鎵归噺鎻掑叆宀椾綅
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeletePositionBatch(db,
- positionGroup.Value)) // 鎵归噺鍒犻櫎宀椾綅
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdatePositionBatch(db,
- positionGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板矖浣�
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{positionGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- // 鎵归噺鏇存柊宀椾綅鐘舵�佺殑鏂规硶
- private bool UpdatePositionStatusBatch(SqlSugarScope db,
- List<MesPosition> positionList, string status)
- {
- var ids = positionList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesPosition>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎵归噺鎻掑叆宀椾綅鐨勬柟娉�
- private bool InsertPositionBatch(SqlSugarScope db,
- List<MesPosition> positionList)
- {
- var insertRange = db.Insertable(positionList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- // 鎵归噺鍒犻櫎宀椾綅鐨勬柟娉�
- private bool DeletePositionBatch(SqlSugarScope db,
- List<MesPosition> positionList)
- {
- var ids = positionList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesPosition>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- // 鎵归噺鎻掑叆鎴栨洿鏂板矖浣嶇殑鏂规硶
- private bool InsertOrUpdatePositionBatch(SqlSugarScope db,
- List<MesPosition> positionList)
- {
- foreach (var entity in positionList)
- if (!InsertOrUpdatePosition(db, entity))
- return false;
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInDataManager.cs b/MES.Service/service/BasicData/MesRohInDataManager.cs
deleted file mode 100644
index 7385023..0000000
--- a/MES.Service/service/BasicData/MesRohInDataManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesRohInDataManager : Repository<MesRohInData>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesRohInDataManager.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(MesRohInData).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesRohInData(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesRohInData(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesRohInData() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesRohInData(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
deleted file mode 100644
index c6a5935..0000000
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ /dev/null
@@ -1,278 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesRohInManager : Repository<MesRohIn>
-{
- private readonly MesRohInDataManager rohInDataManager = new();
-
- // Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜 RohIn 璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
- public bool Save(RohIn rohIn)
- {
- var rohInErpRohIn = rohIn.ErpRohIn;
- var mesRohIn = GetMesRohIn(rohInErpRohIn);
- var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
-
- return UseTransaction(db =>
- {
- switch (rohInErpRohIn.Type)
- {
- case "2":
- case "4":
- case "5":
- return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
- case "3":
- return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
- default:
- throw new NotImplementedException(
- $"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷");
- }
- }) > 0;
- }
-
- // 鎻掑叆鏁版嵁鐨勬柟娉�
- private bool InsertData(SqlSugarScope db, MesRohIn mesRohIn,
- List<MesRohInData> mesRohInDatas, string FBILLTYPE)
- {
- switch (FBILLTYPE)
- {
- case "A":
- {
- var 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 insert = base.Insert(mesRohIn);
- var insertRange =
- rohInDataManager.InsertRange(mesRohInDatas);
-
- if (insert && insertRange) return true;
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- 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;
-
- if (update && insertOrUpdate) return true;
- throw new NotImplementedException("鏇存柊澶辫触");
- }
-
- // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, MesRohIn mesRohIn,
- List<MesRohInData> mesRohInDatas)
- {
- if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id);
-
- if (mesRohInDatas.Count > 0)
- db.Deleteable<MesRohInData>()
- .Where(s => s.ErpId == mesRohIn.EbelnK3id).ExecuteCommand();
-
- var orUpdate = base.Insert(mesRohIn);
- var baOrUpdate = rohInDataManager.InsertRange(mesRohInDatas);
- if (orUpdate && baOrUpdate) return true;
- throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
- }
-
- // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
- public bool SaveList(List<RohIn> rohIns)
- {
- var result = rohIns.Select(Save).ToList();
- return result.All(b => b);
- }
-
- // 灏� ErpRohIn 瀵硅薄杞崲涓� MesRohIn 瀵硅薄鐨勬柟娉�
- public MesRohIn GetMesRohIn(ErpRohIn rohIn)
- {
- var eid = Convert.ToDecimal(rohIn.id);
- var mesRohIn = new MesRohIn();
-
- var single = base.GetSingle(it => it.EbelnK3id == eid);
- if (single != null) mesRohIn.Id = single.Id;
-
- mesRohIn.EbelnK3id = eid;
- mesRohIn.BillNo = rohIn.FBillNo;
- mesRohIn.DocumentStatus = rohIn.FDocumentStatus;
- mesRohIn.DocumentType = rohIn.FBillTypeID;
- mesRohIn.BusinessType = rohIn.FBusinessType;
-
- if (rohIn.FDate != null)
- mesRohIn.PurchaseDate = DateTime.ParseExact(rohIn.FDate,
- "yyyy-MM-dd HH:mm:ss", null);
-
- mesRohIn.Supplier = rohIn.FSupplierId;
- mesRohIn.CloseStatus = rohIn.FCloseStatus;
- mesRohIn.PurchaseOrg = rohIn.FPurchaseOrgId;
- mesRohIn.PurchaseDept = rohIn.FPurchaseDeptId;
- mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
- mesRohIn.QtyAcceptance = rohIn.Facctype;
- mesRohIn.Purchaser = rohIn.FPurchaserId;
- //mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
- mesRohIn.SettlementParty = rohIn.FSettleId;
- mesRohIn.PaymentParty = rohIn.FChargeId;
- // mesRohIn.Email = rohIn.FProviderEMail;
- // mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
- mesRohIn.Remarks = rohIn.F_XIFG_Text_qtr1;
- // mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
- mesRohIn.CancellationStatus = rohIn.FCancelStatus;
- mesRohIn.CancellationPerson = rohIn.FCancellerId;
-
- if (rohIn.FCancelDate != null)
- mesRohIn.CancellationDate =
- DateTime.ParseExact(rohIn.FCancelDate,
- "yyyy-MM-dd HH:mm:ss", null);
-
- mesRohIn.CreateBy = rohIn.FCreatorId;
-
- if (rohIn.FCreateDate != null)
- mesRohIn.CreateDate = DateTime.ParseExact(rohIn.FCreateDate,
- "yyyy-MM-dd HH:mm:ss", null);
-
- mesRohIn.LastupdateBy = rohIn.FModifierId;
-
- if (rohIn.FModifyDate != null)
- mesRohIn.LastupdateDate = DateTime.ParseExact(rohIn.FModifyDate,
- "yyyy-MM-dd HH:mm:ss", null);
-
- mesRohIn.ErpCheckBy = rohIn.FApproverId;
- mesRohIn.ErpCheckDate = rohIn.FApproveDate;
- mesRohIn.Changereason = rohIn.FCHANGEREASON;
- mesRohIn.FPREARRIVALDATE = rohIn.FPREARRIVALDATE != null
- ? DateTime.ParseExact(rohIn.FPREARRIVALDATE,
- "yyyy-MM-dd HH:mm:ss", null)
- : null;
-
- mesRohIn.FRECEIVEORGID = rohIn.FRECEIVEORGID;
-
- mesRohIn.remark1 = rohIn.F_XIFG_PrintTimes_qtr;
-
- return mesRohIn;
- }
-
- // 灏� ErpRohinData 瀵硅薄杞崲涓� MesRohInData 瀵硅薄鐨勬柟娉�
- public List<MesRohInData> GetMesRohInDatas(
- List<ErpRohinData> erpRohinDatas, string type)
- {
- return erpRohinDatas.Select(s =>
- {
- var entity = new MesRohInData
- {
- EbelnK3id = Convert.ToDecimal(s.id),
- ErpId = Convert.ToDecimal(s.Eid),
- BillNo = s.FBillNo,
- SalesOrderId = s.F_XIFG_Text_k79,
- OrderLineId = s.FSEQ,
- ItemId = s.FMaterialId,
- PurchaseUnit = s.FUnitId,
- PurchaseQty = Convert.ToDecimal(s.FQty),
- InventoryUnit = s.FStockUnitID,
- 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.Fnote,
- 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,
- DemandOrg = s.FRequireOrgId,
- ReceivingOrg = s.FReceiveOrgId,
- SettlementOrg = s.FEntrySettleOrgId,
- PurchaseOrderLineNumber = s.FSEQ,
- Demand = s.FRequireOrgId,
- Receiving = s.FReceiveOrgId,
- Settlement = s.FSETTLEORGID,
- DemandDepartment = s.FRequireDeptId,
- ReceivingDepartment = s.FReceiveDeptId,
- FPREARRIVALDATE = s.FPREARRIVALDATE != null
- ? DateTime.ParseExact(s.FPREARRIVALDATE,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- Remark1 = s.F_XIFG_Text_ne1,
- Remark2 = s.F_XIFG_Text_6oq,
- Remark3 = s.F_XIFG_Base_c1c,
- Remark4 = s.F_XIFG_Text_qtr4,
- FdemandbillnoLine = s.FdemandbillnoLine,
- ElectricalProductModel = s.ElectricalProductModel,
- ElectricalProductName = s.ElectricalProductName
- };
-
- var single = rohInDataManager.GetSingle(it =>
- it.EbelnK3id == entity.EbelnK3id);
- if (single != null) entity.Id = single.Id;
-
- return entity;
- }).ToList();
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
deleted file mode 100644
index 42269b8..0000000
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ /dev/null
@@ -1,281 +0,0 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesStaffManager : Repository<MesStaff>
-{
- // Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜鍛樺伐璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
- public bool Save(ErpStaff unit)
- {
- var entity = GetMesStaff(unit); // 灏� ErpStaff 杞崲涓� MesStaff
- var sysUser = GetUser(unit); // 鑾峰彇 SysUser 瀹炰緥
-
- return UseTransaction(db =>
- {
- switch (unit.Type)
- {
- case "0":
- if (UpdateStaffStatus(db, entity.Id, "A")) // 鍚敤鍛樺伐
- return 1;
- break;
- case "1":
- if (UpdateStaffStatus(db, entity.Id, "B")) // 绂佺敤鍛樺伐
- return 1;
- break;
- case "2":
- case "4":
- if (InsertOrUpdateStaff(db, sysUser, entity)) // 鎻掑叆鎴栨洿鏂板憳宸�
- return 1;
- break;
- case "3":
- if (DeleteStaff(db, sysUser, entity.Id)) // 鍒犻櫎鍛樺伐
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- // 鏇存柊鍛樺伐鐘舵�佺殑鏂规硶
- private bool UpdateStaffStatus(SqlSugarScope db, decimal staffId,
- string status)
- {
- var result = db.Updateable<MesStaff>()
- .SetColumns(s => s.FforbidStatus == status)
- .Where(s => s.Id == staffId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
- private bool InsertOrUpdateStaff(SqlSugarScope db, SysUser sysUser,
- MesStaff entity)
- {
- var exists = db.Queryable<SysUser>().Any(u => u.Sid == sysUser.Sid);
- 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)
- .ExecuteCommand();
- if (updateUser > 0)
- {
- var updateStaff = db.Updateable(entity).ExecuteCommand();
- if (updateStaff > 0)
- return true;
- }
- }
- else
- {
- var insertUser = db.Insertable(sysUser).ExecuteCommand();
- if (insertUser > 0)
- {
- var insertStaff = db.Insertable(entity).ExecuteCommand();
- if (insertStaff > 0)
- return true;
- }
- }
-
- return false;
- }
-
- // 鍒犻櫎鍛樺伐鐨勬柟娉�
- private bool DeleteStaff(SqlSugarScope db, SysUser sysUser, decimal staffId)
- {
- var deleteUser = db.Deleteable<SysUser>()
- .Where(s => s.Sid == sysUser.Sid).ExecuteCommand();
- if (deleteUser > 0)
- {
- var deleteStaff =
- db.Deleteable<MesStaff>().In(staffId).ExecuteCommand();
- if (deleteStaff > 0)
- return true;
- }
-
- throw new NotImplementedException("鍙嶅鏍稿け璐�");
- }
-
- // 灏� ErpStaff 瀵硅薄杞崲涓� MesStaff 瀵硅薄鐨勬柟娉�
- private MesStaff GetMesStaff(ErpStaff staff)
- {
- var entity = new MesStaff
- {
- Id = Convert.ToDecimal(staff.Id),
- StaffNo = staff.FStaffNumber,
- StaffName = staff.FName,
- DepartmentName = staff.FPostDept,
- PositionName = staff.FPost,
- PhoneNumber = staff.FMobile,
- Remark = staff.FDescription,
- FforbidStatus = staff.FForbidStatus,
- FSubsidiary = staff.FUSEORGID,
- Fumbrella = staff.FCREATEORGID,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now
- };
-
- if (staff.FStaffStartDate != null)
- entity.StartDate = DateTime.ParseExact(staff.FStaffStartDate,
- "yyyy-MM-dd HH:mm:ss", null);
-
- return entity;
- }
-
- // 灏� ErpStaff 瀵硅薄杞崲涓� SysUser 瀵硅薄鐨勬柟娉�
- private SysUser GetUser(ErpStaff staff)
- {
- return new SysUser
- {
- Sid = Convert.ToDecimal(staff.Id),
- Fcode = staff.FStaffNumber,
- Fname = staff.FName,
- Fpassword = "8+()./,", // 鍒濆瀵嗙爜
- Fsystem = "瀹佹尝鍒╃壒鑸�",
- Lever = 0,
- Fcompany = "1000",
- Ffactory = "1000",
- DelFlag = 0,
- Ismanager = 0,
- Isacq = 0,
- ExpField9 = "1020",
- QmUser = 0,
- Status = 0,
- Isdeparture = 0,
- CheckFlag = 0,
- ExpFiel12 = 0,
- Dev = 0,
- Tet = 0,
- Prd = 1
- };
- }
-
- // SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜鍛樺伐璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
- public bool SaveList(List<ErpStaff> departments)
- {
- var list = new List<MesStaff>();
- var userList = new List<SysUser>();
-
- departments.ForEach(s =>
- {
- var entity = GetMesStaff(s);
- entity.Type = s.Type;
- list.Add(entity);
-
- var sysUser = GetUser(s);
- sysUser.Type = s.Type;
- userList.Add(sysUser);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- return UseTransaction(db =>
- {
- foreach (var staffGroup in groupBy)
- switch (staffGroup.Key)
- {
- case "0":
- if (!UpdateStaffStatusBatch(db, staffGroup.Value,
- "A")) // 鎵归噺鍚敤鍛樺伐
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateStaffStatusBatch(db, staffGroup.Value,
- "B")) // 鎵归噺绂佺敤鍛樺伐
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertStaffBatch(db, userList,
- staffGroup.Value)) // 鎵归噺鎻掑叆鍛樺伐
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteStaffBatch(db, userList,
- staffGroup.Value)) // 鎵归噺鍒犻櫎鍛樺伐
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db, userList,
- staffGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸�
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{staffGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- // 鎵归噺鏇存柊鍛樺伐鐘舵�佺殑鏂规硶
- private bool UpdateStaffStatusBatch(SqlSugarScope db,
- List<MesStaff> staffList, string status)
- {
- var ids = staffList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesStaff>()
- .SetColumns(s => s.FforbidStatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎵归噺鎻掑叆鍛樺伐鐨勬柟娉�
- private bool InsertStaffBatch(SqlSugarScope db, List<SysUser> userList,
- List<MesStaff> staffList)
- {
- var userInsert = userList.FindAll(s => s.Type == "INSERT");
- var executeCommand = db.Insertable(userInsert).ExecuteCommand();
- if (executeCommand > 0)
- if (db.Insertable(staffList).ExecuteCommand() > 0)
- return true;
-
- throw new ArgumentNullException("瀹℃牳澶辫触");
- }
-
- // 鎵归噺鍒犻櫎鍛樺伐鐨勬柟娉�
- private bool DeleteStaffBatch(SqlSugarScope db, List<SysUser> userList,
- List<MesStaff> staffList)
- {
- var sid = userList.FindAll(s => s.Type == "DELETE").Select(s => s.Sid)
- .ToArray();
- var result = db.Deleteable<SysUser>()
- .Where(s => sid.Contains(s.Sid)).ExecuteCommand();
-
- if (result > 0)
- {
- var ids = staffList.Select(it => it.Id).ToArray();
- if (db.Deleteable<MesStaff>().In(ids).ExecuteCommand() > 0)
- return true;
- }
-
- throw new ArgumentNullException("鍙嶅鏍稿け璐�");
- }
-
- // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
- private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList,
- List<MesStaff> staffList)
- {
- foreach (var sysUser in userList)
- {
- var entity = staffList.First(s => s.Id == sysUser.Sid);
- if (!InsertOrUpdateStaff(db, sysUser, entity)) return false;
- }
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
deleted file mode 100644
index 71a9cbf..0000000
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesSupplierManager : Repository<MesSupplier>
-{
- public bool Save(ErpSupplier unit)
- {
- var entity = GetMesSupplier(unit);
-
- return UseTransaction(db =>
- {
- switch (unit.Type)
- {
- case "0":
- if (UpdateSupplierStatus(db, entity.Id, "A"))
- return 1;
- break;
- case "1":
- if (UpdateSupplierStatus(db, entity.Id, "B"))
- return 1;
- break;
- case "2":
- if (InsertSupplier(db, entity))
- return 1;
- break;
- case "3":
- if (DeleteSupplier(entity.Id))
- return 1;
- break;
- case "4":
- if (InsertOrUpdate(db, entity))
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- public bool SaveList(List<ErpSupplier> suppliers)
- {
- var list = suppliers.Select(GetMesSupplier).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var supplierGroup in groupBy)
- switch (supplierGroup.Key)
- {
- case "0":
- if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,
- "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateSupplierStatusBatch(db, supplierGroup.Value,
- "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertSupplierBatch(db, supplierGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteSupplierBatch(db, supplierGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db, supplierGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{supplierGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- private bool UpdateSupplierStatus(SqlSugarScope db, decimal supplierId,
- string status)
- {
- var result = db.Updateable<MesSupplier>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == supplierId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertSupplier(SqlSugarScope db, MesSupplier entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteSupplier(decimal supplierId)
- {
- if (base.DeleteById(supplierId)) return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private MesSupplier GetMesSupplier(ErpSupplier supplier)
- {
- return new MesSupplier
- {
- Id = Convert.ToDecimal(supplier.Id),
- SuppNo = supplier.FNumber,
- SuppSname = supplier.FShortName,
- SuppName = supplier.FName,
- Lxr = supplier.FContact,
- Telf1 = supplier.FTel,
- Fstaffid = supplier.FStaffId,
- Fforbidstatus = supplier.FForbidStatus,
- type = supplier.Type,
- Remarks = supplier.FDescription,
- FSubsidiary = supplier.FUseOrgId,
- Fumbrella = supplier.FCreateOrgId,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000"
- };
- }
-
- private bool UpdateSupplierStatusBatch(SqlSugarScope db,
- List<MesSupplier> supplierList, string status)
- {
- var ids = supplierList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesSupplier>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertSupplierBatch(SqlSugarScope db,
- List<MesSupplier> supplierList)
- {
- var insertRange = db.Insertable(supplierList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteSupplierBatch(SqlSugarScope db,
- List<MesSupplier> supplierList)
- {
- var ids = supplierList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesSupplier>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, MesSupplier entity)
- {
- var exists = db.Queryable<MesSupplier>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db,
- List<MesSupplier> supplierList)
- {
- foreach (var entity in supplierList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
deleted file mode 100644
index 5e71919..0000000
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class MesUnitManager : Repository<MesUnit>
-{
- public bool Save(ErpUnit unit)
- {
- var entity = GetMesUnit(unit);
-
- return UseTransaction(db =>
- {
- switch (unit.Type)
- {
- case "0":
- if (UpdateUnitStatus(db, entity.Id, "A"))
- return 1;
- break;
- case "1":
- if (UpdateUnitStatus(db, entity.Id, "B"))
- return 1;
- break;
- case "2":
- if (InsertUnit(db, entity))
- return 1;
- break;
- case "3":
- if (DeleteUnit(db, entity.Id))
- return 1;
- break;
- case "4":
- if (InsertOrUpdate(db, entity))
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- public bool SaveList(List<ErpUnit> units)
- {
- var list = units.Select(GetMesUnit).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var unitGroup in groupBy)
- switch (unitGroup.Key)
- {
- case "0":
- if (!UpdateUnitStatusBatch(db, unitGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateUnitStatusBatch(db, unitGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertUnitBatch(db, unitGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteUnitBatch(db, unitGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db, unitGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{unitGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- private bool UpdateUnitStatus(SqlSugarScope db, decimal unitId,
- string status)
- {
- var result = db.Updateable<MesUnit>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == unitId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertUnit(SqlSugarScope db, MesUnit entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteUnit(SqlSugarScope db, decimal unitId)
- {
- var deleteById = db.Deleteable<MesUnit>().In(unitId).ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private MesUnit GetMesUnit(ErpUnit unit)
- {
- return new MesUnit
- {
- Id = Convert.ToDecimal(unit.Id),
- Fnumber = unit.FNumber,
- Fname = unit.FName,
- Funitgroupid = unit.FUnitGroupId,
- Fconvertdenominator = unit.FConvertDenominator,
- Fcurrentunitid = unit.FCurrentUnitId,
- Fconvertnumerator = unit.FConvertNumerator,
- Fbaseunit = unit.FBaseUnit,
- Froundtype = unit.FRoundType,
- Fprecision = unit.FPrecision,
- Fdescription = unit.FDescription,
- Fforbidstatus = unit.FForbidStatus,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000"
- };
- }
-
- private bool UpdateUnitStatusBatch(SqlSugarScope db, List<MesUnit> unitList,
- string status)
- {
- var ids = unitList.Select(it => it.Id).ToArray();
- var result = db.Updateable<MesUnit>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- var insertRange = db.Insertable(unitList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteUnitBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- var ids = unitList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<MesUnit>().In(ids).ExecuteCommand();
- return deleteByIds > 0;
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, MesUnit entity)
- {
- var exists = db.Queryable<MesUnit>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db, List<MesUnit> unitList)
- {
- foreach (var entity in unitList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
deleted file mode 100644
index 94ad07e..0000000
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
-using MES.Service.Modes;
-using MES.Service.Dto.webApi;
-using System.Xml.Linq;
-
-namespace MES.Service.service;
-
-public class OrganizeManager : Repository<Organize>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //Mesorganization
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 OrganizeManager.cs
- public bool Save(ErpOrganize item)
- {
- var entity = GetOrganize(item);
-
- return UseTransaction(db =>
- {
- switch (item.Type)
- {
- case "0":
- if (UpdateOrganizetatus(db, entity.Id, "A"))
- return 1;
- break;
- case "1":
- if (UpdateOrganizetatus(db, entity.Id, "B"))
- return 1;
- break;
- case "2":
- if (InsertItem(db, entity))
- return 1;
- break;
- case "3":
- if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
- return 1;
- break;
- case "4":
- if (InsertOrUpdate(db, entity))
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- public bool SaveList(List<ErpOrganize> Organize)
- {
- var list = Organize.Select(GetOrganize).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var itemGroup in groupBy)
- switch (itemGroup.Key)
- {
- case "0":
- if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- private bool UpdateOrganizetatus(SqlSugarScope db, string itemId,
- string status)
- {
- var result = db.Updateable<Organize>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == itemId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertItem(SqlSugarScope db, Organize entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItem(SqlSugarScope db, decimal itemId)
- {
- var deleteById = db.Deleteable<Organize>().In(itemId).ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private Organize GetOrganize(ErpOrganize Organize)
- {
- return new Organize
- {
- Id = Organize.Id,
- Fnumber = Organize.FNumber,
- Fname = Organize.FName,
- Type = Organize.Type,
- FDescription = Organize.FDescription,
- FParentID = Organize.FParentID,
- FCreateDate = Organize.FCreateDate != null
- ? DateTime.ParseExact(Organize.FCreateDate,
- "yyyy-MM-dd HH:mm:ss", null)
- : null,
- FFORBIDORID = Organize.FFORBIDORID,
- FFORBIDDATE = Organize.FFORBIDDATE != null
- ? DateTime.ParseExact(Organize.FFORBIDDATE,
- "yyyy-MM-dd HH:mm:ss", null)
- : null
- };
- }
-
- private bool UpdateOrganizetatusBatch(SqlSugarScope db,
- List<Organize> itemList, string status)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var result = db.Updateable<Organize>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertItemBatch(SqlSugarScope db, List<Organize> itemList)
- {
- var insertRange = db.Insertable(itemList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemBatch(SqlSugarScope db, List<Organize> itemList)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<Organize>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, Organize entity)
- {
- var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db, List<Organize> itemList)
- {
- foreach (var entity in itemList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
-
- #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(), OrderByType.Asc); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- List<IConditionalModel> conModels = new(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel()
- {
- FieldName = typeof(Organize).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal,
- FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
-
- AsQueryable().Where(x => 1 == 1).ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new Organize() { }; //娴嬭瘯鍙傛暟
- var insertArray = new Organize[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new Organize() { }; //娴嬭瘯鍙傛暟
- var updateArray = new Organize[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new Organize() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new Organize() { }; //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new int[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2).ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesOrderDetailManager.cs b/MES.Service/service/BasicData/SalesOrderDetailManager.cs
deleted file mode 100644
index d80f479..0000000
--- a/MES.Service/service/BasicData/SalesOrderDetailManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class SalesOrderDetailManager : Repository<SalesOrderDetail>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesOrderDetailManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
- {
- /*********鏌ヨ*********/
-
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
- {
- FieldName = typeof(SalesOrderDetail).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new SalesOrderDetail(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new SalesOrderDetail(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new SalesOrderDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new SalesOrderDetail(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
deleted file mode 100644
index b466f00..0000000
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class SalesOrderManager : Repository<SalesOrder>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesOrderManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
- {
- /*********鏌ヨ*********/
-
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
- {
- FieldName = typeof(SalesOrder).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new SalesOrder(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new SalesOrder(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new SalesOrder() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new SalesOrder(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs
deleted file mode 100644
index 78d4c7b..0000000
--- a/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class
- SalesReturnNoticeDetailManager : Repository<SalesReturnNoticeDetail>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesReturnNoticeDetailManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
- {
- /*********鏌ヨ*********/
-
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
- {
- FieldName = typeof(SalesReturnNoticeDetail).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new SalesReturnNoticeDetail(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new SalesReturnNoticeDetail(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new SalesReturnNoticeDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new SalesReturnNoticeDetail(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
deleted file mode 100644
index 206f0ea..0000000
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class SalesReturnNoticeManager : Repository<SalesReturnNotice>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesReturnNoticeManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
- {
- /*********鏌ヨ*********/
-
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
- {
- FieldName = typeof(SalesReturnNotice).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new SalesReturnNotice(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new SalesReturnNotice(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new SalesReturnNotice() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new SalesReturnNotice(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/ShipmentDetailManager.cs b/MES.Service/service/BasicData/ShipmentDetailManager.cs
deleted file mode 100644
index 67c9435..0000000
--- a/MES.Service/service/BasicData/ShipmentDetailManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class ShipmentDetailManager : Repository<ShipmentDetail>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 ShipmentDetailManager.cs
-
-
- #region 鏁欏鏂规硶
-
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
- {
- /*********鏌ヨ*********/
-
- var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
- var data2 = base.GetList(); //鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var data6 =
- base.GetPageList(it => 1 == 1, p,
- it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount); //杩斿洖鎬绘暟
-
- var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
- {
- FieldName = typeof(ShipmentDetail).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
- }); //id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
-
- AsQueryable().Where(x => 1 == 1)
- .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new ShipmentDetail(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new ShipmentDetail(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new ShipmentDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new ShipmentDetail(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/ShipmentNoticeManager.cs b/MES.Service/service/BasicData/ShipmentNoticeManager.cs
deleted file mode 100644
index 26380a5..0000000
--- a/MES.Service/service/BasicData/ShipmentNoticeManager.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-
-namespace MES.Service.service.BasicData;
-
-public class ShipmentNoticeManager : Repository<ShipmentNotice>
-{
- private readonly ShipmentDetailManager shipmentDetailManager = new();
-
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- public bool Save(ErpShipment shipment)
- {
- var shipmentNotice = GetShipmentNotice(shipment.ShipmentNotice);
-
- var shipmentDetails = GetShipmentDetails(shipment.ShipmentDetails);
-
- return false;
- }
-
- private ShipmentNotice GetShipmentNotice(ErpShipmentNotice notice)
- {
- 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;
- entity.RepCode = notice.FSalesManID;
-
- return entity;
- }
-
- private List<ShipmentDetail> GetShipmentDetails(
- List<ErpShipmentDetail> shipmentDetails)
- {
- return shipmentDetails.Select(s =>
- {
- var entity = new ShipmentDetail
- {
- ErpId = s.ErpId,
- ErpHeadId = s.ErpHeadId,
- ProdCode = s.FMaterialID,
- ProdName = s.FMaterialName,
- Amount = Convert.ToDouble(s.FAmount),
- UnitPrice = Convert.ToDouble(s.FPrice),
- Quantity = Convert.ToDouble(s.FQty),
- BatchNo = s.FLot,
- Remarks = s.FNoteEntry,
- OrderNo = s.F_UNW_Text_xsddh,
- OrderId = s.FSOEntryId,
- BasePrice = Convert.ToDouble(s.FPrice),
- WarehouseCode = s.FStockID,
- Unit = s.FBaseUnitID
- };
- return entity;
- }).ToList();
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
deleted file mode 100644
index 764532e..0000000
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.BasicData;
-
-public class SysDepartmentManager : Repository<SysDepartment>
-{
- // 褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- // Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
- public bool Save(ErpDepartment department)
- {
- var entity =
- GetSysDepartment(department); // 灏� ErpDepartment 杞崲涓� SysDepartment
-
- return UseTransaction(db =>
- {
- switch (department.Type)
- {
- case "0":
- if (UpdateDepartmentStatus(db, entity.Id, "A")) // 鍚敤閮ㄩ棬
- return 1;
- break;
- case "1":
- if (UpdateDepartmentStatus(db, entity.Id, "B")) // 绂佺敤閮ㄩ棬
- return 1;
- break;
- case "2":
- if (InsertDepartment(db, entity)) // 鎻掑叆鏂伴儴闂�
- return 1;
- break;
- case "3":
- if (DeleteDepartment(db, entity.Id)) // 鍒犻櫎閮ㄩ棬
- return 1;
- break;
- case "4":
- if (InsertOrUpdateDepartment(db, entity)) // 鎻掑叆鎴栨洿鏂伴儴闂�
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{department.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- // 鏇存柊閮ㄩ棬鐘舵�佺殑鏂规硶
- private bool UpdateDepartmentStatus(SqlSugarScope db, decimal departmentId,
- string status)
- {
- var result = db.Updateable<SysDepartment>()
- .SetColumns(s => s.Depextr4 == status)
- .Where(s => s.Id == departmentId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎻掑叆鏂伴儴闂ㄧ殑鏂规硶
- private bool InsertDepartment(SqlSugarScope db, SysDepartment entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- // 鍒犻櫎閮ㄩ棬鐨勬柟娉�
- private bool DeleteDepartment(SqlSugarScope db, decimal departmentId)
- {
- var deleteById = db.Deleteable<SysDepartment>().In(departmentId)
- .ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- // 鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
- private bool InsertOrUpdateDepartment(SqlSugarScope db,
- SysDepartment entity)
- {
- var exists = db.Queryable<SysDepartment>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- // 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
- private SysDepartment GetSysDepartment(ErpDepartment department)
- {
- return new SysDepartment
- {
- Departmentcode = department.FNumber,
- Departmentname = department.FName,
- Departmentid = Convert.ToDecimal(department.Id),
- Id = Convert.ToDecimal(department.Id),
- Depextr1 = department.FDeptProperty,
- Depextr2 = department.FGroup,
- Depextr3 = department.FWIPStockID,
- Depextr4 = department.FForbidStatus,
- FParentID = department.FParentID,
- FSubsidiary = department.FUseOrgId,
- Fumbrella = department.FCreateOrgId,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
- Company = "1000",
- Factory = "1000"
- };
- }
-
- // SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
- public bool SaveList(List<ErpDepartment> departments)
- {
- var list = new List<SysDepartment>();
- departments.ForEach(s =>
- {
- var entity =
- GetSysDepartment(s); // 灏� ErpDepartment 杞崲涓� SysDepartment
- entity.Type = s.Type;
- list.Add(entity);
- });
-
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
- return UseTransaction(db =>
- {
- foreach (var departmentGroup in groupBy)
- switch (departmentGroup.Key)
- {
- case "0":
- if (!UpdateDepartmentStatusBatch(db,
- departmentGroup.Value, "A")) // 鎵归噺鍚敤閮ㄩ棬
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateDepartmentStatusBatch(db,
- departmentGroup.Value, "B")) // 鎵归噺绂佺敤閮ㄩ棬
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertDepartmentBatch(db,
- departmentGroup.Value)) // 鎵归噺鎻掑叆閮ㄩ棬
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteDepartmentBatch(db,
- departmentGroup.Value)) // 鎵归噺鍒犻櫎閮ㄩ棬
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateDepartmentBatch(db,
- departmentGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂�
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{departmentGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- // 鎵归噺鏇存柊閮ㄩ棬鐘舵�佺殑鏂规硶
- private bool UpdateDepartmentStatusBatch(SqlSugarScope db,
- List<SysDepartment> departmentList, string status)
- {
- var ids = departmentList.Select(it => it.Id).ToArray();
- var result = db.Updateable<SysDepartment>()
- .SetColumns(s => s.Depextr4 == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- // 鎵归噺鎻掑叆閮ㄩ棬鐨勬柟娉�
- private bool InsertDepartmentBatch(SqlSugarScope db,
- List<SysDepartment> departmentList)
- {
- var insertRange = db.Insertable(departmentList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- // 鎵归噺鍒犻櫎閮ㄩ棬鐨勬柟娉�
- private bool DeleteDepartmentBatch(SqlSugarScope db,
- List<SysDepartment> departmentList)
- {
- var ids = departmentList.Select(it => it.Id).ToArray();
- var deleteByIds =
- db.Deleteable<SysDepartment>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- // 鎵归噺鎻掑叆鎴栨洿鏂伴儴闂ㄧ殑鏂规硶
- private bool InsertOrUpdateDepartmentBatch(SqlSugarScope db,
- List<SysDepartment> departmentList)
- {
- foreach (var entity in departmentList)
- if (!InsertOrUpdateDepartment(db, entity))
- return false;
-
- return true;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/DemoService.cs b/MES.Service/service/DemoService.cs
deleted file mode 100644
index 205e342..0000000
--- a/MES.Service/service/DemoService.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縰sing System.Data;
-using MES.Service.DB;
-
-namespace MES.Service.service;
-
-public class DemoService
-{
- private static readonly OracleSQLHelper SQLHelper = new();
-
- public DataTable getAll(string deptNo)
- {
- //string sql = string.Format(@"select * from WOMDAA where DEPARTMENT_NO = '{0}'", daa001);
-
- var sql = string.Format(@"SELECT * FROM (
- SELECT t.*, ROWNUM AS row_num
- FROM WOMDAA t
- WHERE DEPARTMENT_NO = '{0}' and ROWNUM <= 50
- )
- WHERE row_num >= 1", deptNo);
-
- if ("ALL".Equals(deptNo))
- sql = @"SELECT * FROM (
- SELECT t.*, ROWNUM AS row_num FROM WOMDAA t WHERE ROWNUM <= 50 ) WHERE row_num >= 1";
- return SQLHelper.ExecuteQuery(sql);
- }
-
- public DataTable getItemById(string id)
- {
- var sql = string.Format(@"select * from WOMDAA where id = '{0}'", id);
- return SQLHelper.ExecuteQuery(sql);
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/GetErpParametersServer.cs b/MES.Service/service/GetErpParametersServer.cs
deleted file mode 100644
index 0c7ab66..0000000
--- a/MES.Service/service/GetErpParametersServer.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-锘縰sing 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 MesInvItemOutsManager _invItemOutsServer =
- 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);
-
- var strings = center.TableName.Split("_");
-
- MessageCenter mesToErp = null;
- var query = new WarehouseQuery();
- switch (center.TableName)
- {
- //閲囪喘鍏ュ簱鍗曞鏍�
- case "MES_INV_ITEM_INS_A":
- //閲囪喘鍏ュ簱鍗曞弽瀹℃牳
- case "MES_INV_ITEM_INS_B":
-
- //鑾峰彇鍒扮被鍨嬶紙瀹℃牳杩樻槸鍙嶅鏍革級
- query.Type = strings[^1];
- //鑾峰彇url涓檮甯︾殑鍙傛暟
- query.id = Convert.ToDecimal(queryParameters["id"]);
- query.billNo = queryParameters["billNo"];
- //閲嶆柊鑾峰彇璇锋眰鐨勬暟鎹�
- mesToErp = _invItemInCDetailsServer.MesToErpParam(query);
- //璧嬪�间富id
- mesToErp.Id = center.Id;
- centers.Add(mesToErp);
-
- //鏇存柊鍓╀笅鐨勮姹傜殑鍙傛暟
- var messageCenter = data[0];
- var json = new JObject
- {
- new JProperty("id", query.id),
- new JProperty("billNo", query.billNo)
- };
- messageCenter.Data = json.ToString();
- centers.Add(messageCenter);
-
- break;
-
- //閲囪喘閫�鏂欏崟瀹℃牳
- case "MES_INV_ITEM_OUTS_A":
- //閲囪喘閫�鏂欏崟鍙嶅鏍�
- case "MES_INV_ITEM_OUTS_B":
-
- //鑾峰彇鍒扮被鍨嬶紙瀹℃牳杩樻槸鍙嶅鏍革級
- query.Type = strings[^1];
- query.id = Convert.ToDecimal(queryParameters["id"]);
- query.billNo = queryParameters["itemOutNo"];
-
- //閲嶆柊鑾峰彇璇锋眰鐨勬暟鎹�
- mesToErp = _invItemOutsServer.MesToErpParam(query);
- //鏇存涓轰富id
- mesToErp.Id = center.Id;
- //娣诲姞鍒拌姹傞泦鍚堜腑
- centers.Add(mesToErp);
-
- //鑾峰彇鍓╀綑鐨勮姹�
- var find = data.FindAll(s => s.Seq != 1);
- var result = new JObject
- {
- new JProperty("id", query.id),
- new JProperty("billNo", query.billNo)
- };
- find.ForEach(s =>
- {
- s.Data = result.ToString();
- centers.Add(s);
- });
- 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; }
-}
\ No newline at end of file
diff --git a/MES.Service/service/LoginService.cs b/MES.Service/service/LoginService.cs
deleted file mode 100644
index be647dc..0000000
--- a/MES.Service/service/LoginService.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-锘縰sing System.Data;
-using System.Text;
-using MES.Service.DB;
-
-namespace MES.Service.service;
-
-public class LoginService
-{
- public static OracleSQLHelper SQLHelper = new();
-
- public DataTable login(string name, string pwd)
- {
- var sql =
- string.Format(@"select * from SYS_USER where FCODE = '{0}'",
- name);
- var dataTable = SQLHelper.ExecuteQuery(sql);
- if (dataTable.Rows.Count <= 0) throw new Exception("鐢ㄦ埛涓嶅瓨鍦�");
-
- var row = dataTable.Rows[0];
- var db_password = row["FPASSWORD"].ToString();
- db_password = ProPass(db_password);
- if (!pwd.Equals(db_password)) throw new Exception("鐢ㄦ埛鍚嶆垨鑰呭瘑鐮侀敊璇�");
-
- return dataTable;
- }
-
- public DataTable getUserMenu(string name)
- {
- var sql = "";
-
- if ("PL017".Equals(name))
- sql = "select PAGE_VIEW,PATH,ICOIMG from MES_SYS_PAGEVIEW";
- else
- sql = string.Format(@"select PAGE_VIEW,PATH,ICOIMG
- from (select PAGE_VIEW,PATH,ICOIMG
- from MES_SYS_GUP_USER a
- join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
- join SYS_USER_ROLE c on to_char(c.ROLEID) = a.ROLEID
- where USERID = (select fid from SYS_USER where FCODE = '{0}')
- union all
- select PAGE_VIEW,PATH,ICOIMG
- from MES_SYS_GUP_USER a
- join MES_SYS_PAGEVIEW b on a.PAGEID = b.ID
- where a.ROLEID = (select FCODE from SYS_USER where FCODE = '{0}'))
- group by PATH, PAGE_VIEW, ICOIMG", name);
-
- return SQLHelper.ExecuteQuery(sql);
- }
-
- public int resetPassword(string newPwd, string name, string pwd)
- {
- login(name, pwd);
- var passwordHash = encryptPass(newPwd);
- var sql = string.Format(
- @"update SYS_USER set FPASSWORD = '{0}' where FCODE = '{1}'",
- passwordHash,
- name);
- return SQLHelper.ExecuteNonQuery(sql);
- }
-
- private string encryptPass(string str)
- {
- var b = Encoding.GetEncoding("iso-8859-1").GetBytes(str);
- var temp = (byte[])b.Clone();
- for (var i = 0; i < b.Length; i++) temp[i] = (byte)(b[i] ^ (8 + 18));
-
- var result =
- 8 + Encoding.GetEncoding("iso-8859-1").GetString(temp);
- return result;
- }
-
-
- private string ProPass(string src)
- {
- var result = "";
- var first = int.Parse(src.Substring(0, 1));
- var src_tem = src.Substring(1);
- var b = Encoding.GetEncoding("iso-8859-1")
- .GetBytes(src_tem);
- var temp = (byte[])b.Clone();
- for (var i = 0; i < b.Length; i++)
- temp[i] = (byte)(temp[i] ^ (first + 18));
-
- result = Encoding.GetEncoding("iso-8859-1")
- .GetString(temp);
- return result;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/MesLineUserManager.cs b/MES.Service/service/MesLineUserManager.cs
deleted file mode 100644
index 5955705..0000000
--- a/MES.Service/service/MesLineUserManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service;
-
-public class MesLineUserManager : Repository<MesLineUser>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesLineUserManager.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); //杩斿洖鎬绘暟
-
- List<IConditionalModel> conModels = new(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel
- {
- FieldName = typeof(MesLineUser).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesLineUser(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesLineUser(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesLineUser() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesLineUser(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/MessageCenterManager.cs b/MES.Service/service/MessageCenterManager.cs
deleted file mode 100644
index 255bac7..0000000
--- a/MES.Service/service/MessageCenterManager.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service;
-
-public class MessageCenterManager : Repository<MessageCenter>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- public List<MessageCenter> GetPushFailedPage(MessageCenter query)
- {
- return Context.Queryable<MessageCenter>()
- .Where(it =>
- it.Result == 0 && it.Status == 1 &&
- it.Seq == 1 && it.Title != null)
- .WhereIF(query.isShow == 1, it => it.DealWith == 0)
- .OrderByDescending(it => it.CreateDate)
- .ToPageList(1, 20);
- }
-
- 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鏄浐瀹氱殑
-
-
- //鍓嶅彴閲嶆柊鍙戦��
- public int ResetUpdate(MessageCenter entity)
- {
- return UseTransaction(db =>
- {
- return db.Updateable<MessageCenter>()
- .SetColumns(a => a.Data == entity.Data)
- .SetColumns(a => a.Result == entity.Result)
- .SetColumns(a => a.ResultData == entity.ResultData)
- .SetColumns(a => a.Status == entity.Status)
- .SetColumns(a => a.DealWith == entity.DealWith)
- .Where(a => a.Id == entity.Id)
- .ExecuteCommand();
- });
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/QC/BaseService.cs b/MES.Service/service/QC/BaseService.cs
deleted file mode 100644
index a827168..0000000
--- a/MES.Service/service/QC/BaseService.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-
-namespace MES.Service.service.QC;
-
-public class BaseService
-{
- public string[]? getUserLineNo(string userNo)
- {
- //MesLineUser
- var db = SqlSugarHelper.GetInstance();
- var mesLineUsers = db.Queryable<MesLineUser>()
- .Where(a => a.Fcode == userNo)
- .ToList();
- return mesLineUsers.Select(s => s.LineNo).ToArray();
- }
-
- public int saveImage(List<MesQsImage> entity)
- {
- var mesQsImages = entity.Where(item => item.Id == null).ToList();
-
- mesQsImages.ForEach(s =>
- {
- if (!string.IsNullOrEmpty(s.base64Date))
- //灏哹ase64杞崲涓篵yte鏁扮粍
- s.ImageData = Convert.FromBase64String(s.base64Date);
- });
-
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- db.Insertable(mesQsImages).ExecuteCommand());
- }
-
- public int removeImage(decimal? id)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db => db
- .Deleteable(new MesQsImage { Id = id })
- .ExecuteCommand());
- }
-
- public List<MesQsImage> getByFid(decimal id, string qsType)
- {
- var db = SqlSugarHelper.GetInstance();
- var mesQsImages = db.Queryable<MesQsImage>()
- .Where(s => s.Fid == id && s.QsType == qsType).ToList();
- mesQsImages.ForEach(s =>
- {
- if (s.ImageData is { Length: > 0 })
- s.base64Date = Convert.ToBase64String(s.ImageData);
- });
- return mesQsImages;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/QC/LljService.cs b/MES.Service/service/QC/LljService.cs
deleted file mode 100644
index 75b295b..0000000
--- a/MES.Service/service/QC/LljService.cs
+++ /dev/null
@@ -1,580 +0,0 @@
-锘縰sing System.Data;
-using MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.util;
-using SqlSugar;
-//using DbType = SqlSugar.DbType;
-using DbType = System.Data.DbType;
-
-
-namespace MES.Service.service.QC;
-
-public class LljService
-{
- public List<LtsLlj> GetPage(XJPageResult queryObj)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var id = Convert.ToDecimal(queryObj.id);
-
- return db.Queryable<LtsLlj>()
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- "鏈畬鎴�".Equals(queryObj.result),
- (a) => a.FcheckResu == null)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- !"鏈畬鎴�".Equals(queryObj.result),
- (a) => a.FcheckResu != null)
- .WhereIF(id > 0, (a) => a.Id == id)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
- }
-
- //鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<MesQaItemsDetectDetail5> SetItems(string itemNo, decimal quantity, string releaseNo)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Count();
-
- if (count <= 0) return [];
-
- var mesQaIqcItem = db
- .Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Select(
- b => new MesQaItemsDetectDetail5
- {
- ReleaseNo = releaseNo,
- FacLevel = b.FacLevel,
- FcheckItem = b.FcheckItem,
- FdownAllow = b.FdownAllow,
- FcheckLevel = b.FREQUENCY,
- Fstand = b.FSTAND,
- FupAllow = b.FupAllow,
- SampleSizeNo = b.SampleSizeNo,
- FenterQty = 0,
- Factory = "1000",
- Company = "1000",
-
-
- // FcheckItemDesc = "0",
- // FcheckResu = "0",
- FcheckTool = b.FcheckTool,
- FspecRequ = b.FspecRequ
- // FtextType = "0",
- // Funit = "0",
- // LastupdateBy = "0",
- // ProcNo = "0",
- // WorkshopCenterCode = "0"
- }).ToList();
-
- mesQaIqcItem.ForEach(item =>
- {
- string LEV = null;
- switch (item.FcheckLevel)
- {
- case string s when s.Contains("S1"):
- LEV = "B.FLEVEL_S1";
- break;
- case string s when s.Contains("S2"):
- LEV = "B.FLEVEL_S2";
- break;
- case string s when s.Contains("S3"):
- LEV = "B.FLEVEL_S3";
- break;
- case string s when s.Contains("S4"):
- LEV = "B.FLEVEL_S4";
- break;
- case string s when s.Contains("(I)"):
- LEV = "B.FLEVEL_I";
- break;
- case string s when s.Contains("(II)"):
- LEV = "B.FLEVEL_II";
- break;
- case string s when s.Contains("(III)"):
- LEV = "B.FLEVEL_III";
- break;
- default:
- LEV = ""; // 榛樿鍊�
- break;
- }
-
- var sql =
- "SELECT " + LEV +
- " FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
- item.SampleSizeNo + "' AND B.LOT_FROM<= " + quantity + " AND " +
- quantity + "<=B.LOT_TO";
-
- var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
-
-
- var result = ExtractSubstring(item.FacLevel, '(', ')');
-
-
- sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
- " Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
- item.SampleSizeNo + "' AND SAMPLE_SIZE_WORD= '" + maxBillNo + "'";
- var resultClass = db.Ado.SqlQuerySingle<ResultClass>(sql);
-
- item.CheckQyt = resultClass.FSAMPLE_SIZE_WORD;
- item.FreQty = resultClass.Result;
- });
-
- return mesQaIqcItem;
- }
-
- private string ExtractSubstring(string input, char startChar, char endChar)
- {
- var startIndex = input.IndexOf(startChar);
- var endIndex = input.IndexOf(endChar, startIndex);
-
- if (startIndex == -1 || endIndex == -1)
- // 濡傛灉鏈壘鍒拌捣濮嬪瓧绗︽垨缁撴潫瀛楃锛屽垯杩斿洖绌哄瓧绗︿覆鎴栬�呮姏鍑哄紓甯革紝鏍规嵁瀹為檯鎯呭喌閫夋嫨
- return string.Empty;
- // 鎴栬�呮姏鍑哄紓甯�
- // throw new ArgumentException("Start or end character not found");
- // 鎻愬彇瀛愬瓧绗︿覆
- var length = endIndex - startIndex - 1;
- return input.Substring(startIndex + 1, length);
- }
-
- public int saveItem(LLJDto rkjDto)
- {
- var items = rkjDto.items;
- var userNo = rkjDto.userNo;
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- foreach (var item in items) item.ReleaseNo = rkjDto.releaseNo;
-
- return db.Insertable(items).ExecuteCommand();
- });
-
- rkjDto.items = GetItems(rkjDto.releaseNo, null);
-
- var db = SqlSugarHelper.GetInstance();
-
- rkjDto.items.ForEach(s =>
- {
- if (s.FupAllow != null || s.Fstand != null ||
- s.FdownAllow != null) return;
-
- // 娌℃湁褰曞叆鍙傝�冨�硷紝鍒ゆ柇鏈夊灏戜釜NG锛岄偅涔堝綍鍏ョ殑鎶芥缁撴灉蹇呴』鏄疧K鎴栬�匩G锛孨G浠ｈ〃涓嶅悎鏍�
- var ifck = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(x => x.FcheckResu == "NG" && x.MainId == s.Id).Count();
-
- //妫�楠屾槑缁嗘�绘暟
- var count = db.Queryable<MesQaItemsDetectDetail12>().Where(x1 => x1.MainId == s.Id).Count();
-
- if (ifck > s.FreQty && s.CheckQyt == count)
- s.FcheckResu = "涓嶅悎鏍�";
- else if (ifck < s.FreQty && s.CheckQyt == count)
- s.FcheckResu = "鍚堟牸";
- else
- s.FcheckResu = "鏈畬鎴�";
-
-
- var detail = new MesQaItemsDetectDetail12();
- detail.MainId = s.Id;
- detail.ReleaseNo = rkjDto.releaseNo;
- detail.Fstand = "鈭�";
- detail.FcheckResu = "OK";
- detail.LastupdateBy = rkjDto.userNo;
- detail.count = (int?)s.CheckQyt;
- SetQSItemDetail(detail);
- });
-
- return Convert.ToInt32(rkjDto.gid);
- }
-
- public List<MesQaItemsDetectDetail5> GetItems(string? releaseNo, decimal? id)
- {
- var db = SqlSugarHelper.GetInstance();
-
- return db.Queryable<MesQaItemsDetectDetail5, MesQaItemsDetectDetail12>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.MainId))
- .Where((a, b) => a.ReleaseNo == releaseNo)
- // .WhereIF(id > 0, (a, b) => a.Id == id)
- .GroupBy((a, b) => new
- {
- a.Id,
- a.ReleaseNo,
- a.FacLevel,
- a.FcheckItem,
- a.FcheckTool,
- a.FdownAllow,
- a.FcheckLevel,
- a.Fstand,
- a.FupAllow,
- a.SampleSizeNo,
- a.FspecRequ,
- a.FreQty,
- a.CheckQyt,
- a.FcheckResu
- }).Select((a, b) => new MesQaItemsDetectDetail5
- {
- Id = a.Id,
- ReleaseNo = a.ReleaseNo,
- CheckQyt = a.CheckQyt,
- FacLevel = a.FacLevel,
- FcheckItem = a.FcheckItem,
- FcheckTool = a.FcheckTool,
- FdownAllow = a.FdownAllow,
- FcheckLevel = a.FcheckLevel,
- Fstand = a.Fstand,
- FupAllow = a.FupAllow,
- SampleSizeNo = a.SampleSizeNo,
- FspecRequ = a.FspecRequ,
- FreQty = a.FreQty,
- Factory = "1000",
- Company = "1000",
- FenterQty = SqlFunc.AggregateCount(b.Id),
- FcheckResu = a.FcheckResu
- }).ToList();
- }
-
- public int SetQSItemDetail(MesQaItemsDetectDetail12 detail)
- {
- var dbd = SqlSugarHelper.GetInstance();
- var oracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- List<MesQaItemsDetectDetail12> result = new();
- for (var i = 0; i < detail.count; i++)
- {
- var item = new MesQaItemsDetectDetail12();
- item.MainId = detail.MainId;
- item.ReleaseNo = detail.ReleaseNo;
- item.Fstand = detail.Fstand;
- item.FcheckResu = detail.FcheckResu;
- item.CreateBy = detail.LastupdateBy;
- item.CreateDate = DateTime.Now;
- item.Factory = "1000";
- item.Company = "1000";
- result.Add(item);
- }
-
- return db.Insertable(result).ExecuteCommand();
- });
-
- detail.CreateBy = detail.LastupdateBy;
-
-
- autoResult(detail);
-
- return oracle;
- }
-
-
- private int autoResult(MesQaItemsDetectDetail12 detail)
- {
- var db = SqlSugarHelper.GetInstance();
-
- // Single 娌℃湁鏌ヨ鍒扮粨鏋滄椂杩斿洖Null锛屽鏋滅粨鏋滃ぇ浜�1鏉′細鎶涘嚭閿欒
- var QsItemOqcItem = db.Queryable<MesQaItemsDetectDetail5>()
- .Single(s => s.Id == detail.MainId);
-
- if (QsItemOqcItem == null) return 0;
-
- //鏌ヨ杩欎釜妫�楠岄」鐩笅鐨勬楠岀粨鏋�
- var count = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(s => s.MainId == detail.MainId).Count();
-
- updateDetail5(detail);
- var result = "";
-
- //妫�楠屽疄闄呯粨鏋滀笉绛変簬搴旇妫�楠岀殑涓暟鏃剁洿鎺ユ帹鍑�
- if (QsItemOqcItem.CheckQyt != count) return 0;
-
- //鍚堟牸鐨勬湁澶氬皯涓�
- var passCount = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(s => s.MainId == detail.MainId && s.Fstand == "鈭�").Count();
- //涓嶅悎鏍肩殑鏈夊灏戜釜
- var noCount = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(s => s.MainId == detail.MainId && s.Fstand == "脳").Count();
-
- if (count == passCount)
- result = "鍚堟牸";
- //else if (count - passCount < QsItemOqcItem.FreQty)
- // result = "涓嶅悎鏍�";
- else if (noCount >= QsItemOqcItem.FreQty)
- result = "涓嶅悎鏍�";
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- var commit = 0;
- commit += db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(s => s.FcheckResu == result)
- .SetColumns(s => s.FenterQty == count)
- .Where(s => s.Id == detail.MainId)
- .ExecuteCommand();
-
- return commit;
- });
-
- var isNull = db.Queryable<MesQaItemsDetectDetail5>()
- .Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == null).Count();
-
- if (isNull > 0) return 1;
- //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩殑涓暟
- var sum = db.Queryable<MesQaItemsDetectDetail5>()
- .Where(s => s.ReleaseNo == detail.ReleaseNo).Count();
-
- if (sum == 0) return 1;
-
- //鑾峰彇妫�楠屽崟涓嬬殑鍚堟牸鐨勬楠岄」鐩釜鏁�
- var icount = db.Queryable<MesQaItemsDetectDetail5>()
- .Where(s => s.ReleaseNo == detail.ReleaseNo && s.FcheckResu == "鍚堟牸").Count();
-
- var FcheckResu = "涓嶅悎鏍�";
-
- //瀹為檯涓暟绛変簬鐞嗚涓暟鏃跺妫�楠屽崟杩涜鍒ゅ畾
- if (sum == icount)
- //鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
- FcheckResu = "鍚堟牸";
- var sysUser = db.Queryable<SysUser>()
- .Where(s => s.Fcode == detail.CreateBy).First();
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<MesQaItemsDetect01>()
- .SetColumns(s => s.FcheckResu == FcheckResu)
- .SetColumns(s => s.FcheckDate == DateTime.Now)
- .SetColumns(s => s.FcheckBy == sysUser.Fname)
- .SetColumns(s => s.LastupdateBy == detail.CreateBy)
- .SetColumns(s => s.LastupdateDate == DateTime.Now)
- .Where(s => s.ReleaseNo == detail.ReleaseNo)
- .ExecuteCommand();
- });
- // if (FcheckResu.Equals("涓嶅悎鏍�"))
- //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
- /// saveDetect02(detail.Id, detail.CreateBy);
-
- return useTransactionWithOracle;
- }
- /* public int saveDetect02(decimal? gid, string? createBy)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var qsItemOqcReq =
- db.Queryable<QsItemOqcReq>().Single(s => s.Id == gid);
-
- var mesInvItemIns = db.Queryable<MesInvItemIns>()
- .Single(s => s.BillNo == qsItemOqcReq.BillNo);
-
- var mesSchemeResult = db.Queryable<MesSchemeResult>()
- .Single(s => s.BillNo == mesInvItemIns.CbillNo);
-
- var entity = new MesQaItemsDetect02();
- entity.ItemNo = mesSchemeResult.BoardItem;
- entity.BoardItem = mesSchemeResult.BoardItem;
- entity.LineNo = mesSchemeResult.LineNo;
- entity.Aufnr = mesSchemeResult.TaskNo;
- entity.ReleaseNo = qsItemOqcReq.ReleaseNo;
- entity.LotNo = qsItemOqcReq.BillNo;
- entity.FcheckDate = qsItemOqcReq.FcheckDate;
- entity.FcheckMemo = qsItemOqcReq.Remarks;
- entity.Gid = qsItemOqcReq.Id;
- // entity.PlanQty = qsItemOqcReq.FcheckDate;
-
-
- entity.FcheckResu = "涓嶅悎鏍�";
- entity.FcheckLevel = "涓ラ噸";
- entity.CreateDate = DateTime.Now;
- entity.Factory = "10000";
- entity.Company = "1000";
- entity.Ftype = "4";
- entity.Fversion = 0;
- entity.Modify1Flag = 0;
- entity.IpqcStatus = 0;
- entity.Fsubmit = 1;
- entity.CreateBy = createBy;
- entity.FcheckBy = createBy;
-
- return SqlSugarHelper.UseTransactionWithOracle(db => db
- .Insertable(entity)
- .ExecuteCommand());
- }
- */
-
- public LLJDto getXjDetail02ById(decimal? id)
- {
- var rkjDto = new LLJDto();
-
- var db = SqlSugarHelper.GetInstance();
- var qsItemOqcItem =
- db.Queryable<MesQaItemsDetectDetail5>().Single(s => s.Id == id);
-
- /* if (qsItemOqcItem.IsPass == 0)
- qsItemOqcItem.Result = "涓嶅悎鏍�";
- else if (qsItemOqcItem.IsPass == 1)
- qsItemOqcItem.Result = "鍚堟牸";
- else
- qsItemOqcItem.Result = "鏈畬鎴�";
-
- if (qsItemOqcItem.Picture is { Length: > 0 })
- qsItemOqcItem.imageData =
- Convert.ToBase64String(qsItemOqcItem.Picture);
- */
- //鑾峰彇涓嶅悎鏍兼暟
- var count = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(s => s.Fstand == "脳" && s.MainId == id).Count();
-
- qsItemOqcItem.Unqualified = count;
-
- rkjDto.ItemXj01 = qsItemOqcItem;
-
-
- rkjDto.ItemXj02s = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(s => s.MainId == id)
- .ToList();
-
- return rkjDto;
- }
-
- public int UpdateQSItemDetail(MesQaItemsDetectDetail12 detail)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<MesQaItemsDetectDetail12>()
- .SetColumns(s => s.LastupdateBy == detail.LastupdateBy)
- // .SetColumns(s => s.LastupdateDate == DateTime.Now)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.Fstand),
- s => s.Fstand == detail.Fstand)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.FcheckResu),
- s => s.FcheckResu == detail.FcheckResu)
- .Where(s => s.MainId == detail.MainId && s.Id == detail.Id)
- .ExecuteCommand();
- });
-
- detail.CreateBy = detail.LastupdateBy;
-
- withOracle += autoResult(detail);
-
- return withOracle;
- }
-
-//鏇存柊妫�楠屾槑缁嗗凡妫�銆佷笉鍚堟牸鏁伴噺
- private int updateDetail5(MesQaItemsDetectDetail12 detail)
- {
- var db = SqlSugarHelper.GetInstance();
-
- //鏌ヨ杩欎釜妫�楠岄」鐩笅鐨勬楠屾暟閲�
- var count = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(s => s.MainId == detail.MainId).Count();
-
- //鑾峰彇涓嶅悎鏍兼暟
- var countNo = db.Queryable<MesQaItemsDetectDetail12>()
- .Where(s => s.MainId == detail.MainId && s.Fstand == "脳").Count();
- //鏇存柊妫�楠屾槑缁嗗凡妫�鏁伴噺
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(s => s.FenterQty == count)
- .SetColumns(s => s.FngQty == countNo)
- .Where(s => s.Id == detail.MainId)
- .ExecuteCommand();
- });
-
- return withOracle;
- }
-
- //涓昏〃淇敼澶囨敞瀛楁
- public int saveRemarksGid(LLJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<MesQaItemsDetect01>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.ReleaseNo == dto.releaseNo)
- .ExecuteCommand();
- });
- }
-
- //瀛愯〃淇敼澶囨敞瀛楁
- public int saveRemarksPid(LLJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<MesQaItemsDetectDetail5>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.pid)
- .ExecuteCommand();
- });
- }
-
- //鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
- public int removeXJ(string? releaseNo)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var commit = 0;
- //鍒犻櫎涓昏〃
- commit += db.Deleteable<MesQaItemsDetect01>().Where(s => s.ReleaseNo == releaseNo)
- .ExecuteCommand();
- //鍒犻櫎瀛愯〃
- commit += db.Deleteable<MesQaItemsDetectDetail5>().Where(s => s.ReleaseNo == releaseNo)
- .ExecuteCommand();
- //鍒犻櫎瀛欒〃
- commit += db.Deleteable<MesQaItemsDetectDetail12>()
- .Where(s => s.ReleaseNo == releaseNo)
- .ExecuteCommand();
- return commit;
- });
-
- return withOracle;
- }
-
- public bool IqcQaSubmit(LLJDto dto)
- {
- var (factory, company) = UserUtil.GetFactory(dto.userNo);
- try
- {
- // 瀹氫箟杈撳嚭鍙傛暟
- var outputResult = new SugarParameter("o_Result", null,
- DbType.Int32, ParameterDirection.Output,
- 4000);
-
- var outputMessage = new SugarParameter("o_Msg", null,
- DbType.String,
- ParameterDirection.Output, 4000);
-
- // 瀹氫箟杈撳叆鍙傛暟
- var parameters = new List<SugarParameter>
- {
- new("PI_FACTORY", factory,
- DbType.String, ParameterDirection.Input),
- new("PI_COMPANY", company, DbType.String,
- ParameterDirection.Input),
- new("p_Release_No", dto.releaseNo, DbType.String,
- ParameterDirection.Input),
- new("p_User", dto.userNo, DbType.String,
- ParameterDirection.Input),
- outputResult,
- outputMessage
- };
-
- var db = SqlSugarHelper.GetInstance();
-
- // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- db.Ado.ExecuteCommand(
- "BEGIN Prc_Mes_Iqc_Qa_Submit82(:PI_FACTORY, :PI_COMPANY, :p_Release_No, :p_User, :o_Result, :o_Msg); END;",
- parameters.ToArray());
-
- // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
- var resultValue = outputResult.Value?.ToString();
- var messageValue = outputMessage.Value?.ToString();
-
- if ("1".Equals(resultValue)) throw new Exception(messageValue);
-
- return true;
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/QC/MesQaItemsDetectDetail5Manager.cs b/MES.Service/service/QC/MesQaItemsDetectDetail5Manager.cs
deleted file mode 100644
index a471429..0000000
--- a/MES.Service/service/QC/MesQaItemsDetectDetail5Manager.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.QC;
-
-public class
- MesQaItemsDetectDetail5Manager : Repository<MesQaItemsDetectDetail5>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesQaItemsDetectDetail5Manager.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(MesQaItemsDetectDetail5).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesQaItemsDetectDetail5(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesQaItemsDetectDetail5(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesQaItemsDetectDetail5() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesQaItemsDetectDetail5(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
deleted file mode 100644
index 4362149..0000000
--- a/MES.Service/service/QC/RKJService.cs
+++ /dev/null
@@ -1,654 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.util;
-using SqlSugar;
-
-namespace MES.Service.service.QC;
-
-public class RKJService
-{
- private readonly BaseService _baseService = new();
-
- //鎵嬪姩鎵цsql
- //鐢熸垚妫�楠屽崟鍙�
- public string getMaxBillNo()
- {
- var db = SqlSugarHelper.GetInstance();
- var date = DateTime.Now.ToString("yyyy-MM-dd");
- var sql =
- "select max(RELEASE_NO) from QS_ITEM_OQC_REQ where RELEASE_NO like 'RKJN%' and to_char(CREATE_DATE,'yyyy-mm-dd') ='" +
- date + "'";
-
- var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
-
- var number = "0001";
- if (maxBillNo != null)
- {
- maxBillNo = maxBillNo.Substring(12);
- var no = Convert.ToInt32(maxBillNo);
- no++;
- number = no.ToString().PadLeft(4, '0');
- }
-
- return "RKJN" + date.Replace("-", "") + number;
- }
-
- //閫夋嫨浜х嚎
- public List<MesLine> getLineNo()
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesLine>()
- .Where(t =>
- t.LineStyle == "鍖呰" ||
- SqlFunc.ContainsArray(new[] { "V1", "V3", "V5", "V6" },
- t.LineNo))
- .OrderBy(t => t.LineNo)
- .Select(t => new MesLine
- {
- LineNo = t.LineNo,
- LineName = t.LineName
- }).OrderBy("LINE_NO")
- .ToList();
- }
-
-
- //鑾峰彇宸ュ崟鍙�
- public List<RKJDaa001> GetDaa001s(string lineNo)
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<RKJDaa001>()
- .Where(t => t.LineNo == lineNo)
- .OrderBy(t => t.BillNo, OrderByType.Desc)
- .ToList();
- }
-
- //鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<QsItemOqcItem> SetItems(string itemNo, decimal quantity)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var count = db.Queryable<MesQa>().Where(s => s.QsType == "3"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
-
- if (count <= 0) return [];
-
- var qsItemOqcItems = db
- .Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "3"
- && b.ItemNo == itemNo).Select(
- b => new QsItemOqcItem
- {
- ProjName = b.ProjName,
- ItemMod = b.ItemMod,
- InspectionMethod = b.InspectionMethod,
- UsingInstruments = b.UsingInstruments,
- LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
- Notes = b.Notes,
- FcheckLevel = b.FcheckLevel,
- FacLevel = b.FacLevel,
- QsCode = b.QsCode,
- QsName = b.QsName,
- Result = "鏈娴�",
- isCheck = 0,
- Picture = b.Picture,
- Picturename = b.Picturename
- }).ToList();
-
- qsItemOqcItems.ForEach(item =>
- {
- string LEV = null;
- switch (item.FcheckLevel)
- {
- case string s when s.Contains("S1"):
- LEV = "B.FLEVEL_S1";
- break;
- case string s when s.Contains("S2"):
- LEV = "B.FLEVEL_S2";
- break;
- case string s when s.Contains("S3"):
- LEV = "B.FLEVEL_S3";
- break;
- case string s when s.Contains("S4"):
- LEV = "B.FLEVEL_S4";
- break;
- case string s when s.Contains("(I)"):
- LEV = "B.FLEVEL_I";
- break;
- case string s when s.Contains("(II)"):
- LEV = "B.FLEVEL_II";
- break;
- case string s when s.Contains("(III)"):
- LEV = "B.FLEVEL_III";
- break;
- default:
- LEV = ""; // 榛樿鍊�
- break;
- }
-
- var sql =
- "SELECT " + LEV +
- " FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
- item.QsCode + "' AND B.LOT_FROM<= " + quantity + " AND " +
- quantity + "<=B.LOT_TO";
-
- var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
-
-
- var result = ExtractSubstring(item.FacLevel, '(', ')');
-
-
- sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
- " Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
- item.QsCode + "' AND SAMPLE_SIZE_WORD= '" + maxBillNo + "'";
- var resultClass = db.Ado.SqlQuerySingle<ResultClass>(sql);
-
- item.LevelNum = resultClass.FSAMPLE_SIZE_WORD;
- item.FreQty = resultClass.Result;
- });
-
- return qsItemOqcItems;
- }
-
- private string ExtractSubstring(string input, char startChar, char endChar)
- {
- var startIndex = input.IndexOf(startChar);
- var endIndex = input.IndexOf(endChar, startIndex);
-
- if (startIndex == -1 || endIndex == -1)
- // 濡傛灉鏈壘鍒拌捣濮嬪瓧绗︽垨缁撴潫瀛楃锛屽垯杩斿洖绌哄瓧绗︿覆鎴栬�呮姏鍑哄紓甯革紝鏍规嵁瀹為檯鎯呭喌閫夋嫨
- return string.Empty;
- // 鎴栬�呮姏鍑哄紓甯�
- // throw new ArgumentException("Start or end character not found");
- // 鎻愬彇瀛愬瓧绗︿覆
- var length = endIndex - startIndex - 1;
- return input.Substring(startIndex + 1, length);
- }
-
- public List<QsItemOqcItem> GetItems(decimal? pid, decimal? id)
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<QsItemOqcItem, QsItemOqcItemDetail>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Pid))
- .WhereIF(pid > 0, (a, b) => a.Pid == pid)
- .WhereIF(id > 0, (a, b) => a.Id == id)
- .GroupBy((a, b) => new
- {
- a.Id,
- a.ProjName,
- a.ItemMod,
- a.InspectionMethod,
- a.UsingInstruments,
- a.LevelNum,
- a.MaxValue,
- a.StandardValue,
- a.MinValue,
- a.Notes,
- a.IsPass,
- a.FcheckLevel,
- a.FacLevel,
- a.QsCode,
- a.QsName
- }).Select((a, b) => new QsItemOqcItem
- {
- ProjName = a.ProjName,
- Id = a.Id,
- ItemMod = a.ItemMod,
- InspectionMethod = a.InspectionMethod,
- UsingInstruments = a.UsingInstruments,
- LevelNum = a.LevelNum,
- MaxValue = a.MaxValue,
- StandardValue = a.StandardValue,
- MinValue = a.MinValue,
- Notes = a.Notes,
- FcheckLevel = a.FcheckLevel,
- FacLevel = a.FacLevel,
- QsCode = a.QsCode,
- QsName = a.QsName,
- isCheck = SqlFunc.AggregateCount(b.Id),
- Result = a.IsPass == 1 &&
- a.LevelNum == SqlFunc.AggregateCount(b.Id) ? "鍚堟牸"
- : a.IsPass == 0 &&
- a.LevelNum == SqlFunc.AggregateCount(b.Id) ? "涓嶅悎鏍�"
- : "鏈畬鎴�"
- }).OrderBy("result desc").ToList();
- }
-
- public dynamic save(RKJDto rkjDto)
- {
- var xj = rkjDto.from;
- var items = rkjDto.items;
- var userNo = rkjDto.userNo;
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var commit = 0;
-
- xj.CreateBy = userNo;
- xj.CreateDate = DateTime.Now;
-
- var pid = db.Insertable(xj).ExecuteReturnIdentity();
-
- xj.Id = pid;
-
- rkjDto.gid = pid;
-
- foreach (var item in items) item.Pid = pid;
-
- commit += db.Insertable(items).ExecuteCommand();
-
- return commit;
- });
-
-
- // using (var connection =
- // new OracleConnection(OracleSQLHelper.ConnectionString)) // connection.Open();
- //
- // var transaction = connection.BeginTransaction();
- //
- // try
- // {
- // using (var command = new OracleCommand())
- // {
- // command.Connection = connection;
- // command.Transaction = transaction;
- // command.CommandText = "insert_and_update_picture_RKJ";
- // command.CommandType = CommandType.StoredProcedure;
- //
- // // Add parameters
- // command.Parameters.Add("p_QS_TYPE", OracleDbType.Varchar2)
- // .Value = "3";
- // command.Parameters.Add("p_MOID_NUM", OracleDbType.Varchar2)
- // .Value = rkjDto.moidNum;
- // command.Parameters.Add("p_pid", OracleDbType.Int32).Value =
- // xj.Id;
- //
- // command.ExecuteNonQuery();
- // }
- //
- // transaction.Commit();
- // }
- // catch (Exception)
- // {
- // transaction.Rollback();
- // throw;
- // }
- // }
-
- rkjDto.items = GetItems(xj.Id, null);
-
- rkjDto.items.ForEach(s =>
- {
- if (s.MaxValue != null || s.StandardValue != null ||
- s.MinValue != null) return;
- var detail = new QsItemOqcItemDetail();
- detail.Pid = s.Id;
- detail.Gid = rkjDto.gid;
- detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
- detail.UpdateBy = rkjDto.userNo;
- detail.count = (int?)s.LevelNum;
- SetQSItemDetail(detail);
- });
-
- return Convert.ToInt32(xj.Id);
- }
-
- public int SetQSItemDetail(QsItemOqcItemDetail detail)
- {
- var oracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- List<QsItemOqcItemDetail> result = new();
- for (var i = 0; i < detail.count; i++)
- {
- var item = new QsItemOqcItemDetail();
- item.Gid = detail.Gid;
- item.Pid = detail.Pid;
- item.Fstand = detail.Fstand;
- item.FcheckResu = detail.FcheckResu;
- item.CreateBy = detail.UpdateBy;
- item.CreateDate = DateTime.Now;
- result.Add(item);
- }
-
- return db.Insertable(result).ExecuteCommand();
- });
-
- detail.CreateBy = detail.UpdateBy;
-
- autoResult(detail);
-
- return oracle;
- }
-
- private int autoResult(QsItemOqcItemDetail detail)
- {
- var db = SqlSugarHelper.GetInstance();
-
- // Single 娌℃湁鏌ヨ鍒扮粨鏋滄椂杩斿洖Null锛屽鏋滅粨鏋滃ぇ浜�1鏉′細鎶涘嚭閿欒
- var QsItemOqcItem = db.Queryable<QsItemOqcItem>()
- .Single(s => s.Id == detail.Pid);
-
- if (QsItemOqcItem == null) return 0;
-
- //鏌ヨ杩欎釜妫�楠岄」鐩笅鐨勬楠岀粨鏋�
- var count = db.Queryable<QsItemOqcItemDetail>()
- .Where(s => s.Pid == detail.Pid).Count();
-
-
- var result = 0;
-
- //妫�楠屽疄闄呯粨鏋滀笉绛変簬搴旇妫�楠岀殑涓暟鏃剁洿鎺ユ帹鍑�
- if (QsItemOqcItem.LevelNum != count) return 0;
-
- //鍚堟牸鐨勬湁澶氬皯涓�
- var passCount = db.Queryable<QsItemOqcItemDetail>()
- .Where(s => s.Pid == detail.Pid && s.Fstand == "鈭�").Count();
-
- if (count == passCount)
- result = 1;
- else if (count - passCount < QsItemOqcItem.FreQty) result = 1;
-
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- var commit = 0;
- commit += db.Updateable<QsItemOqcItem>()
- .SetColumns(s => s.IsPass == result)
- .Where(s => s.Id == detail.Pid)
- .ExecuteCommand();
-
- return commit;
- });
-
- var isNull = db.Queryable<QsItemOqcItem>()
- .Where(s => s.Pid == detail.Gid && s.IsPass == null).Count();
-
- if (isNull > 0) return 1;
-
-
- //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩殑涓暟
- var sum = db.Queryable<QsItemOqcItem>()
- .Where(s => s.Pid == detail.Gid).Count();
-
- if (sum == 0) return 1;
-
- //鑾峰彇妫�楠屽崟涓嬬殑鍚堟牸鐨勬楠岄」鐩釜鏁�
- var icount = db.Queryable<QsItemOqcItem>()
- .Where(s => s.Pid == detail.Gid && s.IsPass == 1).Count();
-
- var FcheckResu = "涓嶅悎鏍�";
-
- //瀹為檯涓暟绛変簬鐞嗚涓暟鏃跺妫�楠屽崟杩涜鍒ゅ畾
- if (sum == icount)
- //鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
- FcheckResu = "鍚堟牸";
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemOqcReq>()
- .SetColumns(s => s.FcheckResu == FcheckResu)
- .SetColumns(s => s.FcheckDate == DateTime.Now)
- .SetColumns(s => s.FcheckBy == detail.CreateBy)
- .SetColumns(s => s.LastupdateBy == detail.CreateBy)
- .SetColumns(s => s.LastupdateDate == DateTime.Now)
- .Where(s => s.Id == detail.Gid)
- .ExecuteCommand();
- });
-
- if (FcheckResu.Equals("涓嶅悎鏍�"))
- //鑷姩鐢熸垚鍏ュ簱妫�寮傚父瀵圭瓥
- saveDetect02(detail.Gid, detail.CreateBy);
-
- return useTransactionWithOracle;
- }
-
- public int saveDetect02(decimal? gid, string? createBy)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var qsItemOqcReq =
- db.Queryable<QsItemOqcReq>().Single(s => s.Id == gid);
-
- var mesInvItemIns = db.Queryable<MesInvItemIns>()
- .Single(s => s.BillNo == qsItemOqcReq.BillNo);
-
- var mesSchemeResult = db.Queryable<MesSchemeResult>()
- .Single(s => s.BillNo == mesInvItemIns.CbillNo);
-
- var entity = new MesQaItemsDetect02();
- entity.ItemNo = mesSchemeResult.BoardItem;
- entity.BoardItem = mesSchemeResult.BoardItem;
- entity.LineNo = mesSchemeResult.LineNo;
- entity.Aufnr = mesSchemeResult.TaskNo;
- entity.ReleaseNo = qsItemOqcReq.ReleaseNo;
- entity.LotNo = qsItemOqcReq.BillNo;
- entity.FcheckDate = qsItemOqcReq.FcheckDate;
- entity.FcheckMemo = qsItemOqcReq.Remarks;
- entity.Gid = qsItemOqcReq.Id;
- // entity.PlanQty = qsItemOqcReq.FcheckDate;
-
-
- entity.FcheckResu = "涓嶅悎鏍�";
- entity.FcheckLevel = "涓ラ噸";
- entity.CreateDate = DateTime.Now;
- entity.Factory = "10000";
- entity.Company = "1000";
- entity.Ftype = "4";
- entity.Fversion = 0;
- entity.Modify1Flag = 0;
- entity.IpqcStatus = 0;
- entity.Fsubmit = 1;
- entity.CreateBy = createBy;
- entity.FcheckBy = createBy;
-
- return SqlSugarHelper.UseTransactionWithOracle(db => db
- .Insertable(entity)
- .ExecuteCommand());
- }
-
-
- public List<QsItemOqcReq> getPage(XJPageResult queryObj)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var id = Convert.ToDecimal(queryObj.id);
-
- string[]? lineNo = null;
-
- if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
- lineNo = _baseService.getUserLineNo(queryObj.createUser);
-
- return db.Queryable<QsItemOqcReq, RKJDaa001>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.BillNo == b.BillNo))
- .WhereIF(lineNo != null && lineNo.Length > 0,
- (a, b) => lineNo.Contains(b.LineNo))
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- "鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu == null)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- !"鏈畬鎴�".Equals(queryObj.result),
- (a, b) => a.FcheckResu != null)
- .WhereIF(id > 0, (a, b) => a.Id == id)
- .Select((a, b) => new QsItemOqcReq
- {
- Id = a.Id,
- ReleaseNo = a.ReleaseNo,
- BillNo = a.BillNo,
- LineName = b.LineNo,
- Quantity = b.Quantity,
- CreateBy = a.CreateBy,
- CreateDate = a.CreateDate,
- ItemNo = a.ItemNo,
- Mocode = b.Mocode,
- BoardModel = b.BoardModel,
- TaskNo = b.TaskNo,
- FcheckResu = a.FcheckResu,
- FcheckBy = a.FcheckBy,
- FcheckDate = a.FcheckDate,
- MoidNum = a.MoidNum,
- BoardName = b.BoardName,
- ColorName = b.ColorName,
- Remarks = a.Remarks
- }).OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
- }
-
- //鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
- public int removeXJ(decimal? id)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var commit = 0;
- //鍒犻櫎涓昏〃
- commit += db.Deleteable<QsItemOqcReq>().Where(s => s.Id == id)
- .ExecuteCommand();
- //鍒犻櫎瀛愯〃
- commit += db.Deleteable<QsItemOqcItem>().Where(s => s.Pid == id)
- .ExecuteCommand();
- //鍒犻櫎瀛欒〃
- commit += db.Deleteable<QsItemOqcItemDetail>()
- .Where(s => s.Gid == id)
- .ExecuteCommand();
- return commit;
- });
-
- return withOracle;
- }
-
-
- public RKJDto getXjDetail02ById(decimal? id)
- {
- var rkjDto = new RKJDto();
-
- var db = SqlSugarHelper.GetInstance();
- var qsItemOqcItem =
- db.Queryable<QsItemOqcItem>().Single(s => s.Id == id);
-
- if (qsItemOqcItem.IsPass == 0)
- qsItemOqcItem.Result = "涓嶅悎鏍�";
- else if (qsItemOqcItem.IsPass == 1)
- qsItemOqcItem.Result = "鍚堟牸";
- else
- qsItemOqcItem.Result = "鏈畬鎴�";
-
- if (qsItemOqcItem.Picture is { Length: > 0 })
- qsItemOqcItem.imageData =
- Convert.ToBase64String(qsItemOqcItem.Picture);
-
- //鑾峰彇涓嶅悎鏍兼暟
- var count = db.Queryable<QsItemOqcItemDetail>()
- .Where(s => s.Fstand == "脳" && s.Pid == id).Count();
-
- qsItemOqcItem.Unqualified = count;
-
- rkjDto.ItemXj01 = qsItemOqcItem;
-
-
- rkjDto.ItemXj02s = db.Queryable<QsItemOqcItemDetail>()
- .Where(s => s.Pid == id)
- .ToList();
-
- return rkjDto;
- }
-
- public int UpdateQSItemDetail(QsItemOqcItemDetail detail)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemOqcItemDetail>()
- .SetColumns(s => s.UpdateBy == detail.UpdateBy)
- .SetColumns(s => s.UpdateDate == DateTime.Now)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.Fstand),
- s => s.Fstand == detail.Fstand)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.FcheckResu),
- s => s.FcheckResu == detail.FcheckResu)
- .Where(s => s.Id == detail.Id)
- .ExecuteCommand();
- });
-
- detail.CreateBy = detail.UpdateBy;
-
- withOracle += autoResult(detail);
-
- return withOracle;
- }
-
-
- //涓昏〃淇敼澶囨敞瀛楁
- public int saveRemarksGid(RKJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemOqcReq>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.gid)
- .ExecuteCommand();
- });
- }
-
- //瀛愯〃淇敼澶囨敞瀛楁
- public int saveRemarksPid(RKJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemOqcItem>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.pid)
- .ExecuteCommand();
- });
- }
-
- //瀛欒〃淇敼澶囨敞瀛楁
- public int saveRemarksById(RKJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemOqcItemDetail>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.id)
- .ExecuteCommand();
- });
- }
-
- public int saveItem(RKJDto rkjDto)
- {
- var items = rkjDto.items;
- var userNo = rkjDto.userNo;
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- foreach (var item in items) item.Pid = rkjDto.gid;
-
- return db.Insertable(items).ExecuteCommand();
- });
-
- rkjDto.items = GetItems(rkjDto.gid, null);
-
- rkjDto.items.ForEach(s =>
- {
- if (s.MaxValue != null || s.StandardValue != null ||
- s.MinValue != null) return;
- var detail = new QsItemOqcItemDetail();
- detail.Pid = s.Id;
- detail.Gid = rkjDto.gid;
- detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
- detail.UpdateBy = rkjDto.userNo;
- detail.count = (int?)s.LevelNum;
- SetQSItemDetail(detail);
- });
-
- return Convert.ToInt32(rkjDto.gid);
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
deleted file mode 100644
index e1cb463..0000000
--- a/MES.Service/service/QC/SJService.cs
+++ /dev/null
@@ -1,458 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.util;
-using SqlSugar;
-
-namespace MES.Service.service.QC;
-
-public class SJService
-{
- private readonly BaseService _baseService = new();
-
- //鑾峰彇鏈�澶у崟鍙�
- public string getMaxBillNo()
- {
- var db = SqlSugarHelper.GetInstance();
- var date = DateTime.Now.ToString("yyyy-MM-dd");
- var sql =
- "select max(BILL_NO) from QS_ITEM_IPI_REQ where to_char(CREATE_TIME,'yyyy-mm-dd') = '" +
- date + "'";
-
- var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
-
- var number = "0001";
- if (maxBillNo != null)
- {
- maxBillNo = maxBillNo.Substring(12);
- var no = Convert.ToInt32(maxBillNo);
- no++;
- number = no.ToString().PadLeft(4, '0');
- }
-
- return "SJN" + date.Replace("-", "") + number;
- }
-
- //鑾峰彇鎵�鏈夋暟鎹垎椤�
- public List<SJPageResult> getPage(SJPageResult queryObj)
- {
- var db = SqlSugarHelper.GetInstance();
-
- string[]? lineNo = null;
-
- if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
- lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
-
- var data = db.Queryable<SJPageResult>()
- .WhereIF(lineNo != null && lineNo.Length > 0,
- a => lineNo.Contains(a.line))
- .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
- .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
- a => a.BillNo == queryObj.BillNo)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
- "鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result == queryObj.Result)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
- !"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result != "鏈畬鎴�")
- .OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
-
- return data;
- }
-
-
- //SetQSItem
- // public List<QsItemIpiItem> SetQSItems(string itemNo)
- // {
- // var db = SqlSugarHelper.GetInstance();
- // return db
- // .Queryable<MoidToItem, MesQualityStandard>((a, b) =>
- // new JoinQueryInfos(JoinType.Inner, a.MoidNum == b.MoidNum))
- // .Where((a, b) => b.QsType == "1" && a.Fsubmit == 1 && a.ItemNo == itemNo).Select(
- // (a, b) => new QsItemIpiItem
- // {
- // ProjName = b.ProjName,
- // ItemMod = b.ItemMod,
- // InspectionMethod = b.InspectionMethod,
- // UsingInstruments = b.UsingInstruments,
- // LevelNum = SqlFunc.IsNull(
- // SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- // b.InspectionLevel),
- // MaxValue = b.MaxValue,
- // StandardValue = b.StandardValue,
- // MinValue = b.MinValue,
- // Notes = b.Notes,
- // FcheckLevel = b.FcheckLevel,
- // FacLevel = b.FacLevel,
- // QsCode = b.QsCode,
- // QsName = b.QsName,
- // result = "鏈娴�"
- // }).ToList();
- // }
- public List<QsItemIpiItem> SetQSItems(string itemNo)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var count = db.Queryable<MesQa>().Where(s => s.QsType == "1"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
-
- if (count <= 0) return new List<QsItemIpiItem>();
-
- return db
- .Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(
- b => new QsItemIpiItem
- {
- ProjName = b.ProjName,
- ItemMod = b.ItemMod,
- InspectionMethod = b.InspectionMethod,
- UsingInstruments = b.UsingInstruments,
- LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
- Notes = b.Notes,
- FcheckLevel = b.FcheckLevel,
- FacLevel = b.FacLevel,
- QsCode = b.QsCode,
- QsName = b.QsName,
- Picture = b.Picture,
- Picturename = b.Picturename,
- result = "鏈娴�",
- isCheck = 0
- }).ToList();
- }
-
- public List<QsItemIpiItem> getQSItems(decimal? pid, decimal? id)
- {
- var db = SqlSugarHelper.GetInstance();
- var qsItemIpiItems = db
- .Queryable<QsItemIpiItem>()
- .WhereIF(pid > 0, a => a.Pid == pid)
- .WhereIF(id > 0, a => a.Id == id).ToList();
-
- var array = qsItemIpiItems.Select(s => s.Id).ToArray();
- var qsItemIpiItemDetails = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => array.Contains(s.Pid))
- .GroupBy(s => s.Pid)
- .Select(s => new
- {
- s.Pid,
- count = SqlFunc.AggregateCount(s.Id)
- }).ToList();
-
- qsItemIpiItems.ForEach(s =>
- {
- var find = qsItemIpiItemDetails.Find(a => s.Id == a.Pid);
- if (find == null)
- {
- s.isCheck = 0;
- s.result = "鏈畬鎴�";
- }
- else
- {
- s.isCheck = find.count;
- if (find.count == s.LevelNum && s.IsPass == 1)
- s.result = "鍚堟牸";
- else if (find.count == s.LevelNum && s.IsPass == 0)
- s.result = "涓嶅悎鏍�";
- else
- s.result = "鏈畬鎴�";
- }
- });
-
- //浣跨敤linq琛ㄨ揪寮忚繃婊ゅ嚭鍥剧墖id涓嶄负绌虹殑鏁版嵁
- var itemIpiItems =
- qsItemIpiItems.Where(s => s.Picture is { Length: > 0 })
- .ToList();
- if (itemIpiItems.Count > 0)
- itemIpiItems.ForEach(s =>
- {
- var qsItemIpiItem = qsItemIpiItems.Find(t => t.Id == s.Id);
- //灏嗗瓧鑺傛暟缁勮浆鎹负Base64缂栫爜鐨勫瓧绗︿覆
- qsItemIpiItem.imageData = Convert.ToBase64String(s.Picture);
- });
-
- //鎺掑簭锛屾湭瀹屾垚鐨勬帓鍦ㄥ墠闈�
- qsItemIpiItems = qsItemIpiItems.OrderBy(s => s.isCheck).ToList();
-
- return qsItemIpiItems;
- }
-
- public QsItem Save(QsItem item)
- {
- var qsItemIpiReq = item.From;
- var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiReq.StatusDate = DateTime.Now;
- var pid = db.Insertable(qsItemIpiReq)
- .ExecuteReturnIdentity();
- qsItemIpiReq.Id = pid;
-
- item.gid = pid;
-
- qsItemIpiItems.ForEach(s => s.Pid = pid);
-
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
- item.Items = getQSItems(qsItemIpiReq.Id, null);
-
- //娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
- item.Items.ForEach(s =>
- {
- if (s.MaxValue != null || s.StandardValue != null ||
- s.MinValue != null) return;
- var detail = new QsItemIpiItemDetail();
- detail.Pid = s.Id;
- detail.Gid = item.gid;
- detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
- detail.UpdateBy = item.From.StatusUser;
- detail.count = (int?)s.LevelNum;
- SetQSItemDetail(detail);
- });
-
- item.Items = getQSItems(qsItemIpiReq.Id, null);
- var sjPageResult = new SJPageResult
- { Id = item.From.Id, Limit = 1, PageIndex = 1 };
- item.Result = getPage(sjPageResult)[0];
-
- return item;
- }
-
- public QsItem SaveItem(QsItem item)
- {
- var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiItems.ForEach(s => s.Pid = item.gid);
-
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
- item.Items = getQSItems(item.gid, null);
-
- //娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
- item.Items.ForEach(s =>
- {
- if (s.MaxValue != null || s.StandardValue != null ||
- s.MinValue != null) return;
- var detail = new QsItemIpiItemDetail();
- detail.Pid = s.Id;
- detail.Gid = item.gid;
- detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
- detail.UpdateBy = item.StatusUser;
- detail.count = (int?)s.LevelNum;
- SetQSItemDetail(detail);
- });
-
- item.Items = getQSItems(item.gid, null);
-
- return item;
- }
-
- public int SetQSItemDetail(QsItemIpiItemDetail detail)
- {
- var oracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- List<QsItemIpiItemDetail> result = new();
- for (var i = 0; i < detail.count; i++)
- {
- var item = new QsItemIpiItemDetail();
- item.Gid = detail.Gid;
- item.Pid = detail.Pid;
- item.Fstand = detail.Fstand;
- item.FcheckResu = detail.FcheckResu;
- item.CreateBy = detail.UpdateBy;
- item.CreateDate = DateTime.Now;
- result.Add(item);
- }
-
- return db.Insertable(result).ExecuteCommand();
- });
-
- detail.CreateBy = detail.UpdateBy;
-
- autoResult(detail);
-
- return oracle;
- }
-
- public List<QsItemIpiItemDetail> getQSItemDetail(decimal? pid, decimal? gid)
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Pid == pid)
- .WhereIF(gid > 0, s => s.Gid == gid)
- .ToList();
- }
-
-
- //鑷姩鍒ゅ畾鏄惁鍚堟牸
- private int autoResult(QsItemIpiItemDetail detail)
- {
- var db = SqlSugarHelper.GetInstance();
-
- // Single 娌℃湁鏌ヨ鍒扮粨鏋滄椂杩斿洖Null锛屽鏋滅粨鏋滃ぇ浜�1鏉′細鎶涘嚭閿欒
- var qsItemIpiItem = db.Queryable<QsItemIpiItem>()
- .Single(s => s.Id == detail.Pid);
-
- if (qsItemIpiItem == null) return 0;
-
- var count = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Pid == detail.Pid).Count();
-
-
- var result = 0;
-
- if (qsItemIpiItem.LevelNum != count) return 0;
-
- var passCount = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Pid == detail.Pid && s.Fstand == "鈭�").Count();
-
- if (count == passCount) result = 1;
-
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- var commit = 0;
- commit += db.Updateable<QsItemIpiItem>()
- .SetColumns(s => s.IsPass == result)
- .Where(s => s.Id == detail.Pid)
- .ExecuteCommand();
- return commit;
- });
-
-
- //鑷姩鍒ゅ畾鏄惁鍚堟牸
- //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩悊璁轰釜鏁�
- var sum = db.Queryable<QsItemIpiItem>()
- .Where(s => s.Pid == detail.Gid).Sum(it => it.LevelNum);
- if (sum == null || sum == 0) return 1;
-
- //鑾峰彇妫�楠屽崟涓嬬殑妫�楠岄」鐩疄闄呬釜鏁�
- var icount = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Gid == detail.Gid).Count();
-
- if (icount == 0) return 1;
-
- //瀹為檯涓暟绛変簬鐞嗚涓暟鏃跺妫�楠屽崟杩涜鍒ゅ畾
- if (sum == icount)
- {
- result = 0;
-
- //鑾峰彇杩欎釜妫�楠屽崟涓嬬殑鎵�鏈夊悎鏍肩殑妫�楠岀粨鏋�
- passCount = db.Queryable<QsItemIpiItemDetail>()
- .Where(s => s.Gid == detail.Gid && s.Fstand == "鈭�").Count();
-
- //鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
- if (icount == passCount) result = 1;
-
- useTransactionWithOracle += SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- return db.Updateable<QsItemIpiReq>()
- .SetColumns(s => s.IsPass == result)
- .SetColumns(s => s.StatusUser == detail.CreateBy)
- .SetColumns(s => s.CompleteTime == DateTime.Now)
- .Where(s => s.Id == detail.Gid)
- .ExecuteCommand();
- });
- }
-
- return useTransactionWithOracle;
- }
-
- public int UpdateQSItemDetail(QsItemIpiItemDetail detail)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemIpiItemDetail>()
- .SetColumns(s => s.UpdateBy == detail.UpdateBy)
- .SetColumns(s => s.UpdateDate == DateTime.Now)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.Fstand),
- s => s.Fstand == detail.Fstand)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.FcheckResu),
- s => s.FcheckResu == detail.FcheckResu)
- .Where(s => s.Id == detail.Id)
- .ExecuteCommand();
- });
-
- detail.CreateBy = detail.UpdateBy;
-
- withOracle += autoResult(detail);
-
- return withOracle;
- }
-
-
- //涓昏〃淇敼澶囨敞瀛楁
- public int saveRemarksGid(QsItem dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemIpiReq>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.gid)
- .ExecuteCommand();
- });
- }
-
- //瀛愯〃淇敼澶囨敞瀛楁
- public int saveRemarksPid(QsItem dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemIpiItem>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.pid)
- .ExecuteCommand();
- });
- }
-
- //瀛欒〃淇敼澶囨敞瀛楁
- public int saveRemarksById(QsItem dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsItemIpiItemDetail>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.id)
- .ExecuteCommand();
- });
- }
-
- public int removeXJ(decimal? id)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var commit = 0;
- //鍒犻櫎涓昏〃
- commit += db.Deleteable<QsItemIpiReq>().Where(s => s.Id == id)
- .ExecuteCommand();
- //鍒犻櫎瀛愯〃
- commit += db.Deleteable<QsItemIpiItem>().Where(s => s.Pid == id)
- .ExecuteCommand();
- //鍒犻櫎瀛欒〃
- commit += db.Deleteable<QsItemIpiItemDetail>()
- .Where(s => s.Gid == id)
- .ExecuteCommand();
- return commit;
- });
-
- return withOracle;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/QC/SuspendService.cs b/MES.Service/service/QC/SuspendService.cs
deleted file mode 100644
index bc6fbef..0000000
--- a/MES.Service/service/QC/SuspendService.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.QC;
-
-public class SuspendService
-{
- private readonly string[] statusArray = ["鐢熶骇", "寰呬骇", "鏆傚仠"];
-
- public List<SysDepartment> getDept()
- {
- var db = SqlSugarHelper.GetInstance();
- //return db.Queryable<SysDepartment>().ToList();
- return db
- .Queryable<MesSchemeResult, MesLine, QsQaItemXj, SysDepartment>(
- (a, b, c, d) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
- JoinType.Inner, a.BillNo == c.BillNo,
- JoinType.Left, b.Departmentcode == d.Departmentcode))
- .Where((a, b, c, d) => a.PmoveMk == 0 && b.LineName != null &&
- statusArray.Contains(a.ProcStatus))
- .GroupBy((a, b, c, d) => new
- {
- b.Departmentcode, d.Departmentname
- })
- .Select((a, b, c, d) => new SysDepartment
- {
- Departmentcode = b.Departmentcode,
- Departmentname = d.Departmentname
- }).ToList();
- }
-
- public List<MesLine> GetLines(string deptCode)
- {
- var db = SqlSugarHelper.GetInstance();
- var mesLines = db.Queryable<MesSchemeResult, MesLine, QsQaItemXj>(
- (a, b, c) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo,
- JoinType.Inner, a.BillNo == c.BillNo))
- .Where((a, b, c) => b.LineName != null &&
- statusArray.Contains(a.ProcStatus)
- && b.Departmentcode == deptCode)
- .GroupBy((a, b, c) => new
- {
- a.LineNo, b.LineName
- })
- .Select((a, b, c) => new MesLine
- {
- LineNo = a.LineNo,
- LineName = b.LineName
- }).ToList();
-
- var mesQsSuspends = db.Queryable<MesQsSuspend>()
- .Where(s => s.IsSuspend == 0).ToList();
-
- return mesLines.Where(p => mesQsSuspends.All(e => e.LineNo != p.LineNo))
- .ToList();
- }
-
- public int save(MesQsSuspend entity)
- {
- entity.CreateDate = DateTime.Now;
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- db.Insertable(entity).ExecuteCommand());
- }
-
- public List<MesQsSuspend> getAllByDeptNo(string deptNo)
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesQsSuspend>()
- .Where(a => a.DeptNo == deptNo && a.IsSuspend == 0).ToList();
- }
-
- public List<MesQsSuspend> getOpenDept()
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesQsSuspend>().GroupBy(a => new
- {
- a.DeptNo,
- a.DeptName
- }).Select<MesQsSuspend>(a => new MesQsSuspend
- {
- DeptNo = a.DeptNo,
- DeptName = a.DeptName
- }).ToList();
- }
-
- public List<MesQsSuspend> getOpenLine(string deptNo)
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesQsSuspend>()
- .Where(a => a.DeptNo == deptNo && a.IsSuspend == 0)
- .GroupBy(a => new
- {
- a.LineNo,
- a.LineName
- }).Select<MesQsSuspend>(a => new MesQsSuspend
- {
- LineNo = a.LineNo,
- LineName = a.LineName
- }).ToList();
- }
-
- public int UpdateById(MesQsSuspend entity)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<MesQsSuspend>()
- .SetColumns(a => a.IsSuspend == entity.IsSuspend)
- .SetColumns(a => a.OpenDate == DateTime.Now)
- .SetColumns(a => a.TimeDifference == entity.TimeDifference)
- .Where(a => a.Id == entity.Id)
- .ExecuteCommand();
- });
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
deleted file mode 100644
index 4f3c13b..0000000
--- a/MES.Service/service/QC/XJService.cs
+++ /dev/null
@@ -1,551 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.util;
-using SqlSugar;
-
-namespace MES.Service.service.QC;
-
-public class XJService
-{
- private static readonly OracleSQLHelper SQLHelper = new();
-
- private readonly BaseService _baseService = new();
-
-
- private readonly string[] statusArray = ["鐢熶骇", "寰呬骇"];
-
- //鐢熸垚鏈�鏂扮殑妫�楠屽崟鍙�
- public string getMaxReleaseNo()
- {
- var sql =
- string.Format(
- "select max(RELEASE_NO) from QS_QA_ITEM_XJ where RELEASE_NO like 'XJN%' and to_char(CREATE_DATE,'yyyy-mm-dd') = '{0}'",
- DateTime.Now.ToString("yyyy-MM-dd"));
-
- var executeScalar = SQLHelper.ExecuteScalar(sql);
- var date = DateTime.Now.ToString("yyMMdd");
- var number = "0001";
- var olReleaseNo = executeScalar.ToString();
- //鍒ゆ柇浠婂ぉ鏄惁鐢熸垚浜嗗贰妫�鍗�
- if (string.IsNullOrEmpty(olReleaseNo)) return "XJN" + date + number;
- //鎴彇鍚庡洓浣嶇殑娴佹按鍙风疮鍔�
- var substring = Convert.ToInt32(olReleaseNo.Substring(10));
- substring += 1;
- number = substring.ToString("D4");
-
- //濡傛灉涓虹┖鐩存帴杩斿洖0001
- return "XJN" + date + number;
- }
-
- public List<MesSchemeResult> getItem(string daa001)
- {
- var db = SqlSugarHelper.GetInstance();
-
- //in鐨勫啓娉� https://www.donet5.com/Home/Doc?typeId=1187
-
- return db.Queryable<MesSchemeResult, MesDepTask, MesBoardBaseInfo>(
- (a, c, b) =>
- new JoinQueryInfos(
- JoinType.Left, a.TaskNo == c.TaskNo,
- JoinType.Left, c.BoardItem == b.BoardItem
- )
- )
- .Where(a => a.PmoveMk == 0 &&
- a.BillNo == daa001 &&
- statusArray.Contains(a.ProcStatus))
- .Select((a, c, b) => new MesSchemeResult
- {
- BillNo = a.BillNo,
- CatQty = a.CatQty,
- DetailMem = a.DetailMem,
- TaskNo = a.TaskNo,
- BoardItem = a.BoardItem,
- BoardModel = b.BoardModel,
- PlanQty = c.PlanQty,
- Mocode = a.Mocode,
- // BoardStyle = c.BoardStyle,
- Id = a.Id
- })
- .ToList();
- }
-
- public List<MesLine> getLineAll()
- {
- var db = SqlSugarHelper.GetInstance();
-
- return db.Queryable<MesSchemeResult, MesLine>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.LineNo == b.LineNo))
- .Where((a, b) => a.PmoveMk == 0 && b.LineName != null &&
- statusArray.Contains(a.ProcStatus))
- .Where("BOARD_ITEM like @BoardItem", new { BoardItem = "20%" })
- .GroupBy((a, b) => new
- {
- a.LineNo, b.LineName
- })
- .Select((a, b) => new MesLine
- {
- LineNo = a.LineNo,
- LineName = b.LineName
- }).OrderBy("a.LINE_NO").ToList();
- }
-
- public List<MesSchemeResult> getDaa001(string daa020, string item)
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesSchemeResult>().Where(a =>
- a.PmoveMk == 0 && a.LineNo == daa020 && a.BillNo != null &&
- a.BoardItem == item &&
- statusArray.Contains(a.ProcStatus))
- .Select<MesSchemeResult>(a => new MesSchemeResult
- {
- BillNo = a.BillNo,
- DetailMem = a.DetailMem
- }).ToList();
- }
-
- public List<MesSchemeResult> getBoardItem(string lineNo)
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesSchemeResult>()
- .Where(a =>
- a.PmoveMk == 0 && statusArray.Contains(a.ProcStatus) &&
- a.LineNo == lineNo)
- .Where("BOARD_ITEM like @BoardItem", new { BoardItem = "20%" })
- .Select<MesSchemeResult>(a =>
- new MesSchemeResult
- {
- BoardItem = a.BoardItem,
- DetailMem = a.DetailMem
- }).OrderBy(a => a.BoardItem).ToList();
- }
-
- public List<QsQaItemXj> getPage(XJPageResult queryObj)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var id = Convert.ToDecimal(queryObj.id);
-
- string[]? lineNo = null;
-
- if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
- lineNo = _baseService.getUserLineNo(queryObj.createUser);
-
- return db
- .Queryable<QsQaItemXj, MesSchemeResult, MesDepTask,
- MesBoardBaseInfo>((s, a, c, b) =>
- new JoinQueryInfos(
- JoinType.Inner, s.BillNo == a.BillNo,
- JoinType.Left, a.TaskNo == c.TaskNo,
- JoinType.Left, c.BoardItem == b.BoardItem
- )
- )
- .WhereIF(lineNo != null && lineNo.Length > 0,
- (s, a, c, b) => lineNo.Contains(a.LineNo))
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- "鏈畬鎴�".Equals(queryObj.result),
- (s, a, c, b) => s.FcheckResu == null)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) &&
- !"鏈畬鎴�".Equals(queryObj.result),
- (s, a, c, b) => s.FcheckResu != null)
- .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
- .Select((s, a, c, b) => new QsQaItemXj
- {
- CatQty = a.CatQty,
- MoidNum = s.MoidNum,
- Daa020 = a.LineNo,
- // DetailMem = a.DetailMem,
- TaskNo = a.TaskNo,
- Id = s.Id,
- CreateBy = s.CreateBy,
- CreateDate = s.CreateDate,
- ReleaseNo = s.ReleaseNo,
- ItemNo = s.ItemNo,
- ItemUnit = s.ItemUnit,
- BillNo = s.BillNo,
- FcheckBy = s.FcheckBy,
- FcheckResu = s.FcheckResu,
- Remarks = s.Remarks,
- BoardModel = b.BoardModel,
- PlanQty = c.PlanQty
- // Mocode = a.Mocode,
- // BoardStyle = c.BoardStyle
- }).OrderBy(s => s.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
- }
-
-
- public List<QsQaItemXj01> setJYItem(string itemNo)
- {
- var db = SqlSugarHelper.GetInstance();
-
- var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
- && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
-
- if (count <= 0) return new List<QsQaItemXj01>();
-
- return db
- .Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "2"
- && b.ItemNo == itemNo).Select(
- b => new QsQaItemXj01
- {
- ProjName = b.ProjName,
- ItemMod = b.ItemMod,
- InspectionMethod = b.InspectionMethod,
- UsingInstruments = b.UsingInstruments,
- LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
- Notes = b.Notes,
- FcheckLevel = b.FcheckLevel,
- FacLevel = b.FacLevel,
- QsCode = b.QsCode,
- QsName = b.QsName,
- result = "鏈娴�",
- isCheck = 0,
- Picture = b.Picture,
- Picturename = b.Picturename
- }).ToList();
- }
-
- public List<QsQaItemXj01> getJYItem(decimal? pid, decimal? id)
- {
- var db = SqlSugarHelper.GetInstance();
- var qsQaItemXj01s = db.Queryable<QsQaItemXj01>()
- .WhereIF(pid > 0, a => a.Pid == pid)
- .WhereIF(id > 0, a => a.Id == id)
- .ToList();
-
- var array = qsQaItemXj01s.Select(s => s.Id).ToArray();
- var qsQaItemDetails = db.Queryable<QsQaItemXj02>()
- .Where(s => array.Contains(s.Pid))
- .GroupBy(s => s.Pid)
- .Select(s => new
- {
- s.Pid,
- count = SqlFunc.AggregateCount(s.Id)
- }).ToList();
-
- qsQaItemXj01s.ForEach(s =>
- {
- var find = qsQaItemDetails.Find(a => s.Id == a.Pid);
- if (find == null)
- {
- s.isCheck = 0;
- s.result = "鏈畬鎴�";
- }
- else
- {
- s.isCheck = find.count;
- if (find.count == s.LevelNum && s.IsPass == 1)
- s.result = "鍚堟牸";
- else if (find.count == s.LevelNum && s.IsPass == 0)
- s.result = "涓嶅悎鏍�";
- else
- s.result = "鏈畬鎴�";
- }
-
- //杩囨护鍑哄浘鐗噄d涓嶄负绌虹殑鏁版嵁杞负base64
- if (s.Picture is { Length: > 0 })
- s.imageData = Convert.ToBase64String(s.Picture);
- });
-
- //鎺掑簭锛屾湭瀹屾垚鐨勬帓鍦ㄥ墠闈�
- qsQaItemXj01s = qsQaItemXj01s.OrderBy(s => s.isCheck).ToList();
-
- return qsQaItemXj01s;
- }
-
-
- public int save(XJDto xjDto)
- {
- var xj = xjDto.from;
- var items = xjDto.items;
- var userNo = xjDto.userNo;
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var commit = 0;
-
- xj.CreateBy = userNo;
- xj.CreateDate = DateTime.Now;
-
- var pid = db.Insertable(xj).ExecuteReturnIdentity();
-
- xj.Id = pid;
-
- xjDto.gid = pid;
-
- foreach (var item in items) item.Pid = pid;
-
- commit += db.Insertable(items).ExecuteCommand();
-
- return commit;
- });
-
- xjDto.items = getJYItem(xj.Id, null);
-
- xjDto.items.ForEach(s =>
- {
- if (s.MaxValue != null || s.StandardValue != null ||
- s.MinValue != null) return;
- var detail = new QsQaItemXj02();
- detail.Pid = s.Id;
- detail.Gid = xjDto.gid;
- detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
- detail.UpdateBy = xjDto.userNo;
- detail.count = (int?)s.LevelNum;
- SetQSItemDetail(detail);
- });
-
- return Convert.ToInt32(xj.Id);
- }
-
- public int saveItem(XJDto xjDto)
- {
- var items = xjDto.items;
- var userNo = xjDto.userNo;
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- foreach (var item in items) item.Pid = xjDto.gid;
-
- return db.Insertable(items).ExecuteCommand();
- });
-
- xjDto.items = getJYItem(xjDto.gid, null);
-
- xjDto.items.ForEach(s =>
- {
- if (s.MaxValue != null || s.StandardValue != null ||
- s.MinValue != null) return;
- var detail = new QsQaItemXj02();
- detail.Pid = s.Id;
- detail.Gid = xjDto.gid;
- detail.Fstand = "鈭�";
- detail.FcheckResu = "1";
- detail.UpdateBy = xjDto.userNo;
- detail.count = (int?)s.LevelNum;
- SetQSItemDetail(detail);
- });
-
- return Convert.ToInt32(xjDto.gid);
- }
-
-
- public XJDto getXjDetail02ById(decimal? id)
- {
- var xjDto = new XJDto();
-
- var db = SqlSugarHelper.GetInstance();
- var qsQaItemXj01 =
- db.Queryable<QsQaItemXj01>().Single(s => s.Id == id);
-
- if (qsQaItemXj01.IsPass == 0)
- qsQaItemXj01.result = "涓嶅悎鏍�";
- else if (qsQaItemXj01.IsPass == 1)
- qsQaItemXj01.result = "鍚堟牸";
- else
- qsQaItemXj01.result = "鏈畬鎴�";
-
- if (qsQaItemXj01.Picture is { Length: > 0 })
- qsQaItemXj01.imageData =
- Convert.ToBase64String(qsQaItemXj01.Picture);
-
- xjDto.ItemXj01 = qsQaItemXj01;
-
-
- xjDto.ItemXj02s = db.Queryable<QsQaItemXj02>().Where(s => s.Pid == id)
- .ToList();
-
- return xjDto;
- }
-
- public int SetQSItemDetail(QsQaItemXj02 detail)
- {
- var oracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- List<QsQaItemXj02> result = new();
- for (var i = 0; i < detail.count; i++)
- {
- var item = new QsQaItemXj02();
- item.Gid = detail.Gid;
- item.Pid = detail.Pid;
- item.Fstand = detail.Fstand;
- item.FcheckResu = detail.FcheckResu;
- item.CreateBy = detail.UpdateBy;
- item.CreateDate = DateTime.Now;
- result.Add(item);
- }
-
- return db.Insertable(result).ExecuteCommand();
- });
-
- detail.CreateBy = detail.UpdateBy;
-
- autoResult(detail);
-
- return oracle;
- }
-
- private int autoResult(QsQaItemXj02 detail)
- {
- var db = SqlSugarHelper.GetInstance();
-
- // Single 娌℃湁鏌ヨ鍒扮粨鏋滄椂杩斿洖Null锛屽鏋滅粨鏋滃ぇ浜�1鏉′細鎶涘嚭閿欒
- var QsQaItemXj01 = db.Queryable<QsQaItemXj01>()
- .Single(s => s.Id == detail.Pid);
-
- if (QsQaItemXj01 == null) return 0;
-
- var count = db.Queryable<QsQaItemXj02>()
- .Where(s => s.Pid == detail.Pid).Count();
-
-
- var result = 0;
-
- if (QsQaItemXj01.LevelNum != count) return 0;
-
- var passCount = db.Queryable<QsQaItemXj02>()
- .Where(s => s.Pid == detail.Pid && s.Fstand == "鈭�").Count();
-
- if (count == passCount) result = 1;
-
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- var commit = 0;
- commit += db.Updateable<QsQaItemXj01>()
- .SetColumns(s => s.IsPass == result)
- .Where(s => s.Id == detail.Pid)
- .ExecuteCommand();
-
- return commit;
- });
-
- //鑾峰彇妫�楠屽崟鐨勬楠岄」鐩悊璁轰釜鏁�
- var sum = db.Queryable<QsQaItemXj01>()
- .Where(s => s.Pid == detail.Gid).Sum(it => it.LevelNum);
-
- if (sum == null || sum == 0) return 1;
-
- //鑾峰彇妫�楠屽崟涓嬬殑妫�楠岄」鐩疄闄呬釜鏁�
- var icount = db.Queryable<QsQaItemXj02>()
- .Where(s => s.Gid == detail.Gid).Count();
-
- if (icount == 0) return 1;
-
- //瀹為檯涓暟绛変簬鐞嗚涓暟鏃跺妫�楠屽崟杩涜鍒ゅ畾
- if (sum == icount)
- {
- var FcheckResu = "涓嶅悎鏍�";
-
- //鑾峰彇杩欎釜妫�楠屽崟涓嬬殑鎵�鏈夊悎鏍肩殑妫�楠岀粨鏋�
- passCount = db.Queryable<QsQaItemXj02>()
- .Where(s => s.Gid == detail.Gid && s.Fstand == "鈭�").Count();
-
- //鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
- if (icount == passCount) FcheckResu = "鍚堟牸";
-
- SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsQaItemXj>()
- .SetColumns(s => s.FcheckResu == FcheckResu)
- .SetColumns(s => s.FcheckDate == DateTime.Now)
- .SetColumns(s => s.FcheckBy == detail.CreateBy)
- .SetColumns(s => s.LastupdateBy == detail.CreateBy)
- .SetColumns(s => s.LastupdateDate == DateTime.Now)
- .Where(s => s.Id == detail.Gid)
- .ExecuteCommand();
- });
- }
-
- return useTransactionWithOracle;
- }
-
- public int UpdateQSItemDetail(QsQaItemXj02 detail)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsQaItemXj02>()
- .SetColumns(s => s.UpdateBy == detail.UpdateBy)
- .SetColumns(s => s.UpdateDate == DateTime.Now)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.Fstand),
- s => s.Fstand == detail.Fstand)
- .SetColumnsIF(StringUtil.IsNotNullOrEmpty(detail.FcheckResu),
- s => s.FcheckResu == detail.FcheckResu)
- .Where(s => s.Id == detail.Id)
- .ExecuteCommand();
- });
-
- detail.CreateBy = detail.UpdateBy;
-
- withOracle += autoResult(detail);
-
- return withOracle;
- }
-
- //鍒犻櫎涓昏〃骞朵笖杩炵骇鍒犻櫎瀛愯〃鍜屽瓩琛�
- public int removeXJ(decimal? id)
- {
- var withOracle = SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var commit = 0;
- commit += db.Deleteable<QsQaItemXj>().Where(s => s.Id == id)
- .ExecuteCommand();
- commit += db.Deleteable<QsQaItemXj01>().Where(s => s.Pid == id)
- .ExecuteCommand();
- commit += db.Deleteable<QsQaItemXj02>().Where(s => s.Gid == id)
- .ExecuteCommand();
- return commit;
- });
-
- return withOracle;
- }
-
- //涓昏〃淇敼澶囨敞瀛楁
- public int saveRemarksGid(XJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsQaItemXj>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.gid)
- .ExecuteCommand();
- });
- }
-
- //瀛愯〃淇敼澶囨敞瀛楁
- public int saveRemarksPid(XJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsQaItemXj01>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.pid)
- .ExecuteCommand();
- });
- }
-
- //瀛欒〃淇敼澶囨敞瀛楁
- public int saveRemarksById(XJDto dto)
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- return db.Updateable<QsQaItemXj02>()
- .SetColumns(it =>
- it.Remarks == dto.Remarks) //SetColumns鏄彲浠ュ彔鍔犵殑 鍐�2涓氨2涓瓧娈佃祴鍊�
- .Where(it => it.Id == dto.id)
- .ExecuteCommand();
- });
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesDepotSectionsManager.cs b/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
deleted file mode 100644
index 0fbb744..0000000
--- a/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesDepotSectionsManager : Repository<MesDepotSections>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- public string GetSectionName(WarehouseQuery query)
- {
- var sectionName = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.DepotId == b.DepotId))
- .Where((a, b) => a.DepotSectionCode == query.sectionCode)
- .Select((a, b) => a.DepotSectionName).Single();
-
- if (sectionName == null)
- throw new Exception("搴撲綅缂栫爜 " + query.sectionCode + " 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- return sectionName;
- }
-
- //搴撲綅鍙樻洿
- public MesDepotSections ScanInDepotSectionsName(WarehouseQuery query)
- {
- if (string.IsNullOrEmpty(query.sectionCode))
- throw new Exception("璇锋壂搴撲綅鏉＄爜!");
-
- var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.DepotId == b.DepotId))
- .Where((a, b) => a.DepotSectionCode == query.sectionCode)
- .Select((a, b) => new MesDepotSections
- {
- DepotSectionName = a.DepotSectionName,
- DepotCode = b.DepotCode,
- DepotName = b.DepotName
- }).First();
-
- if (mesDepotSections == null)
- throw new Exception("搴撲綅缂栫爜" + query.sectionCode + " 涓嶅瓨鍦紝璇风‘璁�!");
-
- return mesDepotSections;
- }
-
- //搴撲綅鍙樻洿
- public MesInvItemStocks ScanEditBarcode(WarehouseQuery entity)
- {
- if (string.IsNullOrEmpty(entity.sectionCode))
- throw new Exception("璇锋壂搴撲綅鏉＄爜!");
-
- var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.Zuid.ToString() == b.Zuid))
- .Where((a, b) => a.DepotSectionCode == entity.sectionCode)
- .First();
- if (mesDepotSections == null)
- throw new Exception("搴撲綅缂栫爜" + entity.sectionCode + " 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
- .Where(s => s.ItemBarcode == entity.barcode).First();
-
- if (mesInvItemStocks == null) throw new Exception("鏉＄爜鍦ㄤ粨搴撲腑涓嶅瓨鍦紝璇锋牳瀵癸紒");
-
- if (mesInvItemStocks.DepotsCode != mesDepotSections.DepotCode)
- throw new Exception(
- "鏉＄爜鍘熶粨搴擄細" + mesInvItemStocks.DepotsCode + " 涓庣洰鏍囦粨搴擄細" +
- mesDepotSections.DepotCode + " 涓嶄竴鑷达紝搴撲綅鍙樻洿澶辫触锛�");
-
- UseTransaction(db =>
- {
- return db.Updateable<MesInvItemStocks>()
- .SetColumns(s => s.DepotsCode == mesDepotSections.DepotCode)
- .SetColumns(s => s.DepotSectionsCode == entity.sectionCode)
- .Where(s => s.ItemBarcode == entity.barcode)
- .ExecuteCommand();
- });
-
- return mesInvItemStocks;
- }
-
- //璋冩嫧鍏ュ簱
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvBusiness2Manager.cs b/MES.Service/service/Warehouse/MesInvBusiness2Manager.cs
deleted file mode 100644
index 13679e8..0000000
--- a/MES.Service/service/Warehouse/MesInvBusiness2Manager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvBusiness2Manager : Repository<MesInvBusiness2>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvBusiness2Manager.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(MesInvBusiness2).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesInvBusiness2(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesInvBusiness2(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesInvBusiness2() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesInvBusiness2(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
deleted file mode 100644
index f4a9f24..0000000
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemArnDetailManager : Repository<MesInvItemArnDetail>
-{
- //var result = db.Ado.GetString($"SELECT f_getseqnextvalue('{sequenceName}') FROM DUAL");
-
- private readonly PurdhbManager purdhbManager = new();
- private readonly PurdkaManager purdkaManager = new();
- private readonly PurdkbManager purdkbManager = new();
-
- private readonly MesQaItemsDetect01Manager rohInDataManager = new();
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemArnDetailManager.cs
-
- public List<MesInvItemArnDetail> GetDetails(WarehouseQuery query)
- {
- // 鏌ヨ
- return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>(
- (c, t, u) => new object[]
- {
- JoinType.Left,
- c.ItemNo == t.ItemNo && c.Company == t.Company &&
- c.Factory == t.Factory,
- JoinType.Left,
- t.Fpurchaseunitid == u.Id && t.Factory == u.Factory &&
- t.Company == u.Company
- })
- .Where((c, t, u) => c.Mid == query.id)
- .Select((c, t, u) => new MesInvItemArnDetail
- {
- CheckRes = c.CheckRes,
- itemModel = t.ItemModel,
- itemName = t.ItemName,
- UrgentFlag = c.UrgentFlag,
- Memo = c.Memo,
- Quantity = c.Quantity,
- SubQty = c.SubQty,
- CheckStates = c.CheckStates,
- WorkLine = c.WorkLine,
- IsdepsIn = c.IsdepsIn,
- OkRkqty = c.OkRkqty,
- Fname = u.Fname,
- EbelnQty = c.EbelnQty,
- ItemNo = c.ItemNo,
- Id = c.Id,
- Ebeln = c.Ebeln
- })
- .ToList();
- }
-
- public List<Material> GetMaterial(WarehouseQuery query)
- {
- // 鏌ヨ
- var result = Db
- .Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
- MesItems, MesUnit, MesQaItemsDetectDetail5>(
- (a, d, b, c, t, z) => new object[]
- {
- JoinType.Inner, d.BillNo == a.LotNo,
- JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
- JoinType.Inner,
- a.ItemNo == c.ItemNo && a.Company == c.Company &&
- a.Factory == c.Factory,
- JoinType.Inner, c.Fpurchaseunitid == t.Id,
- JoinType.Inner, z.ReleaseNo == a.ReleaseNo
- })
- .Where((a, d, b, c, t, z) => a.FngHandle == "閫�璐�" &&
- z.FcheckResu == "涓嶅悎鏍�" &&
- query.ItemArnDetailIds.Contains(b.Id))
- .Select((a, d, b, c, t) => new Material
- {
- FmrMode = a.Fmrmode,
- FngDesc = a.FngDesc,
- FsrcEntryId = b.Id,
- FrmRealQty = b.Quantity,
- FmaterialId = a.ItemNo,
- FstockId = d.DepotsCode,
- Funit = t.Fnumber,
- FmesEntryId = a.Id,
- Mid = d.Id
- })
- .ToList();
-
- return result;
- }
-
- public bool SetMaterial(Material material)
- {
- var b1 = UseTransaction(db =>
- {
- var executeCommand = db.Updateable<MesInvItemArnDetail>()
- .SetColumns(s => s.CheckRes == "涓嶅悎鏍�")
- .SetColumns(s => s.CheckStates == "閫�璐�")
- .SetColumns(s => s.Ischeck == 1)
- .Where(s =>
- s.Mid == material.Mid && s.ItemNo == material.FmaterialId)
- .ExecuteCommand();
-
- var mesQaItemsDetect01 = db.Queryable<MesQaItemsDetect01>()
- .Where(a => a.Id == material.FmesEntryId).Single();
-
- if (mesQaItemsDetect01 == null) return 0;
-
- var suppName = db.Queryable<MesSupplier>()
- .Where(b => b.SuppNo == mesQaItemsDetect01.SuppNo)
- .Select<string>(b => b.SuppName).First();
-
- var CIdt = db.Ado.GetString(
- "SELECT f_getseqnextvalue('mes_inv_item_ins') FROM DUAL");
-
- var billNo = db.Ado.GetString(
- "SELECT getbillcode1('1000', '1000', 'INV_IN_BACK') FROM DUAL");
-
- // PURDKA
- var purdka = GetPurdka(CIdt, billNo, mesQaItemsDetect01, suppName);
-
- executeCommand += db.Insertable(purdka).ExecuteCommand();
-
- executeCommand += InsertPurdkbs(db, mesQaItemsDetect01, billNo);
-
- executeCommand += db.Updateable<MesQaItemsDetect01>()
- .SetColumns(c => c.Modify1Flag == 1)
- .SetColumns(c => c.Modify1By == material.UserName)
- .SetColumns(c => c.Modify1Date == DateTime.Now)
- .SetColumns(c => c.FngHandle == "閫�璐�")
- .Where(c => c.ReleaseNo == mesQaItemsDetect01.ReleaseNo)
- .ExecuteCommand();
-
- return executeCommand;
- }) >= 4;
-
- if (b1 == false) throw new NotImplementedException("鎺ㄩ�佸け璐ワ紝Mes鏂归潰鍑虹幇闂");
-
- return b1;
- }
-
- private int InsertPurdkbs(SqlSugarScope db,
- MesQaItemsDetect01 mesQaItemsDetect01, string billNo)
- {
- var purdhbs = db.Queryable<Purdhb>()
- .Where(c => c.Dhb001 == mesQaItemsDetect01.LotNo
- && c.Dhb003 == mesQaItemsDetect01.ItemNo)
- .Select(c => new Purdhb
- {
- Dhb002 = c.Dhb002,
- Dhb003 = c.Dhb003,
- Dhb006 = c.Dhb006,
- Dhb007 = c.Dhb007,
- Dhb017 = c.Dhb017,
- Dhb018 = c.Dhb018,
- Dhb001 = c.Dhb001,
- Dhb042 = c.Dhb042
- }).ToList();
-
- var list = new List<Purdkb>();
-
- purdhbs.ForEach(s =>
- {
- var id = db.Ado.GetString(
- "SELECT f_getseqnextvalue('MES_INV_ITEM_IN_C_DETAILS') FROM DUAL");
-
- var purdkb = new Purdkb();
- purdkb.Id = Convert.ToDecimal(id);
- purdkb.Dkb001 = billNo;
- purdkb.Dkb002 = s.Dhb002;
- purdkb.Dkb003 = s.Dhb003;
- purdkb.Dkb006 = s.Dhb006;
- purdkb.Dkb007 = s.Dhb006;
- purdkb.Dkb008 = 0;
- purdkb.Dkb009 = s.Dhb007;
- purdkb.Dkb010 = s.Dhb017;
- purdkb.Dkb011 = s.Dhb018;
- purdkb.Dkb012 = s.Dhb001;
- purdkb.Dkb013 = s.Dhb002;
- purdkb.Dkb016 = s.Dhb042;
-
- list.Add(purdkb);
- });
-
- var insertRange = db.Insertable(list).ExecuteCommand();
-
- return insertRange == purdhbs.Count ? 1 : 0;
- }
-
- private static Purdka GetPurdka(string CIdt, string billNo,
- MesQaItemsDetect01 mesQaItemsDetect01, string suppName)
- {
- var date = DateTime.Now.ToString("yyyy-MM-dd");
- var purdka = new Purdka();
- purdka.Id = Convert.ToDecimal(CIdt);
- purdka.Dka001 = billNo;
- purdka.Dka002 = "閲囪喘閫�璐�";
- purdka.Dka003 = date;
- purdka.Dka004 = date;
- purdka.Dka005 = mesQaItemsDetect01.SuppNo;
- purdka.Dka006 = suppName;
- purdka.Dka010 = "1";
- purdka.Dka013 = 0;
- purdka.Createuser = mesQaItemsDetect01.LastupdateBy;
- return purdka;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemArnManager.cs b/MES.Service/service/Warehouse/MesInvItemArnManager.cs
deleted file mode 100644
index c382c5c..0000000
--- a/MES.Service/service/Warehouse/MesInvItemArnManager.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemArnManager : Repository<MesInvItemArn>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemArnManager.cs
- public List<MesInvItemArn> GetPagedResults(WarehouseQuery query)
- {
- // 鏌ヨ骞跺垎椤�
- var result = Db.Queryable<MesInvItemArn, MesDepots, MesSupplier>(
- (a, d, f) => new object[]
- {
- JoinType.Left,
- a.DepotsCode == d.DepotCode && d.Factory == a.Factory &&
- d.Company == a.Company,
- JoinType.Left, a.SuppNo == f.SuppNo
- })
- .Where((a, d, f) => a.BillTypeId == 700
- && a.TransctionNo == "701"
- && a.Factory == "1000"
- && a.Company == "1000"
- && a.IsVisual == 0)
- .WhereIF(query.id != null, (a, d, f) => a.Id == query.id)
- .Select((a, d, f) => new MesInvItemArn
- {
- Status = a.Status,
- SuppNo = a.SuppNo,
- FType = a.FType,
- Fstatus = a.Fstatus,
- Remark = a.Remark,
- Insdate = a.Insdate,
- CheckDate = a.CheckDate,
- DepotsCode = a.DepotsCode,
- Id = a.Id,
- UrgentFlag = a.UrgentFlag,
- CreateBy = a.CreateBy,
- BillNo = a.BillNo,
- PaperBillNo = a.PaperBillNo,
- DepotName = d.DepotName,
- SuppName = f.SuppName
- }).OrderByDescending(a => a.BillNo)
- .ToPageList(query.PageIndex, query.Limit);
-
- return result;
- }
-
- public List<MesSupplier> GetSuppliers()
- {
- return Db.Queryable<MesInvItemArn, MesSupplier>((a, b) =>
- new JoinQueryInfos(JoinType.Left, a.SuppNo == b.SuppNo))
- .GroupBy((a, b) => new { b.Id, a.SuppNo, b.SuppName })
- .Select((a, b) => new MesSupplier
- {
- SuppNo = a.SuppNo,
- SuppName = b.SuppName,
- Id = b.Id
- })
- .ToList();
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs b/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs
deleted file mode 100644
index 836f395..0000000
--- a/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing 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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- 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);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=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
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
deleted file mode 100644
index 48f5973..0000000
--- a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-锘縰sing System.Data;
-using MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.util;
-using Newtonsoft.Json;
-using SqlSugar;
-using DbType = System.Data.DbType;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemInCDetailsManager : Repository<MesInvItemInCDetails>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- 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_N(: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<MesInvItemInCItems> GetItemInDetails(decimal? pid)
- {
- var result = Db.Queryable<MesInvItemInCItems>()
- .WhereIF(pid > 0, g => g.ItemInId == pid).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 ErpUrl = AppsettingsUtility.Settings.ProductionErpUrl;
- var message = new MessageCenter
- {
- TableName = tableName,
- Url = ErpUrl,
- 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,
- IsMessage = 0,
- 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<MesInvItemInCItems, 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;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemInCItemsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCItemsManager.cs
deleted file mode 100644
index fee3845..0000000
--- a/MES.Service/service/Warehouse/MesInvItemInCItemsManager.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemInCItemsManager : Repository<MesInvItemInCItems>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemInCItemsManager.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(MesInvItemInCItems).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesInvItemInCItems(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData)
- .ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesInvItemInCItems(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesInvItemInCItems() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData)
- .ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesInvItemInCItems(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesCDetailsManager.cs
deleted file mode 100644
index cf8c2a3..0000000
--- a/MES.Service/service/Warehouse/MesInvItemMovesCDetailsManager.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class
- MesInvItemMovesCDetailsManager : Repository<MesInvItemMovesCDetails>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemMovesCDetailsManager.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(MesInvItemMovesCDetails).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesInvItemMovesCDetails(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesInvItemMovesCDetails(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesInvItemMovesCDetails() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesInvItemMovesCDetails(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
deleted file mode 100644
index e3122a5..0000000
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ /dev/null
@@ -1,498 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.util;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemMovesManager : Repository<MesInvItemMoves>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemMovesManager.cs
-
- public MovesDto ScanInBarcode(WarehouseQuery query)
- {
- if (string.IsNullOrEmpty(query.sectionCode)) throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
-
- var pBillTypeId = 300;
- var pTransctionNo = 301;
-
- var depotQuery = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
- new JoinQueryInfos(
- JoinType.Inner, a.Zuid.ToString() == b.Zuid))
- .Where((a, b) => a.DepotSectionCode == query.sectionCode)
- .Select((a, b) => new { b.DepotCode })
- .First();
-
- if (depotQuery == null) throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- var cDepotCode = depotQuery.DepotCode;
-
- // 鏌ヨ璋冩嫈鍏ュ簱淇℃伅
- var itemMoveQuery = Db
- .Queryable<MesInvItemMoves, MesInvItemMovesCDetails>((a, b) =>
- new JoinQueryInfos(
- JoinType.Inner, a.Id == b.ItemMoveId))
- .Where((a, b) => b.ItemBarcode == query.barcode &&
- a.BillTypeId == pBillTypeId &&
- a.TransactionNo == pTransctionNo &&
- a.Status == 1 && SqlFunc.IsNull(b.MoveOk, 0) != 1)
- .Select((a, b) => new { a.Id, a.BillNo, a.InvDepotsCode })
- .First();
-
- if (itemMoveQuery == null) throw new Exception("鏉＄爜鏈仛璋冩嫈鍑哄簱鎵爜锛岃鏍稿锛�");
-
- var cBillNo = itemMoveQuery.BillNo;
- var iDepotCode = itemMoveQuery.InvDepotsCode;
-
- // 楠岃瘉搴撳尯涓庝粨搴�
- var depotValidationQuery = Db.Queryable<MesDepotSections, MesDepots>(
- (a, b) => new JoinQueryInfos(
- JoinType.Inner, a.Zuid.ToString() == b.Zuid))
- .Where((a, b) => a.DepotSectionCode == query.sectionCode &&
- b.DepotCode == iDepotCode)
- .Select((a, b) => new { b.DepotCode })
- .First();
-
- if (depotValidationQuery == null) throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- if (iDepotCode != depotValidationQuery.DepotCode) throw new Exception("瀹為檯浠撳簱涓庣敵璇疯皟鍏ヤ粨搴撲笉绗︼紝璇锋牳瀵癸紒");
-
- var barcodeCount = Db.Queryable<MesInvItemMovesCDetails>()
- .Where(b =>
- b.ItemBarcode == query.barcode &&
- b.ItemMoveId == itemMoveQuery.Id && b.MoveOk == 1)
- .Count();
-
- if (barcodeCount > 0) throw new Exception("鏉＄爜璋冩嫈宸插畬鎴愶紝璇锋牳瀵癸紒");
-
- var barcodeInfo = Db.Queryable<MesInvItemBarcodes>()
- .Where(t => t.ItemBarcode == query.barcode)
- .First();
-
- if (barcodeInfo == null) throw new Exception("鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
-
- var isAudit = UseTransaction(db =>
- {
- // 鏇存柊涓氬姟銆佸簱瀛樺拰鏉＄爜鏁版嵁
- db.Updateable<MesInvBusiness2>()
- .SetColumns(b => new MesInvBusiness2
- {
- ToInvDepotsCode = cDepotCode,
- ToInvDepotSectionsCode = query.sectionCode
- })
- .Where(b =>
- b.BillNo == cBillNo && b.BillTypeId == pBillTypeId &&
- b.TransactionCode == pTransctionNo.ToString() &&
- b.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- db.Updateable<MesInvItemStocks>()
- .SetColumns(b => new MesInvItemStocks
- {
- DepotsCode = cDepotCode,
- DepotSectionsCode = query.sectionCode
- })
- .Where(b => b.ItemBarcode == query.barcode)
- .ExecuteCommand();
-
- db.Updateable<MesInvItemMovesCDetails>()
- .SetColumns(b => new MesInvItemMovesCDetails
- {
- MoveOk = 1,
- InvDepotsCode = cDepotCode,
- InvDepotSectionsCode = query.sectionCode
- })
- .Where(b =>
- b.ItemBarcode == query.barcode &&
- b.ItemMoveId == itemMoveQuery.Id)
- .ExecuteCommand();
-
- // 妫�鏌ユ槸鍚︽墍鏈夋潯鐮佸凡鎵爜绉诲簱
- var totalQuantity = db.Queryable<MesInvItemOutItems>()
- .Where(a => a.ItemOutId == itemMoveQuery.Id)
- .Sum(a => SqlFunc.IsNull(a.Quantity, 0));
-
- var scannedQuantity = db.Queryable<MesInvItemMovesCDetails>()
- .Where(a => a.ItemMoveId == itemMoveQuery.Id && a.MoveOk == 1)
- .Sum(a => SqlFunc.IsNull(a.Quantity, 0));
-
- if (totalQuantity == scannedQuantity) return 1;
-
- return 0;
- });
-
- var dto = new MovesDto();
- dto.InAudit = isAudit == 1;
- dto.BarcodesInfo = barcodeInfo;
- return dto;
- }
-
-
- public List<MesInvItemMoves> GetBillNo(WarehouseQuery query)
- {
- query.Factory = "1000";
- query.Company = "1000";
-
- return Db.Queryable<MesInvItemMoves>()
- .Where(it =>
- SqlFunc.IsNull(it.Status, 0) == 1 &&
- SqlFunc.IsNull(it.Ts, 0) != 1)
- .Where(it =>
- it.Factory == query.Factory && it.Company == query.Company)
- .OrderBy(it => it.Id, OrderByType.Desc).ToList();
- }
-
- public List<MesInvItemMoves> GetPage(WarehouseQuery query)
- {
- return Db.Queryable<MesInvItemMoves>()
- .WhereIF(!string.IsNullOrEmpty(query.billNo),
- s => s.BillNo == query.billNo)
- .OrderByDescending(s => s.Id)
- .ToPageList(query.PageIndex, query.Limit);
- }
-
- public MovesDto GetItems(WarehouseQuery query)
- {
- var dto = new MovesDto();
-
- dto.BarcodeList = GetItemMovesCDetails(query);
- dto.OutItems = GetItemOutItems(query);
-
- return dto;
- }
-
- private List<MesInvItemOutItems> GetItemOutItems(WarehouseQuery query)
- {
- var sql = string.Format(
- "SELECT C.ITEM_NO, C.QUANTITY, C.REMARK, C.REMARK, S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK, NVL(ST.QUANTITY, 0) WLKC FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID LEFT JOIN MES_UNIT U ON U.ID = S.ITEM_UNIT LEFT JOIN MES_DEPOTS P ON P.DEPOT_CODE = C.DEPOT_CODE LEFT JOIN MES_DEPOT_SECTIONS E ON E.DEPOT_SECTION_CODE = C.DEPOT_SECTION_CODE LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK FROM MES_INV_ITEM_MOVES_C_DETAILS GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO LEFT JOIN MES_INV_ITEM_MOVES A ON A.ID = C.ITEM_OUT_ID left join (SELECT ITEM_ID, SUM(QUANTITY) QUANTITY, DEPOTS_CODE FROM MES_INV_ITEM_STOCKS GROUP BY ITEM_ID, DEPOTS_CODE) ST ON C.ITEM_ID = ST.ITEM_ID AND ST.DEPOTS_CODE = A.FROM_DEPOTS_CODE where C.ITEM_OUT_ID = {0}",
- query.id);
-
- return Db.Ado.SqlQuery<MesInvItemOutItems>(sql);
- }
-
- private List<MesInvItemMovesCDetails> GetItemMovesCDetails(
- WarehouseQuery query)
- {
- return Db.Queryable<MesInvItemMovesCDetails, MesItems, MesSupplier>(
- (b, c, f) => new JoinQueryInfos(
- JoinType.Left,
- b.ItemNo == c.ItemNo && b.Company == c.Company &&
- b.Factory == c.Factory,
- JoinType.Left, b.SuppNo == f.SuppNo
- ))
- .Where((b, c, f) => b.ItemMoveId == query.id)
- .Select((b, c, f) => new MesInvItemMovesCDetails
- {
- FromDepotSectionsCode = b.FromDepotSectionsCode,
- BoardStyle = b.BoardStyle,
- FromDepotsCode = b.FromDepotsCode,
- InvDepotSectionsCode = b.InvDepotSectionsCode,
- InvDepotsCode = b.InvDepotsCode,
- Quantity = b.Quantity,
- LotNo = b.LotNo,
- ItemNo = b.ItemNo,
- ItemBarcode = b.ItemBarcode,
- ItemName = c.ItemName,
- ItemModel = c.ItemModel,
- ItemUnit = c.ItemUnit,
- SuppName = f.SuppName,
- MoveOk =
- SqlFunc.IsNull(b.MoveOk, 0) // 浣跨敤 SqlFunc.IsNull 瀹炵幇 NVL 鐨勬晥鏋�
- }).ToList();
- }
-
- public OutItemDto ScanMoveBarcode(WarehouseQuery query)
- {
- var BillTypeId = 300;
- var TransctionNo = 301;
- query.Factory = "1000";
- query.Company = "1000";
-
- if (string.IsNullOrEmpty(query.billNo)) throw new Exception("璇烽�夊崟鎹彿锛�");
-
- var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
- .Where(s => s.ItemBarcode == query.barcode &&
- s.Quantity > 0 && s.DepotsCode != null).First();
- if (mesInvItemStocks == null)
- throw new Exception("搴撳瓨涓棤姝ゆ潯鐮侊紝璇锋牳瀵癸紒" + query.barcode);
-
- var mesInvItemMoves = Db.Queryable<MesInvItemMoves>()
- .Where(d => d.TransactionNo == TransctionNo
- && SqlFunc.IsNull(d.Status, 0) == 1).First();
-
- if (mesInvItemMoves == null)
- throw new Exception("鍑哄簱鍗� " + query.billNo + "涓嶅瓨鍦紝璇风‘璁わ紒");
-
- var count = Db.Queryable<MesInvItemMoves, MesInvItemMovesCDetails>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.Id == b.ItemMoveId))
- .Where((a, b) => b.ItemBarcode == query.barcode
- && a.TransactionNo == TransctionNo &&
- SqlFunc.IsNull(a.Status, 0) == 0).Count();
- if (count > 0) throw new Exception("鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
-
- count = Db.Queryable<MesInvItemMoves, MesInvItemMovesCDetails>((a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.Id == b.ItemMoveId))
- .Where((a, b) => b.ItemBarcode == query.barcode
- && a.TransactionNo == TransctionNo &&
- SqlFunc.IsNull(b.MoveOk, 0) == 0).Count();
-
- if (count > 0) throw new Exception("鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
-
- if (mesInvItemMoves.FromDepotsCode != mesInvItemStocks.DepotsCode)
- throw new Exception("鏉＄爜鐜板瓨浠撳簱涓庣敵璇峰嚭璐т粨搴撲笉涓�鑷达紝璇锋牳瀵癸紒");
-
- var quantity = Db.Queryable<MesInvItemOutItems>()
- .Where(b => b.ItemNo == mesInvItemStocks.ItemNo
- && b.ItemOutId == mesInvItemMoves.Id)
- .Sum(b => b.Quantity);
-
- if (quantity == null)
- throw new Exception("鎵爜鐗╂枡闈炴湰娆＄敵璇风墿鏂欙紝璇锋牳瀵癸紒" + query.barcode);
-
- var sum = Db.Queryable<MesInvItemMovesCDetails>()
- .Where(b => b.ItemNo == mesInvItemStocks.ItemNo
- && b.ItemMoveId == mesInvItemMoves.Id)
- .Sum(b => b.Quantity) ?? 0;
-
- var sumqty = sum + (mesInvItemStocks.Quantity ?? 0);
-
- if (sumqty > quantity)
- throw new Exception(
- "宸叉壂鏉＄爜鏁伴噺鎴栨湰娆℃壂鐮佹暟閲忥細" + sumqty + " 澶т簬鐢宠鏁伴噺锛�" + quantity + "锛岃鏍稿锛�");
-
- UseTransaction(db =>
- {
- SaveMesInvItemMovesCDetails(db, query, mesInvItemMoves,
- mesInvItemStocks);
-
- // Insert into mes_inv_business2
- SaveMesInvBusiness2(db, query, BillTypeId, TransctionNo,
- mesInvItemStocks, mesInvItemMoves);
-
- if (TransctionNo == 303)
- db.Updateable<MesInvItemStocks>()
- .SetColumns(s =>
- s.DepotSectionsCode == mesInvItemMoves.InvDepotsCode)
- .SetColumns(s =>
- s.DepotsCode == mesInvItemMoves.InvDepotsCode)
- .Where(s => s.Id == mesInvItemStocks.Id)
- .ExecuteCommand();
- else
- db.Updateable<MesInvItemStocks>()
- .SetColumns(s => s.DepotSectionsCode == null)
- .SetColumns(s => s.DepotsCode == null)
- .Where(s => s.Id == mesInvItemStocks.Id)
- .ExecuteCommand();
-
- var scanOutShowDb = ScanOutShowDb(query);
- if (CollectionUtil.IsNullOrEmpty(scanOutShowDb))
- db.Updateable<MesInvItemMoves>()
- .SetColumns(s => s.Status == 1)
- .SetColumns(s => s.Checkdate == DateTime.Now)
- .SetColumns(s => s.Checkuser == query.userName)
- .Where(s => s.BillNo == query.billNo).ExecuteCommand();
-
- return 1;
- });
-
- var itemDto = new OutItemDto();
- //itemDto.SumItem = scanOutShowDb;
-
- if (TransctionNo == 201) itemDto.Quantity = mesInvItemStocks.Quantity;
-
- itemDto.ItemNo = mesInvItemStocks.ItemNo;
-
- return itemDto;
- }
-
- private void SaveMesInvBusiness2(SqlSugarScope Db, WarehouseQuery query,
- int BillTypeId,
- int TransctionNo, MesInvItemStocks mesInvItemStocks,
- MesInvItemMoves mesInvItemMoves)
- {
- var executeCommand = Db.Insertable(new MesInvBusiness2
- {
- Status = 1,
- BillTypeId = BillTypeId,
- TransactionCode = TransctionNo.ToString(),
- BusinessType = 1,
- ItemBarcode = query.barcode,
- ItemNo = mesInvItemStocks.ItemNo,
- LotNo = mesInvItemStocks.LotNo,
- EpFlag = 1,
- Quantity = mesInvItemStocks.Quantity,
- FromInvDepotsCode = mesInvItemStocks.DepotsCode,
- FromInvDepotSectionsCode = mesInvItemStocks.DepotSectionsCode,
- ToInvDepotsCode = TransctionNo == 303
- ? mesInvItemMoves.InvDepotsCode
- : null,
- ToInvDepotSectionsCode = TransctionNo == 303
- ? mesInvItemMoves.InvDepotsCode
- : null,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- Factory = query.Factory,
- Company = query.Company,
- TaskNo = mesInvItemStocks.TaskNo,
- BillNo = query.billNo,
- WorkNo = mesInvItemStocks.WorkNo,
- WorkLine = mesInvItemStocks.WorkLine,
- SuppNo = mesInvItemStocks.SuppNo
- }).ExecuteCommand();
-
- if (executeCommand <= 0) throw new Exception("鍐欏叆MesInvBusiness2琛ㄥけ璐�");
- }
-
- private void SaveMesInvItemMovesCDetails(SqlSugarScope Db,
- WarehouseQuery query,
- MesInvItemMoves mesInvItemMoves, MesInvItemStocks mesInvItemStocks)
- {
- var executeCommand = Db.Insertable(new MesInvItemMovesCDetails
- {
- ItemMoveId = mesInvItemMoves.Id,
- ItemBarcode = query.barcode,
- CItemCode = mesInvItemStocks.CItemCode,
- ItemNo = mesInvItemStocks.ItemNo,
- LotNo = mesInvItemStocks.LotNo,
- Quantity = mesInvItemStocks.Quantity,
- EpFlag = mesInvItemStocks.EpFlag,
- CreateBy = query.userName,
- CreateDate = DateTime.Now,
- LastupdateBy = query.userName,
- LastupdateDate = DateTime.Now,
- CustNo = mesInvItemStocks.CustomerNo,
- TaskNo = mesInvItemStocks.TaskNo,
- FromDepotsCode = mesInvItemStocks.DepotsCode,
- FromDepotSectionsCode = mesInvItemStocks.DepotSectionsCode,
- Factory = mesInvItemStocks.Factory,
- Company = mesInvItemStocks.Company,
- IqcStatus = mesInvItemStocks.IqcStatus,
- Fcar = mesInvItemStocks.Fcar,
- IndepDate = mesInvItemStocks.IndepDate,
- VisableSubmit = mesInvItemStocks.VisableSubmit,
- VisableSubmitBy = mesInvItemStocks.VisableSubmitBy,
- VisableSubmitDate = mesInvItemStocks.VisableSubmitDate,
- BoardStyle = mesInvItemStocks.BoardStyle,
- WorkNo = mesInvItemStocks.WorkNo,
- WorkLine = mesInvItemStocks.WorkLine,
- SuppNo = mesInvItemStocks.SuppNo
- }).ExecuteCommand();
-
- if (executeCommand <= 0)
- throw new Exception("鍐欏叆MesInvItemMovesCDetails琛ㄥけ璐�");
- }
-
- //scan_out_show_DB
- private List<InventoryItem> ScanOutShowDb(WarehouseQuery query)
- {
- var BillTypeId = 300;
- var TransctionNo = 301;
- query.Factory = "1000";
- query.Company = "1000";
-
- if (string.IsNullOrEmpty(query.billNo)) throw new Exception("璇烽�夊崟鎹彿锛�");
-
- var sql = string.Format(
- "select f_get_sections_code({0}, {1}, b.item_no) sections_code , s.erp_item_no , S.ITEM_MODEL , to_char(nvl(b.quantity, 0) - nvl(quantity_ok, 0), 'FM9999999990.00') flist from mes_inv_item_moves a join mes_inv_item_out_items b on b.item_out_id = a.id join mes_items s on b.item_no = s.item_no left join (select ITEM_MOVE_ID, item_no, sum(quantity) quantity_ok from MES_INV_ITEM_MOVES_C_DETAILS group by ITEM_MOVE_ID, item_no) c on c.ITEM_MOVE_ID = a.id and b.item_no = c.item_no where 1 = 1 and a.bill_type_id = {2} and a.transaction_no = {3} and a.bill_no = {4} and nvl(b.quantity, 0) - nvl(quantity_ok, 0) > 0 and rownum < 500 AND A.STATUS = 1 order by f_get_sections_code({0}, {1}, b.item_no), s.erp_item_no ",
- query.Factory, query.Company, BillTypeId, TransctionNo,
- query.billNo);
-
- var results = Db.Ado.SqlQuery<InventoryItem>(sql);
-
- return results;
- }
-
- public bool Audit(WarehouseQuery query)
- {
- return Db.Updateable<MesInvItemMoves>()
- .SetColumns(a => new MesInvItemMoves { Ts = 1 })
- .Where(a => a.Id == query.id)
- .ExecuteCommand() > 0;
- }
-
- 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("鑾峰彇鏁版嵁澶辫触");
- }
-
- public MessageCenter MesToErpParam(WarehouseQuery query)
- {
- var erpParameters = "";
- var title = "";
- var tableName = "MES_INV_ITEM_MOVES_" + 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 ErpUrl = AppsettingsUtility.Settings.ProductionErpUrl;
- var message = new MessageCenter
- {
- TableName = tableName,
- Url = ErpUrl,
- Status = 1,
- CreateBy = query.userName,
- Route = query.billNo,
- Title = title,
- PageName = "Allocation/Add?id=" + query.id +
- "&billNo=" + query.billNo,
- CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Method = "POST",
- Seq = 1,
- Data = erpParameters,
- IsMessage = 0,
- ContentType = "application/x-www-form-urlencoded"
- };
- return message;
- }
-
- private string GetErpParameters(string? billNo)
- {
- // var invItemIns = Db.Queryable<MesInvItemOuts>()
- // .Single(x => x.ItemOutNo == billNo);
- //
- // //璋冪敤function鍑芥暟
- // var sql =
- // $"SELECT F_GENERATE_DATA_INSERTED('{billNo}') FROM DUAL;";
- // var jsonString = Db.Ado.SqlQuerySingle<string>(sql);
- //
- // var encodedUrl = "taskname=CGTL&mesid=" + invItemIns.Id +
- // "&optype=create&datajson=" + jsonString;
- //
- // return encodedUrl;
- return null;
- }
-
- private string GetDeApprovePam(decimal? id)
- {
- // var sid = (int)id;
- // var encodedUrl = "taskname=CGTL&mesid=" + sid +
- // "&optype=delete&datajson={}";
- //
- // return encodedUrl;
- return null;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs
deleted file mode 100644
index 4d40c63..0000000
--- a/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemOutCDetailsManager : Repository<MesInvItemOutCDetails>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemOutCDetailsManager.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(MesInvItemOutCDetails).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesInvItemOutCDetails(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesInvItemOutCDetails(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesInvItemOutCDetails() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesInvItemOutCDetails(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemOutItemsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutItemsManager.cs
deleted file mode 100644
index ec0d8cd..0000000
--- a/MES.Service/service/Warehouse/MesInvItemOutItemsManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemOutItemsManager : Repository<MesInvItemOutItems>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemOutItemsManager.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(MesInvItemOutItems).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesInvItemOutItems(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesInvItemOutItems(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesInvItemOutItems() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesInvItemOutItems(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
deleted file mode 100644
index 08b04e2..0000000
--- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ /dev/null
@@ -1,706 +0,0 @@
-锘縰sing System.Data;
-using MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.util;
-using SqlSugar;
-using DbType = System.Data.DbType;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemOutsManager : Repository<MesInvItemOuts>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemOutsManager.cs
-
- public bool ScanCode(WarehouseQuery query)
- {
- decimal billTypeId = 200;
- decimal transactionNo = 203;
-
- var count = Db.Queryable<MesInvItemOutCDetails>()
- .Where(a =>
- a.ItemBarcode == query.barcode && a.TaskNo == query.billNo)
- .Count();
-
- if (count > 0) throw new Exception("鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
-
- //楠岃瘉鏉＄爜
- var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
- .Where(a => a.ItemBarcode == query.barcode
- && a.Quantity > 0).Single();
-
- if (mesInvItemStocks == null)
- throw new Exception(query.barcode + "搴撳瓨涓棤姝ゆ潯鐮侊紝璇锋牳瀵癸紒");
-
- //楠岃瘉鍑哄簱鍗昺es_inv_item_outs
- var mesInvItemOuts = Db.Queryable<MesInvItemOuts>()
- .Where(d => d.ItemOutNo == query.billNo
- && d.BillTypeId == billTypeId &&
- d.TransactionNo == transactionNo).Single();
-
- //鍑哄簱鍗曠殑鏍￠獙
- if (mesInvItemOuts == null)
- throw new Exception("鍑哄簱鍗� " + query.billNo + " 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- //鏈鏍哥殑涓嶅厑璁哥户缁�
- if (mesInvItemOuts.Status == null || mesInvItemOuts.Status == 0)
- throw new Exception("鍑哄簱鍗� " + query.billNo + "鏈鏍�");
-
- //宸叉帹閫佺殑涓嶅厑璁哥户缁�
- if (mesInvItemOuts.Nflag == 1)
- throw new Exception("鍑哄簱鍗� " + query.billNo + "宸茬粡鎺ㄩ�侊紝鏃犳硶閲嶅鎺ㄩ��");
-
- var depotCodeOut = mesInvItemOuts.DepotCode ?? "0";
- var depotsCodeStock = mesInvItemStocks.DepotsCode ?? "0";
-
- if (!depotCodeOut.Equals(depotsCodeStock))
- {
- // 鍒涘缓閿欒娑堟伅
- var errorMessage =
- $"002[鏉＄爜浠撳簱{depotsCodeStock}涓庣敵璇蜂粨搴搟depotCodeOut}涓嶄竴鑷达紝璇锋牳瀵癸紒";
-
- throw new Exception(errorMessage);
- }
-
- var StocksNum = mesInvItemStocks.Quantity;
-
- var sql = string.Format(
- @"select nvl(SUM(S.QUANTITY),0) - nvl(SUM(S.TL_QTY),0)
- from MES_INV_ITEM_OUT_ITEMS S
- LEFT JOIN mes_inv_item_outs d
- ON S.ITEM_OUT_ID = D.ID
- where d.item_out_no = '{0}'
- and d.bill_type_id = {1}
- and d.transaction_no = {2}
- AND S.item_no = '{3}'
- and nvl(d.status, 0) = 1
- and nvl(d.nflag, 0) = 0", query.billNo, billTypeId,
- transactionNo,
- mesInvItemStocks.ItemNo);
-
- var cqty = Db.Ado.SqlQuerySingle<decimal>(sql);
-
- if (cqty == null)
- throw new Exception("鐗╂枡" + mesInvItemStocks.ItemNo +
- "鐨勮緟鍔╁睘鎬т笌鏉＄爜涓嶄竴鑷达紒璇锋鏌�");
-
- if (cqty < StocksNum) throw new Exception("璇风‘璁ゅ彂鏂欐暟閲�");
-
- //璋冪敤瀛樺偍杩囩▼
- try
- {
- // 瀹氫箟杈撳嚭鍙傛暟
- var outputResult = new SugarParameter("C_RESULT", null,
- DbType.Int32, ParameterDirection.Output,
- 4000);
-
- var outputMessage = new SugarParameter("MSG", null, DbType.String,
- ParameterDirection.Output, 4000);
-
- // 瀹氫箟杈撳叆鍙傛暟
- var parameters = new List<SugarParameter>
- {
- new("p_item_barcode", query.barcode,
- DbType.String, ParameterDirection.Input),
- new("p_bill_no", query.billNo, DbType.String,
- ParameterDirection.Input),
- new("pi_factory", "1000", DbType.String,
- ParameterDirection.Input),
- new("pi_company", "1000", DbType.String,
- ParameterDirection.Input),
- new("c_user", query.userName, DbType.String,
- ParameterDirection.Input),
- outputResult,
- outputMessage
- };
-
- // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand(
- "BEGIN MES_CG_UPDATE_BARCODES(:p_item_barcode, :p_bill_no, :pi_factory, :pi_company, :c_user, :C_RESULT, :MSG); END;",
- parameters.ToArray());
-
- // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
- var resultValue = outputResult.Value?.ToString();
- var messageValue = outputMessage.Value?.ToString();
-
- if ("1".Equals(resultValue)) throw new Exception("鏉＄爜鎵ｉ櫎澶辫触");
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
-
- // 鍙橀噺鐢ㄤ簬淇濆瓨鏌ヨ缁撴灉
- decimal? C_SQ_QTY = 0;
- decimal? C_OK_QTY = 0;
- var c_result = string.Empty;
- var C_COUNT = 0;
-
-
- sql = string.Format(@"
- SELECT SUM(C.QUANTITY) AS SQ_QTY, SUM(D.QUANTITY_OK) AS OK_QTY
- FROM MES_INV_ITEM_OUT_ITEMS C
- LEFT JOIN (
- SELECT ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO, SUM(QUANTITY) AS QUANTITY_OK
- FROM MES_INV_ITEM_OUT_C_DETAILS
- GROUP BY ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO
- ) D
- ON D.ITEM_OUT_ID = C.ITEM_OUT_ID
- AND D.ITEM_NO = C.ITEM_NO
- AND D.RK_NO = C.RK_NO
- AND NVL(C.PBILL_NO, '0') = NVL(D.PBILL_NO, '0')
- WHERE C.ITEM_OUT_ID = {0}", mesInvItemOuts.Id);
-
- var queryResult = Db.Ado.SqlQuerySingle<dynamic>(sql);
-
- C_SQ_QTY = queryResult?.SQ_QTY;
- C_OK_QTY = queryResult?.OK_QTY;
-
- // 鍒ゆ柇閫昏緫
- if (C_SQ_QTY < C_OK_QTY) throw new Exception("鎵弿鏁伴噺瓒呰繃鐢宠鏁伴噺,璇烽噸鏂版壂鎻忥紒");
-
- if (C_SQ_QTY == C_OK_QTY) return true;
-
- return false;
- }
-
-
- public bool Audit(WarehouseQuery query)
- {
- // 瀹℃牳鍓嶆牎楠�
- Validate(query);
- query.status = 1;
- //瀹℃牳
- return Update(query);
- }
-
- public bool SetNFlag(WarehouseQuery query)
- {
- return Db.Updateable<MesInvItemOuts>()
- .SetColumns(s => s.Nflag == 1)
- .Where(s => s.ItemOutNo == query.billNo)
- .ExecuteCommand() > 0;
- }
-
- public bool DeApprove(WarehouseQuery query)
- {
- query.date = null;
- query.status = 0;
- return Update(query);
- }
-
- private bool Update(WarehouseQuery entity)
- {
- var userName = entity.userName ?? "system";
- return Db.Updateable<MesInvItemOuts>()
- .SetColumns(s => s.Status == entity.status)
- .SetColumns(s => s.CheckUser == userName)
- .SetColumns(s => s.CheckDate == DateTime.Now)
- .Where(s => s.Id == entity.id).ExecuteCommand() > 0;
- }
-
-
- public void Validate(WarehouseQuery query)
- {
- // 鏍￠獙鍗曞彿鏄惁姝ｇ‘
- var mesInvItemOuts = Db.Queryable<MesInvItemOuts>()
- .Where(o => o.ItemOutNo == query.billNo)
- .Single();
-
- if (mesInvItemOuts == null)
- throw new Exception("娌℃壘鍒�" + query.billNo + " 瀵瑰簲鐨勯噰璐��璐у崟锛岃妫�鏌�");
-
- // 鏍￠獙瀛愯〃鏁版嵁
- var itemOutItems = Db.Queryable<MesInvItemOutItems>()
- .Where(o => o.ItemOutId == mesInvItemOuts.Id)
- .ToList();
-
- var sql = string.Empty;
- var P_Msg = string.Empty;
-
- foreach (var item in itemOutItems)
- {
- // 鍒ゆ柇鐢宠鏁伴噺鏄惁澶т簬鍓╀綑鍙��鏁伴噺
- sql = string.Format(
- @"SELECT NVL(s1.RK_QTY, 0) - NVL(KT_QTY, 0) KT_QTY --鍓╀綑鍙��
- FROM MES_INV_ITEM_OUT_ITEMS C
- LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY,
- ITEM_NO,
- PBILL_NO,
- RK_NO,
- WORK_LINE
- FROM MES_INV_ITEM_OUT_ITEMS
- GROUP BY ITEM_NO, PBILL_NO, WORK_LINE,RK_NO) U
- ON U.ITEM_NO = C.ITEM_NO
- AND U.WORK_LINE = C.WORK_LINE
- AND U.PBILL_NO = C.PBILL_NO
- AND U.RK_NO = C.RK_NO
- LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY,
- ITEM_NO,
- EBELN,
- WORK_LINE,BILL_NO
- FROM MES_INV_ITEM_IN_C_ITEMS
- GROUP BY ITEM_NO, EBELN, WORK_LINE,BILL_NO) s1
- ON S1.ITEM_NO = C.ITEM_NO
- AND S1.WORK_LINE = C.WORK_LINE
- AND S1.EBELN = C.PBILL_NO
- AND S1.BILL_NO = C.RK_NO
- WHERE C.ID = {0}", item.Id);
- var sy_Qty = Db.Ado.SqlQuery<decimal>(sql);
-
- if (sy_Qty != null && sy_Qty[0] < 0)
- {
- P_Msg =
- $"閲囪喘璁㈠崟锛歿item.PbillNo}锛岃锛歿item.WorkLine}锛岀墿鏂欙細{item.ItemNo} 鐢宠鏁伴噺澶т簬鍓╀綑鍙敹鏁伴噺";
- throw new Exception(P_Msg);
- }
-
- // 鍒ゆ柇琛屾槸鍚﹂噸澶�
- var cf_Num = Db.Queryable<MesInvItemOutItems>()
- .Where(s1 => s1.ItemNo == item.ItemNo &&
- s1.WorkLine == item.WorkLine &&
- s1.PbillNo == item.PbillNo &&
- s1.ItemOutId == mesInvItemOuts.Id &&
- s1.RkNo == item.RkNo)
- .Count();
-
- if (cf_Num > 1)
- {
- P_Msg =
- $"閲囪喘璁㈠崟锛歿item.PbillNo}锛岃锛歿item.WorkLine}锛岀墿鏂欙細{item.ItemNo}閲嶅璇峰垹闄ゅ叾涓竴鏉℃暟鎹�";
- throw new Exception(P_Msg);
- }
- }
-
- // 鏍￠獙涓昏〃鍐呭鏄惁琚垹鎺�
- // 涓昏〃浠撳簱缂栫爜
- if (string.IsNullOrEmpty(mesInvItemOuts.DepotCode))
- {
- P_Msg = "浠撳簱缂栫爜涓虹┖锛岃妫�鏌�";
- throw new Exception(P_Msg);
- }
-
- var supplierExists = Db.Queryable<MesSupplier>()
- .Any(supplier => supplier.SuppNo == mesInvItemOuts.SuppNo);
-
- if (!supplierExists)
- {
- P_Msg = $"渚涘簲鍟嗙紪鐮� {mesInvItemOuts.SuppNo} 鍦ㄧ郴缁熶腑涓嶅瓨鍦紝璇锋鏌�";
- throw new Exception(P_Msg);
- }
-
- // 瀛愯〃琛屼笌涓昏〃绗﹀悎鎬ф牎楠�
- foreach (var j in itemOutItems)
- {
- // 鏍￠獙瀛愯〃瀵瑰簲閲囪喘璁㈠崟鐨勪緵搴斿晢缂栫爜
- var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>(
- (roh, supp) => new JoinQueryInfos(
- JoinType.Left,
- roh.Supplier == supp.Id.ToString()
- ))
- .Where(roh => roh.BillNo == j.PbillNo)
- .Select((roh, supp) => supp.SuppNo)
- .Single();
-
- if (c_SuppNo == null)
- {
- P_Msg = $"瀛愯〃琛屼緵搴斿晢缂栫爜 {c_SuppNo} 鍦ㄧ郴缁熶腑鏈壘鍒�";
- throw new Exception(P_Msg);
- }
-
- if (mesInvItemOuts.SuppNo != c_SuppNo)
- {
- P_Msg =
- $"瀛愯〃閲囪喘璁㈠崟琛岀殑渚涘簲鍟嗙紪鐮� {c_SuppNo} 涓庝富琛ㄤ緵搴斿晢缂栫爜 {mesInvItemOuts.SuppNo} 涓嶄竴鑷达紝璇锋鏌�";
- throw new Exception(P_Msg);
- }
-
- // 鏍￠獙瀛愯〃濮斿閲囪喘绫诲瀷鍜屼富琛ㄧ被鍨嬫槸鍚︿竴鑷�
- if (j.FType != mesInvItemOuts.FType)
- {
- P_Msg =
- $"瀛愯〃濮斿绫诲瀷锛歿j.FType}锛屼笌涓昏〃濮斿绫诲瀷锛歿mesInvItemOuts.FType}锛屼笉涓�鑷达紝璇锋鏌�";
- throw new Exception(P_Msg);
- }
-
- // 妫�鏌ュ瓙琛ㄤ粨搴撴槸鍚﹀拰涓昏〃浠撳簱涓�鑷�
- if (j.DepotCode != mesInvItemOuts.DepotCode)
- {
- P_Msg =
- $"瀛愯〃浠撳簱缂栫爜锛歿j.DepotCode} 涓庝富琛ㄤ粨搴撶紪鐮侊細{mesInvItemOuts.DepotCode}锛屼笉涓�鑷达紝璇锋鏌�";
- throw new Exception(P_Msg);
- }
- }
- }
-
- public OutItemDto SaveCombination(OutItemDto dto)
- {
- var mesInvItemOuts = dto.Form;
- mesInvItemOuts.Status = 0;
- mesInvItemOuts.BoardFlag = 0;
- mesInvItemOuts.Sapstatus = 0;
- mesInvItemOuts.OutStatus = 0;
- mesInvItemOuts.ItemFlag = 0;
- mesInvItemOuts.IsVisual = 1;
- mesInvItemOuts.TransactionNo = 203;
- mesInvItemOuts.Factory = "1000";
- mesInvItemOuts.Company = "1000";
-
- //杩斿洖ID
- var id = Db.Insertable(mesInvItemOuts)
- .ExecuteReturnIdentity();
-
- if (id <= 0) throw new Exception("鎻掑叆閿欒");
-
- mesInvItemOuts.Id = id;
- dto.SaveItems.ForEach(s =>
- {
- s.ItemOutId = id;
- s.Factory = "1000";
- s.Company = "1000";
- s.Status = 0;
- s.DepotCode = mesInvItemOuts.DepotCode;
- s.FType = mesInvItemOuts.FType;
- s.CreateBy = mesInvItemOuts.CreateBy;
- s.CreateDate = mesInvItemOuts.CreateDate;
- });
-
- var insertable = Db.Insertable(dto.SaveItems)
- .ExecuteCommand();
-
- if (insertable < 0) throw new Exception("鎻掑叆閿欒");
-
- var query = new WarehouseQuery();
- query.id = id;
- dto.SelectItems = GetItems(query);
-
- return dto;
- }
-
- public List<MesInvItemOuts> GetPage(WarehouseQuery query)
- {
- return
- Db.Queryable<MesInvItemOuts, MesDepots, MesSupplier, SysUser,
- SysUser>((a, e, i, u1, u3) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.DepotCode == e.DepotCode
- && e.Factory == a.Factory
- && e.Company == a.Company,
- JoinType.Left,
- a.SuppNo == i.SuppNo,
- JoinType.Left,
- a.CreateBy == u1.Fcode,
- JoinType.Left,
- a.CheckUser == u3.Fcode))
- .WhereIF(query.id > 0,
- (a, e, i, u1, u3) => a.Id == query.id)
- .WhereIF(!string.IsNullOrEmpty(query.billNo),
- (a, e, i, u1, u3) => a.ItemOutNo == query.billNo)
- .Select((a, e, i, u1, u3) => new MesInvItemOuts
- {
- Id = a.Id,
- DepotCode = a.DepotCode,
- Fmrmode = a.Fmrmode,
- CheckDate = a.CheckDate,
- CheckUser = a.CheckUser,
- States = a.States,
- Reason = a.Reason,
- Remark = a.Remark,
- Nflag = a.Nflag,
- FType = a.FType,
- SuppNo = a.SuppNo,
- DepotName = e.DepotName,
- SuppName = i.SuppName,
- CreateByFname = u1.Fname,
- CheckUserFname = u3.Fname,
- CreateDate = a.CreateDate,
- CreateBy = a.CreateBy,
- Status = a.Status,
- ItemOutNo = a.ItemOutNo
- }).ToPageList(query.PageIndex, query.Limit);
- }
-
- public List<MesInvItemOutCDetails> GetScanBarcode(WarehouseQuery query)
- {
- return Db.Queryable<MesInvItemOutCDetails, MesInvItemBarcodes, MesItems,
- MesDepots>(
- (b, bar, c, d) => new
- JoinQueryInfos(
- JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
- JoinType.Left, b.ItemNo == c.ItemNo &&
- b.Company == c.Company &&
- b.Factory == c.Factory,
- JoinType.Left, b.DepotCode == d.DepotCode &&
- b.Company == d.Company &&
- b.Factory == d.Factory
- ))
- .Where((b, bar, c, d) => b.ItemOutId == query.id)
- .Select((b, bar, c, d) => new MesInvItemOutCDetails
- {
- Quantity = b.Quantity,
- DepotSectionCode = b.DepotSectionCode,
- DepotCode = b.DepotCode,
- ItemNo = b.ItemNo,
- ItemBarcode = b.ItemBarcode,
- ItemName = c.ItemName,
- ItemModel = c.ItemModel,
- DepotName = d.DepotName,
- Unit = bar.Unit
- }).ToList();
- }
-
- //MESInvItemOutItems
- public List<MESInvItemOutItems> GetItems(WarehouseQuery query)
- {
- var where = "and 1=1";
- if (query.id != null) where = "and ITEM_OUT_ID = '" + query.id + "'";
-
- var sql = string.Format(@"select * from (
- SELECT C.REMARK, C.PBILL_NO, C.ITEM_OUT_ID, C.RK_QTY,
- C.TL_QTY, C.WORK_LINE, C.QUANTITY, C.ITEM_NO,
- NVL(s1.RK_QTY, 0) - NVL(KT_QTY, 0) KT_QTY,
- R.DEPOT_SECTION_CODE, S.ITEM_MODEL, S.ITEM_NAME,
- K.CGB014, Q.STAFF_NAME, R.DEPOT_CODE
- FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_NO = S.ITEM_NO
- LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO, PBILL_NO, WORK_LINE, RK_NO
- FROM MES_INV_ITEM_OUT_ITEMS
- GROUP BY ITEM_NO, PBILL_NO, WORK_LINE, RK_NO) U
- ON U.ITEM_NO = C.ITEM_NO AND U.WORK_LINE = C.WORK_LINE
- AND U.PBILL_NO = C.PBILL_NO AND U.RK_NO = C.RK_NO
- LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY, ITEM_NO, EBELN, WORK_LINE, BILL_NO
- FROM mes_inv_item_in_c_details
- GROUP BY ITEM_NO, EBELN, WORK_LINE, BILL_NO) s1
- ON S1.ITEM_NO = C.ITEM_NO AND S1.WORK_LINE = C.WORK_LINE
- AND S1.EBELN = C.PBILL_NO AND S1.BILL_NO = C.RK_NO
- LEFT JOIN MES_ROH_IN_DATA K
- ON K.BILL_NO = C.PBILL_NO AND C.WORK_LINE = K.PURCHASE_ORDER_LINE_NUMBER
- left join MES_ROH_IN H on H.BILL_NO = K.BILL_NO
- left join MES_STAFF Q on H.PURCHASER = Q.STAFF_NAME
- LEFT JOIN MES_SUPPLIER T ON H.SUPPLIER = T.ID
- LEFT JOIN (select *
- from (SELECT row_number() over (partition by DEPOT_CODE, ITEM_NO, EBELN order by CREATE_DATE) rn, DEPOT_CODE, DEPOT_SECTION_CODE, ITEM_NO,
- EBELN FROM mes_inv_item_in_c_details
- where EBELN is not null)
- where rn = 1 and ROWNUM = 1) R ON R.ITEM_NO = C.ITEM_NO) where 1=1 {0}",
- where);
- var results = Db.Ado.SqlQuery<MESInvItemOutItems>(sql);
- return results;
- }
-
- public OutItemDto GetSumItem(WarehouseQuery query)
- {
- var mesInvItemOuts = base.GetSingle(it => it.ItemOutNo == query.billNo);
- if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐у崟涓嶅瓨鍦�");
-
- var sql = string.Format(@"SELECT DEPOT ,ITEM_NO,ITEM_MODEL,
- ITEM_NAME,QTY FROM (SELECT SUM(QTY) QTY, DEPOT, ITEM_NO, ITEM_MODEL, ITEM_NAME
- FROM (SELECT f_get_section_code2('1000', '1000', b.ITEM_NO,'{0}') DEPOT,
- B.ITEM_NO, A.ITEM_MODEL,A.ITEM_NAME,to_char(nvl(b.QUANTITY, 0) - nvl(D.QUANTITY_OK, 0),'FM9999999990.00') QTY
- FROM MES_INV_ITEM_OUT_ITEMS B LEFT JOIN mes_ITEMS A
- ON B.ITEM_NO = A.ITEM_NO LEFT JOIN (SELECT ITEM_OUT_ID,
- ITEM_NO,PBILL_NO,SUM(QUANTITY) QUANTITY_OK,RK_NO
- FROM MES_INV_ITEM_OUT_C_DETAILS
- WHERE ITEM_OUT_ID = {1}
- GROUP BY ITEM_OUT_ID,ITEM_NO,PBILL_NO,RK_NO) D
- ON D.ITEM_OUT_ID = B.ITEM_OUT_ID
- AND D.ITEM_NO = B.ITEM_NO
- AND D.PBILL_NO = B.PBILL_NO
- AND D.RK_NO = B.RK_NO
- WHERE B.ITEM_OUT_ID = {1}
- AND nvl(b.QUANTITY, 0) - nvl(D.QUANTITY_OK, 0) > 0
- ORDER BY f_get_section_code2('1000','1000',b.ITEM_NO,'{0}'),
- A.ITEM_MODEL,A.ITEM_NAME)
- GROUP BY DEPOT, ITEM_NO, ITEM_MODEL, ITEM_NAME)",
- mesInvItemOuts.DepotCode,
- mesInvItemOuts.Id);
-
- var results = Db.Ado.SqlQuery<InventoryItem>(sql);
-
- var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
- .Where(a => a.ItemBarcode == query.barcode).Single();
-
- var dto = new OutItemDto();
- dto.SumItem = results;
-
- if (mesInvItemStocks != null)
- {
- dto.ItemNo = mesInvItemStocks.ItemNo;
- dto.Quantity = mesInvItemStocks.Quantity;
- }
-
- return dto;
- }
-
- public List<InventoryItemDetail> SelectMaterials(WarehouseQuery query)
- {
- var sql = string.Format(@"select B.WORK_NO, b.work_line,
- b.item_no, s2.item_name, s2.item_model,
- sum(b.quantity) sum_Quantity,
- b.unit, b.supp_no,
- nvl(s1.quantity, 0) quantity,
- sum(b.quantity) - nvl(U.KT_QTY, 0) Refundable_Quantity,
- B.cbill_no, B.task_no, A.BILL_NO,
- to_char(b.CREATE_DATE, 'yyyy-mm-dd') as CREATE_DATE
- from mes_inv_item_in_c_details b
- left join mes_inv_item_ins a on b.item_in_id = a.id
- LEFT JOIN (select s.item_no, s.work_line, s.Work_no,
- sum(s.quantity) quantity, S.RK_NO
- from mes_inv_item_out_c_details s
- group by s.item_no, s.work_line, s.work_no, S.RK_NO) s1
- ON NVL(B.work_LINE, '0') = NVL(s1.work_LINE, '0')
- and B.work_no = s1.work_no
- and B.item_no = s1.item_no
- AND B.BILL_NO = S1.RK_NO
- LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO, PBILL_NO, WORK_LINE, RK_NO
- FROM MES_INV_ITEM_OUT_ITEMS
- GROUP BY ITEM_NO, PBILL_NO, WORK_LINE, RK_NO) U
- ON U.ITEM_NO = B.ITEM_NO
- AND U.WORK_LINE = B.WORK_LINE
- AND U.PBILL_NO = B.WORK_NO AND U.RK_NO = B.BILL_NO
- left join mes_items s2 on b.item_no = s2.item_no
- left join purdha da on da.dha001 = b.cbill_no
- WHERE A.BILL_NO LIKE 'Q%'
- AND A.CBILL_NO like 'L%'
- group by b.item_no, b.work_line, b.supp_no, b.remark, s1.quantity, b.unit,
- s2.item_name, s2.item_model, da.dha003, B.WORK_NO, B.cbill_no, B.task_no,
- to_char(b.CREATE_DATE, 'yyyy-mm-dd'), A.BILL_NO, U.KT_QTY, A.CBILL_NO
- having b.remark = '閲囪喘鍏ュ簱'
- and sum(b.quantity) - nvl(U.KT_QTY, 0) > 0
- and b.supp_no = '{0}'
- order by to_char(b.CREATE_DATE, 'yyyy-mm-dd')",
- query.SuppNo);
-
- var results = Db.Ado.SqlQuery<InventoryItemDetail>(sql);
- return results;
- }
-
- public string GetMaxItemOutNo()
- {
- var date = DateTime.Now.ToString("yyyyMMdd");
- var par = "NTL" + date;
- var sql =
- $"select max(ITEM_OUT_NO) from MES_INV_ITEM_OUTS where ITEM_OUT_NO like '{par}%'";
- var maxBillNo = Db.Ado.SqlQuerySingle<string>(sql);
-
- var number = "0001";
- if (maxBillNo != null)
- {
- maxBillNo = maxBillNo.Substring(11);
- var no = Convert.ToInt32(maxBillNo);
- no++;
- number = no.ToString().PadLeft(4, '0');
- }
-
- return "NTL" + date + number;
- }
-
- 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("鑾峰彇鏁版嵁澶辫触");
- }
-
-
- public MessageCenter MesToErpParam(WarehouseQuery query)
- {
- var erpParameters = "";
- var title = "";
- var tableName = "MES_INV_ITEM_OUTS_" + 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 ErpUrl = AppsettingsUtility.Settings.ProductionErpUrl;
- var message = new MessageCenter
- {
- TableName = tableName,
- Url = ErpUrl,
- Status = 1,
- CreateBy = query.userName,
- Route = query.billNo,
- Title = title,
- PageName = "Warehouse/PurchaseReturn/Add?id=" + query.id +
- "&itemOutNo=" + query.billNo,
- CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
- Method = "POST",
- Seq = 1,
- Data = erpParameters,
- IsMessage = 0,
- ContentType = "application/x-www-form-urlencoded"
- };
- return message;
- }
-
- public bool DeApproveBefore(WarehouseQuery query)
- {
- var mesInvItemOuts = base.GetById(query.id);
- if (mesInvItemOuts == null) throw new Exception("鍑哄簱鍗曚笉瀛樺湪");
-
- var nflag = mesInvItemOuts.Nflag ?? 0;
-
- if (nflag != 0) return true;
-
- return false;
- }
-
- private string GetDeApprovePam(decimal? id)
- {
- var sid = (int)id;
- var encodedUrl = "taskname=CGTL&mesid=" + sid +
- "&optype=delete&datajson={}";
-
- return encodedUrl;
- }
-
- private string GetErpParameters(string? billNo)
- {
- var invItemIns = Db.Queryable<MesInvItemOuts>()
- .Single(x => x.ItemOutNo == billNo);
-
- //璋冪敤function鍑芥暟
- var sql =
- $"SELECT F_GENERATE_DATA_INSERTED('{billNo}') FROM DUAL;";
- var jsonString = Db.Ado.SqlQuerySingle<string>(sql);
-
- var encodedUrl = "taskname=CGTL&mesid=" + invItemIns.Id +
- "&optype=create&datajson=" + jsonString;
-
- return encodedUrl;
- }
-
- public List<string> GetItemOutNo()
- {
- var data5 = Db.Queryable<MesInvItemOuts>().Where(it =>
- it.BillTypeId == 200 && it.TransactionNo == 203 &&
- it.Status == 1)
- .OrderBy(it => it.Id, OrderByType.Desc)
- .ToPageList(1, 20);
-
- var ItemOutNos = data5.FindAll(a => a.Nflag == null || a.Nflag == 0)
- .Select(s => s.ItemOutNo).ToList();
- //
- // var ItemOutNos = data5
- // .Select(s => s.ItemOutNo).ToList();
-
- return ItemOutNos;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemStocksManager.cs b/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
deleted file mode 100644
index 57a4b41..0000000
--- a/MES.Service/service/Warehouse/MesInvItemStocksManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesInvItemStocksManager : Repository<MesInvItemStocks>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemStocksManager.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(MesInvItemStocks).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesInvItemStocks(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesInvItemStocks(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesInvItemStocks() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesInvItemStocks(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs b/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs
deleted file mode 100644
index a6dfa66..0000000
--- a/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class MesQaItemsDetect01Manager : Repository<MesQaItemsDetect01>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesQaItemsDetect01Manager.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(MesQaItemsDetect01).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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- var insertData = new MesQaItemsDetect01(); //娴嬭瘯鍙傛暟
- var insertArray = new[] { insertData };
- base.Insert(insertData); //鎻掑叆
- base.InsertRange(insertArray); //鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
- AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
- /*********鏇存柊*********/
- var updateData = new MesQaItemsDetect01(); //娴嬭瘯鍙傛暟
- var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
- base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray); //鎵归噺鏇存柊
- //base.Update(it => new MesQaItemsDetect01() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
- /*********鍒犻櫎*********/
- var deldata = new MesQaItemsDetect01(); //娴嬭瘯鍙傛暟
- base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
- AsDeleteable().Where(it => 1 == 2)
- .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
-
- #endregion
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/OpeningReceiptServer.cs b/MES.Service/service/Warehouse/OpeningReceiptServer.cs
deleted file mode 100644
index d525417..0000000
--- a/MES.Service/service/Warehouse/OpeningReceiptServer.cs
+++ /dev/null
@@ -1,285 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using SqlSugar;
-
-namespace MES.Service.service.Warehouse;
-
-public class OpeningReceiptServer : RepositoryNoEntity
-{
- private const string Factory = "1000";
-
- private const string Company = "1000";
-
- private const int billTypeId = 100;
-
- private const int transactionNo = 601;
-
- public MesInvItemBarcodes ScanInBarcodeQC(WarehouseQuery query)
- {
- if (string.IsNullOrWhiteSpace(query.sectionCode))
- throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
-
- var depotCode = GetDepotCode(query.sectionCode);
- if (depotCode == null)
- throw new Exception($"002[搴撲綅缂栫爜 {query.sectionCode} 涓嶅瓨鍦紝璇风‘璁わ紒");
-
- var checkBarcodeAlreadyReceived =
- CheckBarcodeAlreadyReceived(query.barcode);
-
- if (checkBarcodeAlreadyReceived > 0) throw new Exception("鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
-
- if (CheckBarcodeInStock(query.barcode) > 0)
- throw new Exception("鏉＄爜宸插湪搴撳瓨涓紝璇锋牳瀵癸紒");
-
- var barcodeInfo = GetBarcodeInfo(query.barcode);
- if (barcodeInfo == null || barcodeInfo.ComeFlg != 0)
- throw new Exception("鏉＄爜涓嶆槸鏈熷垵鏉＄爜锛屾棤娉曠敤鏈熷垵鍏ュ簱锛�");
-
- var inventoryItemInId = GetOrCreateInventoryItemInId(barcodeInfo,
- depotCode, query.userName, out var billNo);
-
- UseTransaction(db =>
- {
- // Insert records
- InsertInventoryDetails(inventoryItemInId, billNo, barcodeInfo,
- depotCode, query.sectionCode, query.userName);
- InsertBusinessRecord(barcodeInfo, depotCode, query.sectionCode,
- billNo,
- query.userName);
- InsertStockRecord(barcodeInfo, depotCode, query.sectionCode,
- query.userName);
- return 1;
- });
-
- return barcodeInfo;
- }
-
- public PurchaseInventory GetForm(WarehouseQuery query)
- {
- var mesInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>()
- .Where(s => s.ItemBarcode == query.barcode).Count();
-
- if (mesInvItemBarcodes <= 0) throw new Exception("鏉＄爜涓嶅瓨鍦�");
-
- var mesInvItemInCDetails = Db.Queryable<MesInvItemInCDetails>()
- .Where(s => s.ItemBarcode == query.barcode).Single();
-
- var entity = new PurchaseInventory
- {
- ItemIns = GetMesInvItemIns(mesInvItemInCDetails.ItemInId),
- InvItemInCDetails =
- GetMesInvItemInCDetailsList(mesInvItemInCDetails.ItemInId),
- ItemStocks = Db.Queryable<MesInvItemStocks>()
- .Where(s => s.ItemBarcode == query.barcode).ToList()
- };
-
- return entity;
- }
-
- public MesInvItemIns GetMesInvItemIns(decimal id)
- {
- return Db.Queryable<MesInvItemIns>()
- .Where(s => s.Id == id).Single();
- }
-
- public List<MesInvItemInCDetails> GetMesInvItemInCDetailsList(decimal id)
- {
- return Db.Queryable<MesInvItemInCDetails, MesUnit>((a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.Unit == b.Id.ToString()))
- .Where((a, b) => a.ItemInId == id)
- .Select((a, b) => new MesInvItemInCDetails
- {
- ItemBarcode = a.ItemBarcode,
- ItemNo = a.ItemNo,
- ItemSname = a.ItemSname,
- DepotSectionCode = a.DepotSectionCode,
- Quantity = a.Quantity,
- Unit = b.Fname,
- Remark = a.Remark
- })
- .ToList();
- }
-
- private void InsertInventoryDetails(decimal itemInId, string billNo,
- MesInvItemBarcodes barcodeInfo, string depotCode, string sectionCode,
- string user)
- {
- // Insert inventory details record
- var executeCommand = Db.Insertable(new MesInvItemInCDetails
- {
- ItemInId = itemInId,
- BillNo = billNo,
- ItemBarcode = barcodeInfo.ItemBarcode,
- Quantity = barcodeInfo.Quantity,
- BarcodeFlag = 1,
- EpFlag = 1,
- WorkType = 1,
- ItemNo = barcodeInfo.ItemNo,
- LotNo = barcodeInfo.LotNo,
- SuppNo = barcodeInfo.SuppNo,
- DepotCode = depotCode,
- DepotSectionCode = sectionCode,
- ItemSname = barcodeInfo.ItemSname,
- Unit = barcodeInfo.Unit,
- CreateBy = user,
- CreateDate = DateTime.Now,
- LastupdateBy = user,
- LastupdateDate = DateTime.Now,
- Remark = barcodeInfo.Memo,
- Factory = Factory,
- Company = Company,
- Ebeln = barcodeInfo.Mblnr,
- EbelnLineNo = barcodeInfo.Zeile,
- WorkNo = barcodeInfo.WorkNo,
- WorkLine = barcodeInfo.WorkLine,
- CbillNo = barcodeInfo.BillNo,
- UrgentFlag = barcodeInfo.UrgentFlag,
- BoardStyle = barcodeInfo.BoardStyle,
- TaskNo = barcodeInfo.TaskNo
- }).ExecuteCommand();
-
- if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
- }
-
- private decimal GetOrCreateInventoryItemInId(MesInvItemBarcodes barcodeInfo,
- string depotCode, string userName, out string billNo)
- {
- var inventory = Db.Queryable<MesInvItemIns>()
- .Where(d => d.InsDate >= DateTime.Today &&
- d.InsDate < DateTime.Today.AddDays(1) &&
- d.Sapstatus == 0 &&
- d.Status == 0 &&
- d.TransctionNo == transactionNo.ToString() &&
- d.CbillNo == barcodeInfo.BillNo &&
- d.SuppNo == barcodeInfo.SuppNo &&
- d.DepotsCode == depotCode)
- .First();
- if (inventory != null)
- {
- billNo = inventory.BillNo;
- return inventory.Id;
- }
-
- var sql =
- $"SELECT getbillcode1('{Factory}','{Company}','QCRK') FROM DUAL;";
- billNo = Db.Ado.SqlQuerySingle<string>(sql);
-
- var executeReturnIdentity = Db.Insertable(new MesInvItemIns
- {
- BillNo = billNo,
- BillTypeId = billTypeId,
- InsDate = DateTime.Now,
- DepotsCode = depotCode,
- TransctionNo = transactionNo.ToString(),
- SuppNo = barcodeInfo.SuppNo,
- CreateBy = userName,
- CreateDate = DateTime.Now,
- LastupdateBy = userName,
- LastupdateDate = DateTime.Now,
- Factory = Factory,
- Company = Company,
- UrgentFlag = barcodeInfo.UrgentFlag,
- CbillNo = barcodeInfo.BillNo,
- Fstatus = 0
- }).ExecuteReturnIdentity();
-
- return executeReturnIdentity;
- }
-
- private MesInvItemBarcodes GetBarcodeInfo(string itemBarcode)
- {
- // Get barcode information
- return Db.Queryable<MesInvItemBarcodes>()
- .First(b => b.ItemBarcode == itemBarcode);
- }
-
- private int CheckBarcodeInStock(string itemBarcode)
- {
- // Check if the barcode is in stock
- return Db.Queryable<MesInvItemStocks>()
- .Where(stock => stock.ItemBarcode == itemBarcode).Count();
- }
-
-
- private int CheckBarcodeAlreadyReceived(string itemBarcode)
- {
- // Check if the barcode is already received
- return Db.Queryable<MesInvItemIns, MesInvItemInCDetails>(
- (ins, details) => new JoinQueryInfos(JoinType.Inner,
- ins.Id == details.ItemInId))
- .Where((ins, details) => details.ItemBarcode == itemBarcode)
- .Count();
- }
-
- private string GetDepotCode(string sectionCode)
- {
- // This would be your query to get depot code based on section code
- return Db.Queryable<MesDepotSections, MesDepots>((d, t) =>
- new JoinQueryInfos(JoinType.Inner, d.Zuid.ToString() == t.Zuid))
- .Where((d, t) => d.DepotSectionCode == sectionCode)
- .Select<string>((d, t) => t.DepotCode)
- .First();
- }
-
-
- private void InsertStockRecord(MesInvItemBarcodes barcodeInfo,
- string depotCode,
- string sectionCode, string user)
- {
- var executeCommand = Db.Insertable(new MesInvItemStocks
- {
- TaskNo = barcodeInfo.TaskNo,
- ItemBarcode = barcodeInfo.ItemBarcode,
- ItemNo = barcodeInfo.ItemNo,
- LotNo = barcodeInfo.LotNo,
- Quantity = barcodeInfo.Quantity,
- EpFlag = barcodeInfo.EpFlag,
- DepotsCode = depotCode,
- DepotSectionsCode = sectionCode,
- CheckDate = barcodeInfo.CreateDate,
- IndepDate = barcodeInfo.CreateDate,
- Factory = Factory,
- Company = Company,
- BoardStyle = barcodeInfo.BoardStyle,
- WorkNo = barcodeInfo.WorkNo,
- WorkLine = barcodeInfo.WorkLine,
- SuppNo = barcodeInfo.SuppNo
- }).ExecuteCommand();
-
- if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
- }
-
- private void InsertBusinessRecord(MesInvItemBarcodes barcodeInfo,
- string depotCode, string sectionCode, string billNo, string user)
- {
- // Insert business record
- var executeCommand = Db.Insertable(new MesInvBusiness2
- {
- Status = 1,
- BillTypeId = billTypeId,
- TransactionCode = "601",
- BusinessType = 1,
- ItemBarcode = barcodeInfo.ItemBarcode,
- ItemNo = barcodeInfo.ItemNo,
- LotNo = barcodeInfo.LotNo,
- EpFlag = 1,
- Quantity = barcodeInfo.Quantity,
- ToInvDepotsCode = depotCode,
- ToInvDepotSectionsCode = sectionCode,
- CreateBy = user,
- CreateDate = DateTime.Now,
- LastupdateBy = user,
- LastupdateDate = DateTime.Now,
- Factory = Factory,
- Company = Company,
- TaskNo = barcodeInfo.TaskNo,
- BillNo = billNo,
- WorkNo = barcodeInfo.WorkNo,
- WorkLine = barcodeInfo.WorkLine,
- SuppNo = barcodeInfo.SuppNo
- }).ExecuteCommand();
-
- if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/PurdhbManager.cs b/MES.Service/service/Warehouse/PurdhbManager.cs
deleted file mode 100644
index b2b70f3..0000000
--- a/MES.Service/service/Warehouse/PurdhbManager.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-
-namespace MES.Service.service.Warehouse;
-
-public class PurdhbManager : Repository<Purdhb>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 PurdhbManager.cs
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/PurdkaManager.cs b/MES.Service/service/Warehouse/PurdkaManager.cs
deleted file mode 100644
index e17aa76..0000000
--- a/MES.Service/service/Warehouse/PurdkaManager.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-
-namespace MES.Service.service.Warehouse;
-
-public class PurdkaManager : Repository<Purdka>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 PurdkaManager.cs
-}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/PurdkbManager.cs b/MES.Service/service/Warehouse/PurdkbManager.cs
deleted file mode 100644
index 881e38f..0000000
--- a/MES.Service/service/Warehouse/PurdkbManager.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-
-namespace MES.Service.service.Warehouse;
-
-public class PurdkbManager : Repository<Purdkb>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 PurdkbManager.cs
-}
\ No newline at end of file
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
deleted file mode 100644
index 56e8138..0000000
--- a/MES.Service/service/WomcaaManager.cs
+++ /dev/null
@@ -1,199 +0,0 @@
-锘縰sing 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":
- //kyy 2024-09-13 鍙樻洿
- case "5":
- 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)
- {
- var entity = new Womcaa
- {
- Erpid = Convert.ToDecimal(dto.Id),
- Caa001 = dto.FBillNo,
- Caa021 = dto.FWorkShopID,
- RoutingId = dto.FRoutingId,
- WorkShopId = dto.FREMWorkShopId,
- 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,
-
- 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.FDESCRIPTION,
-
- Caa018 = !string.IsNullOrEmpty(dto.PLAN_ID)
- ? Convert.ToDecimal(dto.PLAN_ID)
- : null,
- Caa019 = !string.IsNullOrEmpty(dto.PLAN_SEQ)
- ? Convert.ToDecimal(dto.PLAN_SEQ)
- : null,
- Caa020 = dto.PLAN_NUM,
- Caa015 = dto.F_UNW_Text_xsddh,
- EerSczz = dto.erP_SCZZ,
- EerWtzz = dto.erP_WTZZ,
- Caa015Head = dto.F_XIFG_Integer_tzk,
- MainProductNo = dto.F_XIFG_Base_w5c,
- MainProductQty = dto.F_XIFG_Qty_yrr,
- CustomerItemNumber = dto.F_XIFG_Text_fg2,
- PackingListNumber = dto.F_XIFG_Text_yrr,
- CustomerName = dto.F_XIFG_Text_qtr1,
- Customer = dto.F_XIFG_Base_83g1
- };
-
- var single = base.GetSingle(it => it.Erpid == entity.Erpid);
- if (single != null) entity.Id = single.Id;
-
- return entity;
- }
-
- 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.FENTRYID),
- Cab001 = dto.FBillNo,
- Cab002 = dto.FSeq,
- Cab003 = dto.FMaterialID,
- Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
- ? Convert.ToDecimal(dto.FNeedQty)
- : null,
- Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
- ? Convert.ToDecimal(dto.FPickedQty)
- : null,
- PositionNo = dto.FPositionNO,
- SupplyOrganization = dto.FChildSupplyOrgId,
- IssuingOrganization = dto.FSUPPLYORG,
- 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.FID),
-
- Scrapqty = dto.FFixScrapQty,
- Scraprate = dto.FScrapRate,
- Fsaleorderno = dto.FSALEORDERNO,
-
- CustomerItemNumber = dto.F_XIFG_Text_re5,
- PackingListNumber = dto.F_XIFG_Text_apv,
- MainProduct = dto.F_XIFG_Base_re5,
- MainProductQty = Convert.ToDecimal(dto.F_XIFG_Qty_apv),
- ParentItemName = dto.F_XIFG_Base_apv
- };
-
- var entity = Db.Queryable<Womcab>()
- .Where(s => s.Erpid == womcab.Erpid).Single();
- if (entity != null) womcab.Id = entity.Id;
-
- womcabList.Add(womcab);
- }
-
- return womcabList;
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/WomcabManager.cs b/MES.Service/service/WomcabManager.cs
deleted file mode 100644
index 5275176..0000000
--- a/MES.Service/service/WomcabManager.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing 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,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
- /*********鎻掑叆*********/
- 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);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=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
-}
\ No newline at end of file
diff --git a/MES.Service/service/WomdaaManager.cs b/MES.Service/service/WomdaaManager.cs
deleted file mode 100644
index 255556a..0000000
--- a/MES.Service/service/WomdaaManager.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-锘縰sing MES.Service.DB;
-using MES.Service.Modes;
-
-namespace MES.Service.service;
-
-public class WomdaaManager : Repository<Womdaa>
-{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- public int TestUpdate(Womdaa womdaa)
- {
- return UseTransaction(db =>
- {
- return db.Updateable<Womdaa>()
- .SetColumns(a => a.Daa001 == womdaa.Daa001)
- .SetColumns(a => a.Daa002 == womdaa.Daa002)
- .SetColumns(a => a.Daa003 == womdaa.Daa003)
- .SetColumns(a => a.Daa004 == womdaa.Daa004)
- .Where(a => a.Id == womdaa.Id)
- .ExecuteCommand();
- });
- }
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomdaaManager.cs
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Base/DemoController.cs b/MESApplication/Controllers/Base/DemoController.cs
deleted file mode 100644
index 67a7de0..0000000
--- a/MESApplication/Controllers/Base/DemoController.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.service;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.Base;
-
-[Route("api/[controller]")]
-[ApiController]
-public class DemoController : ControllerBase
-{
- [HttpPost("sum")]
- public ResponseResult sum([FromBody] JObject data)
- {
- try
- {
- var x = Convert.ToInt32(data["x"].ToString());
- var y = Convert.ToInt32(data["y"].ToString());
- ;
- var sum = x + y;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = sum
- };
- }
- catch (Exception ex)
- {
- throw ex;
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("getData")]
- public ResponseResult getData([FromBody] JObject data)
- {
- var name = data["deptNo"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new DemoService().getAll(name);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("getItemById")]
- public ResponseResult getItemById([FromBody] JObject data)
- {
- var id = data["id"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new DemoService().getItemById(id);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Base/LoginController.cs b/MESApplication/Controllers/Base/LoginController.cs
deleted file mode 100644
index 02e836d..0000000
--- a/MESApplication/Controllers/Base/LoginController.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.@base;
-using MES.Service.service;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.Base;
-
-/// <summary>
-/// 鐢ㄦ埛
-/// </summary>
-[Route("api/[controller]")]
-[ApiController]
-public class LoginController : ControllerBase
-{
- /// <summary>
- /// 鐧诲綍
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- [HttpPost("login")]
- public ResponseResult login([FromBody] LoginModel model)
- {
- //鐧诲綍
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LoginService().login(model.userID, model.userPass);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 閲嶈瀵嗙爜
- /// </summary>
- /// <param name="data"></param>
- /// <returns></returns>
- [HttpPost("resetPassword")]
- public ResponseResult resetPassword([FromBody] JObject data)
- {
- var name = data["name"].ToString();
- var pwd = data["pwd"].ToString();
- var newPwd = data["newPwd"].ToString();
- //鐧诲綍
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LoginService().resetPassword(newPwd, name, pwd);
- if (tbBillList > 0)
- return new ResponseResult
- {
- status = 0,
- message = "淇敼鎴愬姛",
- data = resultInfos
- };
- return new ResponseResult
- {
- status = 1,
- message = "淇敼澶辫触",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鐢ㄦ埛鑿滃崟
- /// </summary>
- /// <param name="data"></param>
- /// <returns></returns>
- [HttpPost("getUserMenu")]
- public ResponseResult getUserMenu([FromBody] JObject data)
- {
- var name = data["name"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new LoginService().getUserMenu(name);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Base/MessageCenterController.cs b/MESApplication/Controllers/Base/MessageCenterController.cs
deleted file mode 100644
index 529df7f..0000000
--- a/MESApplication/Controllers/Base/MessageCenterController.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.Base;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MessageCenterController : ControllerBase
-{
- private readonly GetErpParametersServer ErpParametersServer = new();
- private readonly MessageCenterManager m = new();
-
-
- //ResetUpdate
- [HttpPost("ResetUpdate")]
- public ResponseResult ResetUpdate([FromBody] MessageCenter data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ResetUpdate(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //Resend
- [HttpPost("Resend")]
- public ResponseResult Resend(MessageCenter data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- 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,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("getPushFailed")]
- public ResponseResult getPushFailed(MessageCenter query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetPushFailedPage(query);
- 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([FromBody] JObject data)
- {
- var id = Convert.ToDecimal(data["id"].ToString());
- 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] MessageCenter data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.save(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] MessageCenter 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] MessageCenter 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesCustomerController.cs b/MESApplication/Controllers/BasicData/MesCustomerController.cs
deleted file mode 100644
index 6d08d50..0000000
--- a/MESApplication/Controllers/BasicData/MesCustomerController.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesCustomerController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
- private readonly MesCustomerManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "MES_CUSTOMER";
-
- private readonly string URL = "http://localhost:10054/api/MesCustomer/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpCustomer unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpCustomer> 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] MesCustomer 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] MesCustomer 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] MesCustomer 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesDepotsController.cs b/MESApplication/Controllers/BasicData/MesDepotsController.cs
deleted file mode 100644
index 3a20310..0000000
--- a/MESApplication/Controllers/BasicData/MesDepotsController.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesDepotsController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
- private readonly MesDepotsManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "MES_DEPOTS";
-
- private readonly string URL = "http://localhost:10054/api/MesDepots/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpDepots unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpDepots> 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] MesDepots 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] MesDepots 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] MesDepots 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesItemTypeController.cs b/MESApplication/Controllers/BasicData/MesItemTypeController.cs
deleted file mode 100644
index a71b56f..0000000
--- a/MESApplication/Controllers/BasicData/MesItemTypeController.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesItemTypeController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
-
- private readonly MesItemTypeManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "MES_ITEM_TYPE";
-
- private readonly string URL = "http://localhost:10054/api/MesItemType/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpItemType unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpItemType> 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] MesItemType 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] MesItemType 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] MesItemType 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesItemsController.cs b/MESApplication/Controllers/BasicData/MesItemsController.cs
deleted file mode 100644
index c095307..0000000
--- a/MESApplication/Controllers/BasicData/MesItemsController.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesItemsController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
- private readonly MesItemsManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "MES_ITEMS";
-
- private readonly string URL = "http://localhost:10054/api/MesItems/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpItems unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpItems> 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] MesItems 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] MesItems 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] MesItems 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesPositionController.cs b/MESApplication/Controllers/BasicData/MesPositionController.cs
deleted file mode 100644
index 655941c..0000000
--- a/MESApplication/Controllers/BasicData/MesPositionController.cs
+++ /dev/null
@@ -1,256 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesPositionController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
-
- private readonly MesPositionManager m = new();
-
- private readonly string METHOD = "POST";
- private readonly string TableName = "MES_POSITION";
-
- private readonly string URL = "http://localhost:10054/api/MesPosition/";
-
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpPosition unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpPosition> 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] MesPosition 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] MesPosition 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] MesPosition 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesRohInController.cs b/MESApplication/Controllers/BasicData/MesRohInController.cs
deleted file mode 100644
index 6e5c8d1..0000000
--- a/MESApplication/Controllers/BasicData/MesRohInController.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesRohInController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
- private readonly MesRohInManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "MES_ROHIN";
-
- private readonly string URL = "http://localhost:10054/api/MesRohIn/";
-
- //
- [HttpPost("Save")]
- public ResponseResult Save(RohIn 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<RohIn> 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] MesRohIn 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] MesRohIn 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] MesRohIn 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesRohInDataController.cs b/MESApplication/Controllers/BasicData/MesRohInDataController.cs
deleted file mode 100644
index aff8ba6..0000000
--- a/MESApplication/Controllers/BasicData/MesRohInDataController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesRohInDataController : ControllerBase
-{
- private readonly MesRohInDataManager 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] MesRohInData 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] MesRohInData 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] MesRohInData 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesStaffController.cs b/MESApplication/Controllers/BasicData/MesStaffController.cs
deleted file mode 100644
index 9a11979..0000000
--- a/MESApplication/Controllers/BasicData/MesStaffController.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesStaffController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
-
- private readonly MesStaffManager m = new();
-
- private readonly string METHOD = "POST";
- private readonly string TableName = "MES_STAFF";
-
- private readonly string URL = "http://localhost:10054/api/MesStaff/";
-
- [HttpPost("SaveStaff")]
- public ResponseResult SaveStaff(ErpStaff staff)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveStaff";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(staff);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(staff);
- 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("SaveStaffList")]
- public ResponseResult SaveStaffList(List<ErpStaff> staffs)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveStaffList";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(staffs);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var saveList = m.SaveList(staffs);
- resultInfos.tbBillList = saveList;
-
-
- entity.Result = 0;
- if (saveList) 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] MesStaff 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] MesStaff 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] MesStaff 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesSupplierController.cs b/MESApplication/Controllers/BasicData/MesSupplierController.cs
deleted file mode 100644
index 8782e2d..0000000
--- a/MESApplication/Controllers/BasicData/MesSupplierController.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesSupplierController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
- private readonly MesSupplierManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "MES_SUPPLIER";
-
- private readonly string URL = "http://localhost:10054/api/MesSupplier/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpSupplier unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpSupplier> 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] MesSupplier 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] MesSupplier 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] MesSupplier 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesUnitController.cs b/MESApplication/Controllers/BasicData/MesUnitController.cs
deleted file mode 100644
index 3d20342..0000000
--- a/MESApplication/Controllers/BasicData/MesUnitController.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesUnitController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
- private readonly MesUnitManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "MES_UNIT";
-
- private readonly string URL = "http://localhost:10054/api/MesUnit/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpUnit unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpUnit> 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] MesUnit 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] MesUnit 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] MesUnit 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/OrganizeController.cs b/MESApplication/Controllers/BasicData/OrganizeController.cs
deleted file mode 100644
index fd37705..0000000
--- a/MESApplication/Controllers/BasicData/OrganizeController.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.util;
-using MES.Service.Dto.webApi;
-using MES.Service.service.BasicData;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers;
-
-[ApiController]
-[Route("api/[controller]")]
-public class OrganizeController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
-
- private readonly OrganizeManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "Organize";
-
- private readonly string URL = "http://localhost:10054/api/Organize/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpOrganize unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpOrganize> 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);
- }
- }
- // private OrganizeManager m = new OrganizeManager();
-
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <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] Organize 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] Organize 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] Organize 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/SalesOrderController.cs b/MESApplication/Controllers/BasicData/SalesOrderController.cs
deleted file mode 100644
index 74cc41f..0000000
--- a/MESApplication/Controllers/BasicData/SalesOrderController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class SalesOrderController : ControllerBase
-{
- private readonly SalesOrderManager m = new();
-
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetList")]
- public ResponseResult GetList()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- /// <summary>
- /// 鏍规嵁涓婚敭鑾峰彇
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetById")]
- public ResponseResult GetById(int id)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetById(id);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁涓婚敭鍒犻櫎
- /// </summary>
- /// <returns></returns>
- [HttpPost("DeleteByIds")]
- public ResponseResult DeleteByIds([FromBody] object[] ids)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeleteByIds(ids);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞
- /// </summary>
- /// <returns></returns>
- [HttpPost("Insert")]
- public ResponseResult Add([FromBody] SalesOrder data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] SalesOrder data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] SalesOrder data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/SalesOrderDetailController.cs b/MESApplication/Controllers/BasicData/SalesOrderDetailController.cs
deleted file mode 100644
index 1a5a9b0..0000000
--- a/MESApplication/Controllers/BasicData/SalesOrderDetailController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class SalesOrderDetailController : ControllerBase
-{
- private readonly SalesOrderDetailManager 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] SalesOrderDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] SalesOrderDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] SalesOrderDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs b/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
deleted file mode 100644
index 8df7421..0000000
--- a/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class SalesReturnNoticeController : ControllerBase
-{
- private readonly SalesReturnNoticeManager 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] SalesReturnNotice data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity(
- [FromBody] SalesReturnNotice data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] SalesReturnNotice data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs b/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
deleted file mode 100644
index 3ed35a0..0000000
--- a/MESApplication/Controllers/BasicData/SalesReturnNoticeDetailController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class SalesReturnNoticeDetailController : ControllerBase
-{
- private readonly SalesReturnNoticeDetailManager 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] SalesReturnNoticeDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity(
- [FromBody] SalesReturnNoticeDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] SalesReturnNoticeDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/ShipmentDetailController.cs b/MESApplication/Controllers/BasicData/ShipmentDetailController.cs
deleted file mode 100644
index a2a764f..0000000
--- a/MESApplication/Controllers/BasicData/ShipmentDetailController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class ShipmentDetailController : ControllerBase
-{
- private readonly ShipmentDetailManager 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] ShipmentDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] ShipmentDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] ShipmentDetail data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/ShipmentNoticeController.cs b/MESApplication/Controllers/BasicData/ShipmentNoticeController.cs
deleted file mode 100644
index 67f6e27..0000000
--- a/MESApplication/Controllers/BasicData/ShipmentNoticeController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class ShipmentNoticeController : ControllerBase
-{
- private readonly ShipmentNoticeManager 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] ShipmentNotice data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] ShipmentNotice data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] ShipmentNotice data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/SysDepartmentController.cs b/MESApplication/Controllers/BasicData/SysDepartmentController.cs
deleted file mode 100644
index 7fff07b..0000000
--- a/MESApplication/Controllers/BasicData/SysDepartmentController.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.service.BasicData;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers.BasicData;
-
-[ApiController]
-[Route("api/[controller]")]
-public class SysDepartmentController : ControllerBase
-{
- private readonly MessageCenterManager _manager = new();
-
- private readonly SysDepartmentManager m = new();
-
- private readonly string METHOD = "POST";
- private readonly string TableName = "SYS_DEPARTMENT";
-
- private readonly string URL = "http://localhost:10054/api/SysDepartment/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpDepartment unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- 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<ErpDepartment> 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] SysDepartment 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] SysDepartment 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] SysDepartment 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/BaseController.cs b/MESApplication/Controllers/QC/BaseController.cs
deleted file mode 100644
index dd54e7f..0000000
--- a/MESApplication/Controllers/QC/BaseController.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
-using MES.Service.service.QC;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.QC;
-
-[Route("api/[controller]")]
-[ApiController]
-public class BaseController : ControllerBase
-{
- [HttpPost("saveImage")]
- public ResponseResult saveImage([FromBody] ImageDataDto dto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new BaseService().saveImage(dto.entity);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //removeImage
- [HttpPost("removeImage")]
- public ResponseResult removeImage([FromBody] JObject data)
- {
- var id = Convert.ToInt32(data["id"].ToString());
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new BaseService().removeImage(id);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getByFid
- [HttpPost("getByFid")]
- public ResponseResult getByFid([FromBody] JObject data)
- {
- var id = Convert.ToInt32(data["fid"].ToString());
- var qsType = data["qsType"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new BaseService().getByFid(id, qsType);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/LljController.cs b/MESApplication/Controllers/QC/LljController.cs
deleted file mode 100644
index a000f11..0000000
--- a/MESApplication/Controllers/QC/LljController.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.service.QC;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.QC;
-
-[Route("api/[controller]")]
-[ApiController]
-public class LljController : ControllerBase
-{
- [HttpPost("getPage")]
- public ResponseResult getPage([FromBody] XJPageResult queryObj)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().GetPage(queryObj);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("setJYItem")]
- public ResponseResult setJYItem([FromBody] JObject data)
- {
- var itemNo = data["itemNo"].ToString();
- var quantity = Convert.ToDecimal(data["quantity"].ToString());
- var releaseNo = data["releaseNo"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().SetItems(itemNo, quantity, releaseNo);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("saveItem")]
- public ResponseResult saveItem([FromBody] LLJDto lljDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().saveItem(lljDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getItems
- [HttpPost("getJYItem")]
- public ResponseResult getJYItem([FromBody] JObject data)
- {
- var id = data["id"]?.ToString();
- var releaseNo = data["releaseNo"]?.ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().GetItems(releaseNo,
- Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getXjDetail02ById
- [HttpPost("getXjDetail02ById")]
- public ResponseResult getXjDetail02ById([FromBody] JObject data)
- {
- var id = data["id"]?.ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().getXjDetail02ById(Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("SetQSItemDetail")]
- public ResponseResult SetQSItemDetail([FromBody] MesQaItemsDetectDetail12 detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new LljService();
- var detail021 = tbBillList.SetQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("UpdateQSItemDetail")]
- public ResponseResult UpdateQSItemDetail([FromBody] MesQaItemsDetectDetail12 detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new LljService();
- var detail021 = tbBillList.UpdateQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksGid 涓昏〃娣诲姞涓嶅悎鏍兼弿杩�
- [HttpPost("saveRemarksGid")]
- public ResponseResult saveRemarksGid([FromBody] LLJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().saveRemarksGid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksPid 瀛愯〃娣诲姞涓嶅悎鏍兼弿杩�
- [HttpPost("saveRemarksPid")]
- public ResponseResult saveRemarksPid([FromBody] LLJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().saveRemarksPid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //removeXJ 鍒犻櫎
- [HttpPost("removeXJ")]
- public ResponseResult removeXJ([FromBody] JObject data)
- {
- var releaseNo = data["releaseNo"]?.ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().removeXJ(releaseNo);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //IqcQaSubmit
- [HttpPost("IqcQaSubmit")]
- public ResponseResult IqcQaSubmit(LLJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().IqcQaSubmit(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/MesLineUserController.cs b/MESApplication/Controllers/QC/MesLineUserController.cs
deleted file mode 100644
index 944f756..0000000
--- a/MESApplication/Controllers/QC/MesLineUserController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.QC;
-
-[ApiController]
-[Route("api/[controller]")]
-public class MesLineUserController : ControllerBase
-{
- private readonly MesLineUserManager 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] MesLineUser 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] MesLineUser 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] MesLineUser 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/RKJController.cs b/MESApplication/Controllers/QC/RKJController.cs
deleted file mode 100644
index 3aea949..0000000
--- a/MESApplication/Controllers/QC/RKJController.cs
+++ /dev/null
@@ -1,367 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.service.QC;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.QC;
-
-[Route("api/[controller]")]
-[ApiController]
-public class RKJController : ControllerBase
-{
- //getMaxReleaseNo
- [HttpPost("getMaxReleaseNo")]
- public ResponseResult getMaxReleaseNo()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().getMaxBillNo();
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getLine
- [HttpPost("getLineAll")]
- public ResponseResult getLineAll()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().getLineNo();
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- //getDaa001
- [HttpPost("getDaa001")]
- public ResponseResult getDaa001([FromBody] JObject data)
- {
- var lineNo = data["lineNo"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().GetDaa001s(lineNo);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("setJYItem")]
- public ResponseResult setJYItem([FromBody] JObject data)
- {
- var itemNo = data["itemNo"].ToString();
- var quantity = Convert.ToDecimal(data["quantity"].ToString());
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().SetItems(itemNo, quantity);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("save")]
- public ResponseResult save([FromBody] RKJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().save(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("getPage")]
- public ResponseResult getPage([FromBody] XJPageResult queryObj)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().getPage(queryObj);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getItems
- [HttpPost("getItems")]
- public ResponseResult getJYItem([FromBody] JObject data)
- {
- var pid = data["pid"]?.ToString();
- var id = data["id"]?.ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().GetItems(Convert.ToDecimal(pid),
- Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //removeXJ
- [HttpPost("removeXJ")]
- public ResponseResult removeXJ([FromBody] JObject data)
- {
- var id = data["id"]?.ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().removeXJ(Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getXjDetail02ById
- [HttpPost("getXjDetail02ById")]
- public ResponseResult getXjDetail02ById([FromBody] JObject data)
- {
- var id = data["id"]?.ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().getXjDetail02ById(Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("SetQSItemDetail")]
- public ResponseResult SetQSItemDetail([FromBody] QsItemOqcItemDetail detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new RKJService();
- var detail021 = tbBillList.SetQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("UpdateQSItemDetail")]
- public ResponseResult UpdateQSItemDetail(
- [FromBody] QsItemOqcItemDetail detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new RKJService();
- var detail021 = tbBillList.UpdateQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksGid
- [HttpPost("saveRemarksGid")]
- public ResponseResult saveRemarksGid([FromBody] RKJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().saveRemarksGid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksPid
- [HttpPost("saveRemarksPid")]
- public ResponseResult saveRemarksPid([FromBody] RKJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().saveRemarksPid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksById
- [HttpPost("saveRemarksById")]
- public ResponseResult saveRemarksById([FromBody] RKJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().saveRemarksById(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("saveItem")]
- public ResponseResult saveItem([FromBody] RKJDto xjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new RKJService().saveItem(xjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
deleted file mode 100644
index 107d6b9..0000000
--- a/MESApplication/Controllers/QC/SJController.cs
+++ /dev/null
@@ -1,322 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.service.QC;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.QC;
-
-[Route("api/[controller]")]
-[ApiController]
-public class SJController : ControllerBase
-{
- [HttpPost("GetMaxBillNo")]
- public ResponseResult GetMaxBillNo()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().getMaxBillNo();
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("GetPage")]
- public ResponseResult GetPage([FromBody] SJPageResult queryObj)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().getPage(queryObj);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- //SetQSItems
- [HttpPost("SetQSItems")]
- public ResponseResult SetQSItems([FromBody] JObject data)
- {
- var itemNo = data["itemNo"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.SetQSItems(itemNo);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("Save")]
- public ResponseResult Save([FromBody] QsItem item)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.Save(item);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //SaveItem
- [HttpPost("SaveItem")]
- public ResponseResult SaveItem([FromBody] QsItem item)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.SaveItem(item);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getQSItems
- [HttpPost("getQSItems")]
- public ResponseResult getQSItems([FromBody] JObject data)
- {
- var pid = data["pid"]?.ToString();
- var id = data["id"]?.ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.getQSItems(Convert.ToDecimal(pid),
- Convert.ToDecimal(id));
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("SetQSItemDetail")]
- public ResponseResult SetQSItemDetail([FromBody] QsItemIpiItemDetail detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.SetQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("getQSItemDetail")]
- public ResponseResult getQSItemDetail([FromBody] JObject data)
- {
- var pid = data["pid"]?.ToString();
- var gid = data["gid"]?.ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.getQSItemDetail(Convert.ToDecimal(pid),
- Convert.ToDecimal(gid));
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- [HttpPost("UpdateQSItemDetail")]
- public ResponseResult UpdateQSItemDetail(
- [FromBody] QsItemIpiItemDetail detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new SJService();
- var detail021 = tbBillList.UpdateQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksGid
- [HttpPost("saveRemarksGid")]
- public ResponseResult saveRemarksGid([FromBody] QsItem rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().saveRemarksGid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksPid
- [HttpPost("saveRemarksPid")]
- public ResponseResult saveRemarksPid([FromBody] QsItem rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().saveRemarksPid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksById
- [HttpPost("saveRemarksById")]
- public ResponseResult saveRemarksById([FromBody] QsItem rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().saveRemarksById(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //removeSJ
- [HttpPost("removeSJ")]
- public ResponseResult removeSJ([FromBody] JObject data)
- {
- var id = data["id"]?.ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SJService().removeXJ(Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/SuspendController.cs b/MESApplication/Controllers/QC/SuspendController.cs
deleted file mode 100644
index ff980df..0000000
--- a/MESApplication/Controllers/QC/SuspendController.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
-using MES.Service.service.QC;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.QC;
-
-[Route("api/[controller]")]
-[ApiController]
-public class SuspendController : ControllerBase
-{
- [HttpPost("getDept")]
- public ResponseResult saveImage()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SuspendService().getDept();
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("getDeptCode")]
- public ResponseResult getDeptCode([FromBody] JObject data)
- {
- var deptCode = data["deptCode"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SuspendService().GetLines(deptCode);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("save")]
- public ResponseResult save([FromBody] XJDto dto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SuspendService().save(dto.entity);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getAllByDeptNo
- [HttpPost("getAllByDeptNo")]
- public ResponseResult getAllByDeptNo([FromBody] JObject data)
- {
- var deptCode = data["deptCode"].ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SuspendService().getAllByDeptNo(deptCode);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getOpenDept
- [HttpPost("getOpenDept")]
- public ResponseResult getOpenDept()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SuspendService().getOpenDept();
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getOpenLine
- [HttpPost("getOpenLine")]
- public ResponseResult getOpenLine([FromBody] JObject data)
- {
- var deptCode = data["deptCode"].ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SuspendService().getOpenLine(deptCode);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //UpdateById
- [HttpPost("UpdateById")]
- public ResponseResult UpdateById([FromBody] XJDto dto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new SuspendService().UpdateById(dto.entity);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/XJController.cs b/MESApplication/Controllers/QC/XJController.cs
deleted file mode 100644
index e43cb9f..0000000
--- a/MESApplication/Controllers/QC/XJController.cs
+++ /dev/null
@@ -1,440 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
-using MES.Service.Modes;
-using MES.Service.service.QC;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json.Linq;
-
-namespace MESApplication.Controllers.QC;
-
-[Route("api/[controller]")]
-[ApiController]
-public class XJController : ControllerBase
-{
- [HttpPost("getAll")]
- public ResponseResult getAll([FromBody] JObject data)
- {
- var modify1Flag = Convert.ToInt32(data["modify1Flag"].ToString());
- try
- {
- dynamic resultInfos = new ExpandoObject();
- // var tbBillList =
- // new XJService().getAll(modify1Flag);
- // resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getMaxReleaseNo
- [HttpPost("getMaxReleaseNo")]
- public ResponseResult getMaxReleaseNo()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getMaxReleaseNo();
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getLine
- [HttpPost("getLineAll")]
- public ResponseResult getLineAll()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getLineAll();
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- //getDaa001
- [HttpPost("getDaa001")]
- public ResponseResult getDaa001([FromBody] JObject data)
- {
- var daa020 = data["daa020"].ToString();
- var item = data["item"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getDaa001(daa020, item);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getBoardItem
- [HttpPost("getBoardItem")]
- public ResponseResult getBoardItem([FromBody] JObject data)
- {
- var lineNo = data["lineNo"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getBoardItem(lineNo);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getItem
- [HttpPost("getItem")]
- public ResponseResult getItem([FromBody] JObject data)
- {
- var daa001 = data["daa001"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getItem(daa001);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //setJYItem
- [HttpPost("setJYItem")]
- public ResponseResult setJYItem([FromBody] JObject data)
- {
- var itemNo = data["itemNo"].ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().setJYItem(itemNo);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //save
- [HttpPost("save")]
- public ResponseResult save([FromBody] XJDto xjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().save(xjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("saveItem")]
- public ResponseResult saveItem([FromBody] XJDto xjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().saveItem(xjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getPage
- [HttpPost("getPage")]
- public ResponseResult getPage([FromBody] XJPageResult queryObj)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getPage(queryObj);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getJYItem
- [HttpPost("getJYItem")]
- public ResponseResult getJYItem([FromBody] JObject data)
- {
- var pid = data["pid"]?.ToString();
- var id = data["id"]?.ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getJYItem(Convert.ToDecimal(pid),
- Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //getXjDetail02ById
- [HttpPost("getXjDetail02ById")]
- public ResponseResult getXjDetail02ById([FromBody] JObject data)
- {
- var id = data["id"]?.ToString();
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().getXjDetail02ById(Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("SetQSItemDetail")]
- public ResponseResult SetQSItemDetail([FromBody] QsQaItemXj02 detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new XJService();
- var detail021 = tbBillList.SetQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("UpdateQSItemDetail")]
- public ResponseResult UpdateQSItemDetail(
- [FromBody] QsQaItemXj02 detail)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList = new XJService();
- var detail021 = tbBillList.UpdateQSItemDetail(detail);
- resultInfos.tbBillList = detail021;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //removeXJ
- [HttpPost("removeXJ")]
- public ResponseResult removeXJ([FromBody] JObject data)
- {
- var id = data["id"]?.ToString();
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().removeXJ(Convert.ToDecimal(id));
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- //saveRemarksGid
- [HttpPost("saveRemarksGid")]
- public ResponseResult saveRemarksGid([FromBody] XJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().saveRemarksGid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksPid
- [HttpPost("saveRemarksPid")]
- public ResponseResult saveRemarksPid([FromBody] XJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().saveRemarksPid(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //saveRemarksById
- [HttpPost("saveRemarksById")]
- public ResponseResult saveRemarksById([FromBody] XJDto rkjDto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new XJService().saveRemarksById(rkjDto);
- resultInfos.tbBillList = tbBillList;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesDepotSectionsController.cs b/MESApplication/Controllers/Warehouse/MesDepotSectionsController.cs
deleted file mode 100644
index 0cfbcc2..0000000
--- a/MESApplication/Controllers/Warehouse/MesDepotSectionsController.cs
+++ /dev/null
@@ -1,226 +0,0 @@
-锘縰sing 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 MesDepotSectionsController : ControllerBase
-{
- private readonly MesDepotSectionsManager m = new();
-
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- //ScanInDepotSectionsName
- [HttpPost("ScanInDepotSectionsName")]
- public ResponseResult ScanInDepotSectionsName(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanInDepotSectionsName(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //ScanEditBarcode
- [HttpPost("ScanEditBarcode")]
- public ResponseResult ScanEditBarcode(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanEditBarcode(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetSectionName
- [HttpPost("GetSectionName")]
- public ResponseResult GetSectionName(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetSectionName(query);
- 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] MesDepotSections 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] MesDepotSections 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] MesDepotSections 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvBusiness2Controller.cs b/MESApplication/Controllers/Warehouse/MesInvBusiness2Controller.cs
deleted file mode 100644
index bbcda91..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvBusiness2Controller.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing 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 MesInvBusiness2Controller : ControllerBase
-{
- private readonly MesInvBusiness2Manager 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] MesInvBusiness2 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] MesInvBusiness2 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] MesInvBusiness2 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemArnController.cs b/MESApplication/Controllers/Warehouse/MesInvItemArnController.cs
deleted file mode 100644
index ab5eb43..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemArnController.cs
+++ /dev/null
@@ -1,202 +0,0 @@
-锘縰sing 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 MesInvItemArnController : ControllerBase
-{
- private readonly MesInvItemArnManager m = new();
-
-
- [HttpPost("GetPageList")]
- public ResponseResult GetPageList(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetPagedResults(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetSuppliers()
- [HttpPost("GetSuppliers")]
- public ResponseResult GetSuppliers()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetSuppliers();
- 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] MesInvItemArn 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] MesInvItemArn 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] MesInvItemArn 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs b/MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs
deleted file mode 100644
index 5972239..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-锘縰sing 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 MesInvItemArnDetailController : ControllerBase
-{
- private readonly MesInvItemArnDetailManager m = new();
-
- [HttpPost("GetDetails")]
- public ResponseResult GetDetails(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetDetails(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //
- [HttpPost("GetMaterial")]
- public ResponseResult GetMaterial(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetMaterial(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //SetMaterial
- [HttpPost("SetMaterial")]
- public ResponseResult SetMaterial(Material material)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SetMaterial(material);
- 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] MesInvItemArnDetail 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] MesInvItemArnDetail 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] MesInvItemArnDetail 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemBarcodesController.cs b/MESApplication/Controllers/Warehouse/MesInvItemBarcodesController.cs
deleted file mode 100644
index b783353..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemBarcodesController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemInCDetailsController.cs b/MESApplication/Controllers/Warehouse/MesInvItemInCDetailsController.cs
deleted file mode 100644
index 7cc9221..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemInCDetailsController.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-锘縰sing 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemInCItemsController.cs b/MESApplication/Controllers/Warehouse/MesInvItemInCItemsController.cs
deleted file mode 100644
index e849ce3..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemInCItemsController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing 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 MesInvItemInCItemsController : ControllerBase
-{
- private readonly MesInvItemInCItemsManager 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] MesInvItemInCItems 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] MesInvItemInCItems 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] MesInvItemInCItems 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemMovesCDetailsController.cs b/MESApplication/Controllers/Warehouse/MesInvItemMovesCDetailsController.cs
deleted file mode 100644
index fb0be61..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemMovesCDetailsController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing 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 MesInvItemMovesCDetailsController : ControllerBase
-{
- private readonly MesInvItemMovesCDetailsManager 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] MesInvItemMovesCDetails 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] MesInvItemMovesCDetails 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] MesInvItemMovesCDetails 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs b/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
deleted file mode 100644
index 36da5ff..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemMovesController.cs
+++ /dev/null
@@ -1,306 +0,0 @@
-锘縰sing 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 MesInvItemMovesController : ControllerBase
-{
- private readonly MesInvItemMovesManager m = new();
-
- //ScanInBarcode
- [HttpPost("ScanInBarcode")]
- public ResponseResult ScanInBarcode(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanInBarcode(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("Audit")]
- public ResponseResult Audit(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Audit(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [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);
- }
- }
-
- //GetPage
- [HttpPost("GetPage")]
- public ResponseResult GetPage(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetPage(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetItems
- [HttpPost("GetItems")]
- public ResponseResult GetItems(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItems(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //ScanMoveBarcode
- [HttpPost("ScanMoveBarcode")]
- public ResponseResult ScanMoveBarcode(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanMoveBarcode(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- // GetBillNo
- [HttpPost("GetBillNo")]
- public ResponseResult GetBillNo(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetBillNo(query);
- 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] MesInvItemMoves 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] MesInvItemMoves 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] MesInvItemMoves 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs b/MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs
deleted file mode 100644
index 91c79f4..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing 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 MesInvItemOutCDetailsController : ControllerBase
-{
- private readonly MesInvItemOutCDetailsManager 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] MesInvItemOutCDetails 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] MesInvItemOutCDetails 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] MesInvItemOutCDetails 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemOutItemsController.cs b/MESApplication/Controllers/Warehouse/MesInvItemOutItemsController.cs
deleted file mode 100644
index 405bdb7..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemOutItemsController.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing 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 MesInvItemOutItemsController : ControllerBase
-{
- private readonly MesInvItemOutItemsManager 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] MesInvItemOutItems 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] MesInvItemOutItems 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] MesInvItemOutItems 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs b/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
deleted file mode 100644
index 908f78a..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
+++ /dev/null
@@ -1,453 +0,0 @@
-锘縰sing 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 MesInvItemOutsController : ControllerBase
-{
- private readonly MesInvItemOutsManager m = new();
-
-
- [HttpPost("ScanCode")]
- public ResponseResult ScanCode(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanCode(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("GetScanBarcode")]
- public ResponseResult GetScanBarcode(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetScanBarcode(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [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);
- }
- }
-
- //GetItemOutNo
- [HttpPost("GetItemOutNo")]
- public ResponseResult GetItemOutNo()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItemOutNo();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- //Audit
- [HttpPost("Audit")]
- public ResponseResult Audit(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Audit(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //SetNFlag
- [HttpPost("SetNFlag")]
- public ResponseResult SetNFlag(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SetNFlag(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //DeApproveBefore
- [HttpPost("DeApproveBefore")]
- public ResponseResult DeApproveBefore(WarehouseQuery entity)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeApproveBefore(entity);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [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);
- }
- }
-
- //SaveCombination
- [HttpPost("SaveCombination")]
- public ResponseResult SaveCombination(OutItemDto dto)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SaveCombination(dto);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetMaxItemOutNo
- [HttpPost("GetMaxItemOutNo")]
- public ResponseResult GetMaxItemOutNo()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetMaxItemOutNo();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("GetPage")]
- public ResponseResult GetPage(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetPage(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //GetItems
- [HttpPost("GetItems")]
- public ResponseResult GetItems(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItems(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("GetSumItem")]
- public ResponseResult GetSumItem(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetSumItem(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- //SelectMaterials
- [HttpPost("SelectMaterials")]
- public ResponseResult SelectMaterials(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.SelectMaterials(query);
- 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] MesInvItemOuts 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] MesInvItemOuts 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] MesInvItemOuts 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs b/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs
deleted file mode 100644
index 43605be..0000000
--- a/MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing 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 MesInvItemStocksController : ControllerBase
-{
- private readonly MesInvItemStocksManager 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] MesInvItemStocks 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] MesInvItemStocks 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] MesInvItemStocks 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs b/MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs
deleted file mode 100644
index 8ede063..0000000
--- a/MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-锘縰sing 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 MesQaItemsDetect01Controller : ControllerBase
-{
- private readonly MesQaItemsDetect01Manager 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] MesQaItemsDetect01 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] MesQaItemsDetect01 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] MesQaItemsDetect01 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/OpeningReceiptController.cs b/MESApplication/Controllers/Warehouse/OpeningReceiptController.cs
deleted file mode 100644
index cda99fa..0000000
--- a/MESApplication/Controllers/Warehouse/OpeningReceiptController.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
-using MES.Service.service.Warehouse;
-using MES.Service.util;
-using Microsoft.AspNetCore.Mvc;
-
-namespace MESApplication.Controllers.Warehouse;
-
-[ApiController]
-[Route("api/[controller]")]
-public class OpeningReceiptController : ControllerBase
-{
- private readonly OpeningReceiptServer m = new();
-
- [HttpPost("ScanInBarcodeQC")]
- public ResponseResult ScanInBarcodeQC(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ScanInBarcodeQC(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("GetForm")]
- public ResponseResult GetForm(WarehouseQuery query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetForm(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/PurdhbController.cs b/MESApplication/Controllers/Warehouse/PurdhbController.cs
deleted file mode 100644
index 3687f1d..0000000
--- a/MESApplication/Controllers/Warehouse/PurdhbController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing 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 PurdhbController : ControllerBase
-{
- private readonly PurdhbManager 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] Purdhb 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] Purdhb 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] Purdhb 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/PurdkaController.cs b/MESApplication/Controllers/Warehouse/PurdkaController.cs
deleted file mode 100644
index 3f0b71d..0000000
--- a/MESApplication/Controllers/Warehouse/PurdkaController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing 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 PurdkaController : ControllerBase
-{
- private readonly PurdkaManager 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] Purdka 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] Purdka 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] Purdka 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/Warehouse/PurdkbController.cs b/MESApplication/Controllers/Warehouse/PurdkbController.cs
deleted file mode 100644
index 8ebf009..0000000
--- a/MESApplication/Controllers/Warehouse/PurdkbController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing 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 PurdkbController : ControllerBase
-{
- private readonly PurdkbManager 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] Purdkb 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] Purdkb 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] Purdkb 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/WomcaaController.cs b/MESApplication/Controllers/WomcaaController.cs
deleted file mode 100644
index 579cf20..0000000
--- a/MESApplication/Controllers/WomcaaController.cs
+++ /dev/null
@@ -1,260 +0,0 @@
-锘縰sing 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 MessageCenterManager _manager = new();
- private readonly WomcaaManager m = 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;
- entity.DealWith = 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/WomcabController.cs b/MESApplication/Controllers/WomcabController.cs
deleted file mode 100644
index 701e2af..0000000
--- a/MESApplication/Controllers/WomcabController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-锘縰sing 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/Controllers/WomdaaController.cs b/MESApplication/Controllers/WomdaaController.cs
deleted file mode 100644
index b2ac255..0000000
--- a/MESApplication/Controllers/WomdaaController.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-锘縰sing 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 WomdaaController : ControllerBase
-{
- private readonly WomdaaManager m = new();
-
- //TestUpdate
- [HttpPost("TestUpdate")]
- public ResponseResult TestUpdate([FromBody] Womdaa data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.TestUpdate(data);
- 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] Womdaa 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] Womdaa 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] Womdaa 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);
- }
- }
-}
\ No newline at end of file
diff --git a/MESApplication/MESApplication.csproj b/MESApplication/MESApplication.csproj
index b87eece..7509085 100644
--- a/MESApplication/MESApplication.csproj
+++ b/MESApplication/MESApplication.csproj
@@ -26,4 +26,8 @@
<ProjectReference Include="..\MES.Service\MES.Service.csproj"/>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Controllers\BasicData\" />
+ </ItemGroup>
+
</Project>
diff --git a/MESApplication/appsettings.json b/MESApplication/appsettings.json
index 29d6c8f..f56e17a 100644
--- a/MESApplication/appsettings.json
+++ b/MESApplication/appsettings.json
@@ -10,6 +10,6 @@
"AppSettings": {
"TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
"ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfoTest",
- "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.92)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = lts_dev; Password=ltsdev"
+ "DataBaseConn": "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=sa;Password =qixi123"
}
}
--
Gitblit v1.9.3