From 30846c0d13ee4136d68ba509b05281378db951c6 Mon Sep 17 00:00:00 2001 From: 啊鑫 <t2856754968@163.com> Date: 星期四, 19 九月 2024 14:14:27 +0800 Subject: [PATCH] 生成委外订单接口 --- MES.Service/Modes/MesDepTaskInfo.cs | 448 ++-- MES.Service/Modes/MesQaItemsDetectDetail12.cs | 142 MES.Service/Modes/Womdab.cs | 11 MES.Service/service/BasicData/MesRohInManager.cs | 4 MES.Service/Dto/service/LLJDto.cs | 5 MES.Service/util/ResponseResult.cs | 2 MES.Service/service/WomdaaManager.cs | 14 MES.Service/Modes/MesBarcodeType.cs | 320 +- MES.Service/service/GetErpParametersServer.cs | 11 MES.Service/Modes/MesInvItemInCItems.cs | 184 +- MES.Service/service/QC/LljService.cs | 18 MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 12 MES.Service/Modes/Purdhb.cs | 352 ++-- MES.Service/Modes/MesInvItemArn.cs | 304 +- MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs | 139 - MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs | 29 MES.Service/Modes/Purdka.cs | 160 MES.Service/Dto/service/ProductionPickDto.cs | 4 MES.Service/Modes/MesQaIqc.cs | 162 MES.Service/Modes/MesInvItemMoves.cs | 224 +- MES.Service/Modes/MesInvTransaction.cs | 96 MESApplication/Controllers/WomdaaController.cs | 8 MES.Service/Modes/ProductionOrder.cs | 275 +++ MESApplication/Controllers/BasicData/ProductionOrderController.cs | 259 ++ MES.Service/Modes/MesQaItemsDetect01.cs | 432 ++-- MES.Service/Modes/MesInvBusiness2.cs | 144 MES.Service/Modes/MesQaItemsDetectDetail5.cs | 344 ++- MES.Service/service/BasicData/ProductionOrderSubManager.cs | 78 MES.Service/Modes/ProductionOrderSub.cs | 209 ++ MES.Service/util/UserUtil.cs | 2 MES.Service/Modes/LtsLlj.cs | 299 +- MES.Service/Dto/webApi/ErpProductionOrderDto.cs | 46 MES.Service/Modes/MesInvItemOutCDetails.cs | 151 MES.Service/Dto/service/WarehouseQuery.cs | 2 MES.Service/Dto/webApi/ErpWYOrder.cs | 8 MESApplication/Controllers/BasicData/ProductionOrderSubController.cs | 163 + MES.Service/service/BasicData/ProductionOrderManager.cs | 200 ++ 37 files changed, 3,243 insertions(+), 2,018 deletions(-) diff --git a/MES.Service/Dto/service/LLJDto.cs b/MES.Service/Dto/service/LLJDto.cs index b33df02..6ee2a7b 100644 --- a/MES.Service/Dto/service/LLJDto.cs +++ b/MES.Service/Dto/service/LLJDto.cs @@ -5,9 +5,10 @@ public class LLJDto { public string? userNo { get; set; } + //妫�楠屽崟鍙� public string? releaseNo { get; set; } - + //涓昏〃id public int? gid { get; set; } @@ -23,7 +24,7 @@ //========================================== //宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁 public QsItemOqcReq? from { get; set; } - + public List<MesQaItemsDetectDetail5>? items { get; set; } //========================================== diff --git a/MES.Service/Dto/service/ProductionPickDto.cs b/MES.Service/Dto/service/ProductionPickDto.cs index 887c67c..bff7c4e 100644 --- a/MES.Service/Dto/service/ProductionPickDto.cs +++ b/MES.Service/Dto/service/ProductionPickDto.cs @@ -5,6 +5,6 @@ public class ProductionPickDto { public string? ItemModel { get; set; } - - public List<Womdab>? Womdabs{ get; set; } + + public List<Womdab>? Womdabs { get; set; } } \ No newline at end of file diff --git a/MES.Service/Dto/service/WarehouseQuery.cs b/MES.Service/Dto/service/WarehouseQuery.cs index 6ddeaf6..88e6d26 100644 --- a/MES.Service/Dto/service/WarehouseQuery.cs +++ b/MES.Service/Dto/service/WarehouseQuery.cs @@ -33,6 +33,6 @@ public string? ItemName { get; set; } public string? daa001 { get; set; } - + public decimal? Num { get; set; } } \ No newline at end of file diff --git a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs new file mode 100644 index 0000000..9828718 --- /dev/null +++ b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs @@ -0,0 +1,46 @@ +锘縩amespace MES.Service.Dto.webApi; + +public class ErpProductionOrderDto +{ + public string? Type { get; set; } + public string? FBillNo { get; set; } // 鍗曟嵁缂栧彿 + public string? F_UNW_Text_tpgy { get; set; } // 璐寸墖宸ヨ壓灞炴�� + public string? FStockID { get; set; } // 浠撳簱 + public string? FDate { get; set; } // 鍗曟嵁鏃ユ湡 + public string? FBillType { get; set; } // 鍗曟嵁绫诲瀷 + public string? FStatus { get; set; } // 涓氬姟鐘舵�� + public string? FMaterialId { get; set; } // 浜у搧缂栫爜 + public string? FUnitID { get; set; } // 鍗曚綅 + public string? FQty { get; set; } // 宸ュ崟鏁伴噺 + public string? FWorkGroupId { get; set; } // 璁″垝缁� + public string? FPlannerID { get; set; } // 璁″垝鍛� + public string? FPlanStartDate { get; set; } // 棰勮寮�宸ユ椂闂� + public string? FPlanFinishDate { get; set; } // 棰勮瀹屽伐鏃堕棿 + public string? FStockInLimitH { get; set; } // 鍏ュ簱涓婇檺 + public string? FStockInLimitL { get; set; } // 鍏ュ簱涓嬮檺 + public string? FMTONO { get; set; } // 璁″垝璺熻釜鍙� + public string? FLot { get; set; } // 鎵瑰彿 + public string? FBomId { get; set; } // BOM鐗堟 + public string? F_UNW_XSDDH { get; set; } // 閿�鍞鍗曞彿 + public string? FCreateType { get; set; } // 鐢熸垚鏂瑰紡 + public string? FSUBID { get; set; } // ERP鐢熶骇璁㈠崟ID + public string? FSUBBILLNOSEQ { get; set; } // ERP鐢熶骇璁㈠崟搴忓彿 + public string? FSUBBILLNO { get; set; } // ERP鐢熶骇璁㈠崟鍗曞彿 + public string? FSrcBillType { get; set; } // 婧愬崟绫诲瀷 + public string? FSrcBillNo { get; set; } // 婧愬崟缂栧彿 + public string? FSrcBillEntrySeq { get; set; } // 婧愬崟鍒嗗綍琛屽彿 + public string? FSALEORDERNO { get; set; } // 闇�姹傚崟鎹彿 + public string? FSaleOrderEntrySeq { get; set; } // 闇�姹傚崟鎹鍙� + public string? FFORCECLOSERID { get; set; } // 缁撴浜� + public string? FCloseType { get; set; } // 缁撴绫诲瀷 + public string? FDescription { get; set; } // 澶囨敞 + public string? FPPOMID { get; set; } // ERPID + public string? FSUBENTRYID { get; set; } // ERP鐢熶骇璁㈠崟鍒嗗綍鍐呯爜 + public string? FPurOrderNo { get; set; } // 閲囪喘璁㈠崟 + public string? FPurOrderEntrySeq { get; set; } // 閲囪喘璁㈠崟琛屽彿 + public string? F_UNW_BaseProperty_bzds { get; set; } // 鏍囧噯鐐规暟 + public string? F_UNW_BaseProperty_jjds { get; set; } // 璁′环鐐规暟 + public string? FBaseStockInQty { get; set; } // 鍏ュ簱鏁伴噺 + public string? FBaseNoStockInQty { get; set; } // 鏈叆搴撴暟閲� + public string? FInStockOwnerId { get; set; } // 鍏ュ簱璐т富 +} \ No newline at end of file diff --git a/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs new file mode 100644 index 0000000..3772e52 --- /dev/null +++ b/MES.Service/Dto/webApi/ErpProductionOrderSubDto.cs @@ -0,0 +1,29 @@ +锘縩amespace MES.Service.Dto.webApi; + +public class ErpProductionOrderSubDto +{ + public string? FSEQ { get; set; } // 搴忓彿 + public string? FMaterialID2 { get; set; } // 瀛愰」鐗╂枡缂栫爜 + public string? FMustQty { get; set; } // 闇�棰嗙敤閲� + public string? FPickedQty { get; set; } // 宸查鐢ㄩ噺 + public string? FPositionNO { get; set; } // 浣嶇疆鍙� + public string? FOwnerID { get; set; } // 璐т富 + public string? FMTONO { get; set; } // 璁″垝璺熻釜鍙� + public string? FLot { get; set; } // 鎵瑰彿 + public string? FStockID { get; set; } // 浠撳簱 + public string? FIssueType { get; set; } // 鍙戞枡鏂瑰紡 + public string? F_UNW_Text_tpgy_Z { get; set; } // 宸ヨ壓 + public string? FUnitID2 { get; set; } // 鍗曚綅 + public string? FSupplyType { get; set; } // 渚涘簲绫诲瀷 + public string? FNumerator { get; set; } // 鍒嗗瓙 + public string? FDenominator { get; set; } // 鍒嗘瘝 + public string? FPPOMENTRYID { get; set; } // ERPID + public string? FPPOMID { get; set; } // ERP澶碔D + public string? FFixScrapQty { get; set; } // 鍥哄畾鎹熻�� + public string? FScrapRate { get; set; } // 鍙樺姩鎹熻�楃巼% + public string? FMaterialType { get; set; } // 瀛愰」绫诲瀷 + public string? F_UNW_Text_xsddh { get; set; } // 閿�鍞鍗曞彿 + public string? FReplaceGroup { get; set; } // 椤规鍙� + public string? FOwnerTypeId { get; set; } // 璐т富绫诲瀷 + public string? FOwnerID2 { get; set; } // 璐т富 +} \ No newline at end of file diff --git a/MES.Service/Dto/webApi/ErpWYOrder.cs b/MES.Service/Dto/webApi/ErpWYOrder.cs new file mode 100644 index 0000000..4a5db6c --- /dev/null +++ b/MES.Service/Dto/webApi/ErpWYOrder.cs @@ -0,0 +1,8 @@ +锘縩amespace MES.Service.Dto.webApi; + +public class ErpWYOrder +{ + public ErpProductionOrderDto OrderDto { get; set; } + + public List<ErpProductionOrderSubDto> Items { get; set; } +} \ No newline at end of file diff --git a/MES.Service/Modes/LtsLlj.cs b/MES.Service/Modes/LtsLlj.cs index 3f345c5..af75fde 100644 --- a/MES.Service/Modes/LtsLlj.cs +++ b/MES.Service/Modes/LtsLlj.cs @@ -1,142 +1,159 @@ -锘縰sing System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -namespace MES.Service.Modes +锘縰sing SqlSugar; + +namespace MES.Service.Modes; + +/// <summary> +/// 鏁版嵁婧愬鍏� +/// </summary> +[SugarTable("LTS_LLJ")] +public class LtsLlj { - /// <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> - /// 濮斿鏍囪瘑锛�0锛氶噰璐� 銆�1锛氬澶栵級 - ///</summary> - [SugarColumn(ColumnName="F_TYPE" )] - public int Ftype { get; set; } - - } -} + /// <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> + /// 濮斿鏍囪瘑锛�0锛氶噰璐� 銆�1锛氬澶栵級 + /// </summary> + [SugarColumn(ColumnName = "F_TYPE")] + public int Ftype { get; set; } +} \ No newline at end of file diff --git a/MES.Service/Modes/MesBarcodeType.cs b/MES.Service/Modes/MesBarcodeType.cs index 2a8c96a..a48ca15 100644 --- a/MES.Service/Modes/MesBarcodeType.cs +++ b/MES.Service/Modes/MesBarcodeType.cs @@ -8,243 +8,243 @@ [SugarTable("MES_BARCODE_TYPE")] public class MesBarcodeType { - /// <summary> - /// 鏉$爜绫诲瀷ID(seq_me_id) - /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + /// <summary> + /// 鏉$爜绫诲瀷ID(seq_me_id) + /// </summary> + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } - /// <summary> - /// 浣跨敤鍦烘墍 - /// </summary> - [SugarColumn(ColumnName = "USE_SITE")] + /// <summary> + /// 浣跨敤鍦烘墍 + /// </summary> + [SugarColumn(ColumnName = "USE_SITE")] public string UseSite { get; set; } - /// <summary> - /// 鏉$爜绫诲瀷鍚嶇О - /// </summary> - [SugarColumn(ColumnName = "BARCODE_TYPE_NAME")] + /// <summary> + /// 鏉$爜绫诲瀷鍚嶇О + /// </summary> + [SugarColumn(ColumnName = "BARCODE_TYPE_NAME")] public string BarcodeTypeName { get; set; } - /// <summary> - /// 鐮佸埗 - /// </summary> - [SugarColumn(ColumnName = "CODE")] + /// <summary> + /// 鐮佸埗 + /// </summary> + [SugarColumn(ColumnName = "CODE")] public string Code { get; set; } - /// <summary> - /// 鏉$爜绾稿 - /// </summary> - [SugarColumn(ColumnName = "PAPER_WIDTH")] + /// <summary> + /// 鏉$爜绾稿 + /// </summary> + [SugarColumn(ColumnName = "PAPER_WIDTH")] public decimal? PaperWidth { get; set; } - /// <summary> - /// 鏉$爜绾搁珮 - /// </summary> - [SugarColumn(ColumnName = "PAPER_HEIGHT")] + /// <summary> + /// 鏉$爜绾搁珮 + /// </summary> + [SugarColumn(ColumnName = "PAPER_HEIGHT")] public decimal? PaperHeight { get; set; } - /// <summary> - /// 鏉$爜寮�濮嬩綅缃甔 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_X")] + /// <summary> + /// 鏉$爜寮�濮嬩綅缃甔 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_X")] public decimal? BarcodeBeginPositionX { get; set; } - /// <summary> - /// 鏉$爜寮�濮嬩綅缃甕 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_Y")] + /// <summary> + /// 鏉$爜寮�濮嬩綅缃甕 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_BEGIN_POSITION_Y")] public decimal? BarcodeBeginPositionY { get; set; } - /// <summary> - /// 涓�寮犳潯鐮佺焊涓婃潯鐮佷釜鏁� - /// </summary> - [SugarColumn(ColumnName = "PAPER_NUM")] + /// <summary> + /// 涓�寮犳潯鐮佺焊涓婃潯鐮佷釜鏁� + /// </summary> + [SugarColumn(ColumnName = "PAPER_NUM")] public decimal? PaperNum { get; set; } - /// <summary> - /// 涓�寮犳潯鐮佺焊涓婃瘡琛屾潯鐮佷釜鏁� - /// </summary> - [SugarColumn(ColumnName = "PAPER_ROW_NUM")] + /// <summary> + /// 涓�寮犳潯鐮佺焊涓婃瘡琛屾潯鐮佷釜鏁� + /// </summary> + [SugarColumn(ColumnName = "PAPER_ROW_NUM")] public decimal? PaperRowNum { get; set; } - /// <summary> - /// 涓�寮犳潯鐮佺焊涓婃潯鐮佸垪鏁� - /// </summary> - [SugarColumn(ColumnName = "PAPER_COLUMN_NUM")] + /// <summary> + /// 涓�寮犳潯鐮佺焊涓婃潯鐮佸垪鏁� + /// </summary> + [SugarColumn(ColumnName = "PAPER_COLUMN_NUM")] public decimal? PaperColumnNum { get; set; } - /// <summary> - /// 鏉$爜娴佹按鍙峰惊鐜被鍨�(鎺у埗鏉$爜娴佹按鍙�) - /// </summary> - [SugarColumn(ColumnName = "CYCLE_TYPE")] + /// <summary> + /// 鏉$爜娴佹按鍙峰惊鐜被鍨�(鎺у埗鏉$爜娴佹按鍙�) + /// </summary> + [SugarColumn(ColumnName = "CYCLE_TYPE")] public string CycleType { get; set; } - /// <summary> - /// 鏄惁鏈夋晥(0-鏃犳晥,1-鏈夋晥) - /// </summary> - [SugarColumn(ColumnName = "AVAILABLE_FLAG")] + /// <summary> + /// 鏄惁鏈夋晥(0-鏃犳晥,1-鏈夋晥) + /// </summary> + [SugarColumn(ColumnName = "AVAILABLE_FLAG")] public decimal? AvailableFlag { get; set; } - /// <summary> - /// 鏉$爜楂樺害 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_HEIGHT")] + /// <summary> + /// 鏉$爜楂樺害 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_HEIGHT")] public decimal? BarcodeHeight { get; set; } - /// <summary> - /// 鏉$爜瀛椾綋鏂瑰悜 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_ORIENTATION")] + /// <summary> + /// 鏉$爜瀛椾綋鏂瑰悜 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_ORIENTATION")] public string BarcodeOrientation { get; set; } - /// <summary> - /// 鏉$爜鎵撳嵃娉ㄩ噴琛�(1-鎵撳嵃锛�0-涓嶆墦鍗�) - /// </summary> - [SugarColumn(ColumnName = "BARCODE_INTERPRETATION")] + /// <summary> + /// 鏉$爜鎵撳嵃娉ㄩ噴琛�(1-鎵撳嵃锛�0-涓嶆墦鍗�) + /// </summary> + [SugarColumn(ColumnName = "BARCODE_INTERPRETATION")] public decimal? BarcodeInterpretation { get; set; } - /// <summary> - /// 鏉$爜鎵撳嵃娉ㄩ噴琛屾墦鍦ㄦ潯鐮佷笂鏂�(1-鎵撳嵃鍦ㄦ潯鐮佷笂鏂癸紝0-涓嶆墦鍗板湪鏉$爜涓婃柟) - /// </summary> - [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ABOVE")] + /// <summary> + /// 鏉$爜鎵撳嵃娉ㄩ噴琛屾墦鍦ㄦ潯鐮佷笂鏂�(1-鎵撳嵃鍦ㄦ潯鐮佷笂鏂癸紝0-涓嶆墦鍗板湪鏉$爜涓婃柟) + /// </summary> + [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ABOVE")] public decimal? BarcodeInterpretationAbove { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + /// <summary> + /// 鍒涘缓浜� + /// </summary> + [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + /// <summary> + /// 鏈�鍚庢洿鏂颁汉 + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + /// <summary> + /// 鏈�鍚庢洿鏂版椂闂� + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } - /// <summary> - /// 鏉$爜瀹藉害 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_WIDTH")] + /// <summary> + /// 鏉$爜瀹藉害 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_WIDTH")] public decimal? BarcodeWidth { get; set; } - /// <summary> - /// [鏀瑰彉鏉$爜榛樿鍙傛暟]妯″潡锛堢獎鏉★級瀹� - /// </summary> - [SugarColumn(ColumnName = "BY_W")] + /// <summary> + /// [鏀瑰彉鏉$爜榛樿鍙傛暟]妯″潡锛堢獎鏉★級瀹� + /// </summary> + [SugarColumn(ColumnName = "BY_W")] public decimal? ByW { get; set; } - /// <summary> - /// [鏀瑰彉鏉$爜榛樿鍙傛暟]瀹芥潯涓庣獎鏉$殑姣斾緥 - /// </summary> - [SugarColumn(ColumnName = "BY_R")] + /// <summary> + /// [鏀瑰彉鏉$爜榛樿鍙傛暟]瀹芥潯涓庣獎鏉$殑姣斾緥 + /// </summary> + [SugarColumn(ColumnName = "BY_R")] public decimal? ByR { get; set; } - /// <summary> - /// [鏀瑰彉鏉$爜榛樿鍙傛暟]鏉$爜楂樺害 - /// </summary> - [SugarColumn(ColumnName = "BY_H")] + /// <summary> + /// [鏀瑰彉鏉$爜榛樿鍙傛暟]鏉$爜楂樺害 + /// </summary> + [SugarColumn(ColumnName = "BY_H")] public decimal? ByH { get; set; } - /// <summary> - /// 鐐规暟/姣背 - /// </summary> - [SugarColumn(ColumnName = "JM")] + /// <summary> + /// 鐐规暟/姣背 + /// </summary> + [SugarColumn(ColumnName = "JM")] public string Jm { get; set; } - /// <summary> - /// 铏氭嫙鏁版嵁鏍囧織(1-鏄紝0锛嶅惁) - /// </summary> - [SugarColumn(ColumnName = "JVM_DATA_FLAG")] + /// <summary> + /// 铏氭嫙鏁版嵁鏍囧織(1-鏄紝0锛嶅惁) + /// </summary> + [SugarColumn(ColumnName = "JVM_DATA_FLAG")] public decimal? JvmDataFlag { get; set; } - /// <summary> - /// 铏氭嫙鏁版嵁娴佹按鍙蜂綅鏁� - /// </summary> - [SugarColumn(ColumnName = "JVM_SERIAL_DIGIT")] + /// <summary> + /// 铏氭嫙鏁版嵁娴佹按鍙蜂綅鏁� + /// </summary> + [SugarColumn(ColumnName = "JVM_SERIAL_DIGIT")] public decimal? JvmSerialDigit { get; set; } - /// <summary> - /// 铏氭嫙鏁版嵁鏉$爜闀垮害 - /// </summary> - [SugarColumn(ColumnName = "JVM_BARCODE_LENGTH")] + /// <summary> + /// 铏氭嫙鏁版嵁鏉$爜闀垮害 + /// </summary> + [SugarColumn(ColumnName = "JVM_BARCODE_LENGTH")] public decimal? JvmBarcodeLength { get; set; } - /// <summary> - /// 鎵撳嵃鍛戒护 - /// </summary> - [SugarColumn(ColumnName = "PRINT_COMMAND")] + /// <summary> + /// 鎵撳嵃鍛戒护 + /// </summary> + [SugarColumn(ColumnName = "PRINT_COMMAND")] public string PrintCommand { get; set; } - /// <summary> - /// 鎵撳嵃鍛戒护寮�濮� - /// </summary> - [SugarColumn(ColumnName = "PRINT_COMMAND_BEGIN")] + /// <summary> + /// 鎵撳嵃鍛戒护寮�濮� + /// </summary> + [SugarColumn(ColumnName = "PRINT_COMMAND_BEGIN")] public string PrintCommandBegin { get; set; } - /// <summary> - /// 鎵撳嵃鍛戒护缁撴潫 - /// </summary> - [SugarColumn(ColumnName = "PRINT_COMMAND_END")] + /// <summary> + /// 鎵撳嵃鍛戒护缁撴潫 + /// </summary> + [SugarColumn(ColumnName = "PRINT_COMMAND_END")] public string PrintCommandEnd { get; set; } - /// <summary> - /// 鏉$爜娉ㄩ噴琛屾暟 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ROW")] + /// <summary> + /// 鏉$爜娉ㄩ噴琛屾暟 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_INTERPRETATION_ROW")] public decimal? BarcodeInterpretationRow { get; set; } - /// <summary> - /// 鏉$爜鍊煎甫鐗╂枡缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_ITEM")] + /// <summary> + /// 鏉$爜鍊煎甫鐗╂枡缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_ITEM")] public decimal? BarcodeItem { get; set; } - /// <summary> - /// 鏉$爜绫诲瀷缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "TYPE_CODE")] + /// <summary> + /// 鏉$爜绫诲瀷缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "TYPE_CODE")] public decimal TypeCode { get; set; } - /// <summary> - /// 鏄惁浣跨敤 - /// </summary> - [SugarColumn(ColumnName = "ISUSED")] + /// <summary> + /// 鏄惁浣跨敤 + /// </summary> + [SugarColumn(ColumnName = "ISUSED")] public short? Isused { get; set; } - /// <summary> - /// 鎵撳嵃妯℃澘 - /// </summary> - [SugarColumn(ColumnName = "MBTYPE")] + /// <summary> + /// 鎵撳嵃妯℃澘 + /// </summary> + [SugarColumn(ColumnName = "MBTYPE")] public decimal? Mbtype { get; set; } - /// <summary> - /// 鍒嗗巶缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "FACTORY")] + /// <summary> + /// 鍒嗗巶缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } - /// <summary> - /// 鍏徃浠g爜 - /// </summary> - [SugarColumn(ColumnName = "COMPANY")] + /// <summary> + /// 鍏徃浠g爜 + /// </summary> + [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } - /// <summary> - /// 娴佹按鍙蜂綅鏁� - /// </summary> - [SugarColumn(ColumnName = "ORDER_NUM")] + /// <summary> + /// 娴佹按鍙蜂綅鏁� + /// </summary> + [SugarColumn(ColumnName = "ORDER_NUM")] public decimal? OrderNum { get; set; } } \ No newline at end of file diff --git a/MES.Service/Modes/MesDepTaskInfo.cs b/MES.Service/Modes/MesDepTaskInfo.cs index 49b445b..f082e04 100644 --- a/MES.Service/Modes/MesDepTaskInfo.cs +++ b/MES.Service/Modes/MesDepTaskInfo.cs @@ -8,339 +8,339 @@ [SugarTable("MES_DEP_TASK_INFO")] public class MesDepTaskInfo { - /// <summary> - /// 閮ㄩ棬鐢熶骇璁㈠崟ID - /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + /// <summary> + /// 閮ㄩ棬鐢熶骇璁㈠崟ID + /// </summary> + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } - /// <summary> - /// 璁㈠崟缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "TASK_NO")] + /// <summary> + /// 璁㈠崟缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } - /// <summary> - /// ERP鐗╂枡缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "ERP_ITEM_NO")] + /// <summary> + /// ERP鐗╂枡缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "ERP_ITEM_NO")] public string ErpItemNo { get; set; } - /// <summary> - /// 宸ュ崟鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "PLAN_QTY")] + /// <summary> + /// 宸ュ崟鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "PLAN_QTY")] public decimal? PlanQty { get; set; } - /// <summary> - /// 宸茬敓浜ч噺 - /// </summary> - [SugarColumn(ColumnName = "COMPLETE_QTY")] + /// <summary> + /// 宸茬敓浜ч噺 + /// </summary> + [SugarColumn(ColumnName = "COMPLETE_QTY")] public decimal? CompleteQty { get; set; } - /// <summary> - /// 澶囨崯鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "BACKUP_QTY")] + /// <summary> + /// 澶囨崯鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "BACKUP_QTY")] public decimal? BackupQty { get; set; } - /// <summary> - /// 涓嬭浇鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "DOWN_TIME")] + /// <summary> + /// 涓嬭浇鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "DOWN_TIME")] public DateTime? DownTime { get; set; } - /// <summary> - /// 璁″垝寮�濮嬫椂闂� - /// </summary> - [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")] + /// <summary> + /// 璁″垝寮�濮嬫椂闂� + /// </summary> + [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")] public DateTime? PlanBeginTime { get; set; } - /// <summary> - /// 璁″垝缁撴潫鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "PLAN_FINISH_TIME")] + /// <summary> + /// 璁″垝缁撴潫鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "PLAN_FINISH_TIME")] public DateTime? PlanFinishTime { get; set; } - /// <summary> - /// 瀹為檯瀹屽伐鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "REAL_FINISH_TIME")] + /// <summary> + /// 瀹為檯瀹屽伐鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "REAL_FINISH_TIME")] public DateTime? RealFinishTime { get; set; } - /// <summary> - /// 鐢熶骇鐘舵��(寰呬骇\鐢熶骇\鎸傝捣\瀹屽伐) - /// </summary> - [SugarColumn(ColumnName = "PRODUCE_STATE")] + /// <summary> + /// 鐢熶骇鐘舵��(寰呬骇\鐢熶骇\鎸傝捣\瀹屽伐) + /// </summary> + [SugarColumn(ColumnName = "PRODUCE_STATE")] public string ProduceState { get; set; } - /// <summary> - /// 瀹為檯寮�宸ユ椂闂� - /// </summary> - [SugarColumn(ColumnName = "REAL_BEGIN_TIME")] + /// <summary> + /// 瀹為檯寮�宸ユ椂闂� + /// </summary> + [SugarColumn(ColumnName = "REAL_BEGIN_TIME")] public DateTime? RealBeginTime { get; set; } - /// <summary> - /// 鏄惁鎸傝捣 - /// </summary> - [SugarColumn(ColumnName = "HANG_UP")] + /// <summary> + /// 鏄惁鎸傝捣 + /// </summary> + [SugarColumn(ColumnName = "HANG_UP")] public string HangUp { get; set; } - /// <summary> - /// 浠撳簱缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "DEPOT_CODE")] + /// <summary> + /// 浠撳簱缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } - /// <summary> - /// 鎶ュ簾鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "DISCARD_QTY")] + /// <summary> + /// 鎶ュ簾鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "DISCARD_QTY")] public decimal? DiscardQty { get; set; } - /// <summary> - /// 濮嬫敹鏂欐椂闂� - /// </summary> - [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")] + /// <summary> + /// 濮嬫敹鏂欐椂闂� + /// </summary> + [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")] public DateTime? FirstItemReceiptTime { get; set; } - /// <summary> - /// 濮嬮綈鏂欐椂闂� - /// </summary> - [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")] + /// <summary> + /// 濮嬮綈鏂欐椂闂� + /// </summary> + [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")] public DateTime? FirstItemReadyTime { get; set; } - /// <summary> - /// 瀹㈡埛缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "CUST_NO")] + /// <summary> + /// 瀹㈡埛缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "CUST_NO")] public string CustNo { get; set; } - /// <summary> - /// 鍑鸿揣鍖呰鏂瑰紡 - /// </summary> - [SugarColumn(ColumnName = "PACK_SHIP_TYPE")] + /// <summary> + /// 鍑鸿揣鍖呰鏂瑰紡 + /// </summary> + [SugarColumn(ColumnName = "PACK_SHIP_TYPE")] public string PackShipType { get; set; } - /// <summary> - /// 鍖呰娉ㄦ剰浜嬮」 - /// </summary> - [SugarColumn(ColumnName = "PACK_SHIP_MEMO")] + /// <summary> + /// 鍖呰娉ㄦ剰浜嬮」 + /// </summary> + [SugarColumn(ColumnName = "PACK_SHIP_MEMO")] public string PackShipMemo { get; set; } - /// <summary> - /// 鏄惁宸叉帓浜� - /// </summary> - [SugarColumn(ColumnName = "ISSCHEME")] + /// <summary> + /// 鏄惁宸叉帓浜� + /// </summary> + [SugarColumn(ColumnName = "ISSCHEME")] public short? Isscheme { get; set; } - /// <summary> - /// 鏉$爜绫诲瀷ID - /// </summary> - [SugarColumn(ColumnName = "BARCODE_TYPE_ID")] + /// <summary> + /// 鏉$爜绫诲瀷ID + /// </summary> + [SugarColumn(ColumnName = "BARCODE_TYPE_ID")] public decimal? BarcodeTypeId { get; set; } - /// <summary> - /// 鍙戝竷鐘舵�� - /// </summary> - [SugarColumn(ColumnName = "ISSUE_STATUS")] + /// <summary> + /// 鍙戝竷鐘舵�� + /// </summary> + [SugarColumn(ColumnName = "ISSUE_STATUS")] public short? IssueStatus { get; set; } - /// <summary> - /// 鐘舵�侊紙0=鎺掍骇鏈彂甯冦��1=鎺掍骇宸插彂甯冦��2=宸查鏂欍��3=宸茬敓浜с��4=鏆傚仠銆�8=宸插畬宸ャ��9=寮傚父锛� - /// </summary> - [SugarColumn(ColumnName = "FLAG")] + /// <summary> + /// 鐘舵�侊紙0=鎺掍骇鏈彂甯冦��1=鎺掍骇宸插彂甯冦��2=宸查鏂欍��3=宸茬敓浜с��4=鏆傚仠銆�8=宸插畬宸ャ��9=寮傚父锛� + /// </summary> + [SugarColumn(ColumnName = "FLAG")] public short? Flag { get; set; } - /// <summary> - /// 棰嗘枡鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "MAT_DATE")] + /// <summary> + /// 棰嗘枡鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "MAT_DATE")] public DateTime? MatDate { get; set; } - /// <summary> - /// 宸ヤ綔涓績 - /// </summary> - [SugarColumn(ColumnName = "WORKCENTER_NO")] + /// <summary> + /// 宸ヤ綔涓績 + /// </summary> + [SugarColumn(ColumnName = "WORKCENTER_NO")] public string WorkcenterNo { get; set; } - /// <summary> - /// 宸蹭笅杞借鍗曟爣璇哬-宸蹭笅杞�,N-鏈笅杞� - /// </summary> - [SugarColumn(ColumnName = "DOWN_FLAG")] + /// <summary> + /// 宸蹭笅杞借鍗曟爣璇哬-宸蹭笅杞�,N-鏈笅杞� + /// </summary> + [SugarColumn(ColumnName = "DOWN_FLAG")] public short? DownFlag { get; set; } - /// <summary> - /// 鐜繚浠g爜 - /// </summary> - [SugarColumn(ColumnName = "ROHSE_CODE")] + /// <summary> + /// 鐜繚浠g爜 + /// </summary> + [SugarColumn(ColumnName = "ROHSE_CODE")] public string RohseCode { get; set; } - /// <summary> - /// 瀹㈡埛PO - /// </summary> - [SugarColumn(ColumnName = "CUST_PO")] + /// <summary> + /// 瀹㈡埛PO + /// </summary> + [SugarColumn(ColumnName = "CUST_PO")] public string CustPo { get; set; } - /// <summary> - /// 瀹㈡埛鍨嬪彿 - /// </summary> - [SugarColumn(ColumnName = "CUST_STYLE")] + /// <summary> + /// 瀹㈡埛鍨嬪彿 + /// </summary> + [SugarColumn(ColumnName = "CUST_STYLE")] public string CustStyle { get; set; } - /// <summary> - /// 浜у搧鎵撳嵃鍥哄畾鍊� - /// </summary> - [SugarColumn(ColumnName = "PROC_PRINT_VALUE")] + /// <summary> + /// 浜у搧鎵撳嵃鍥哄畾鍊� + /// </summary> + [SugarColumn(ColumnName = "PROC_PRINT_VALUE")] public string ProcPrintValue { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + /// <summary> + /// 鍒涘缓浜� + /// </summary> + [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } - /// <summary> - /// 鏇存柊浜� - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + /// <summary> + /// 鏇存柊浜� + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } - /// <summary> - /// 鏇存柊鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + /// <summary> + /// 鏇存柊鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - [SugarColumn(ColumnName = "MEMO")] + /// <summary> + /// 澶囨敞 + /// </summary> + [SugarColumn(ColumnName = "MEMO")] public string Memo { get; set; } - /// <summary> - /// 瀹℃壒鐘舵�� - /// </summary> - [SugarColumn(ColumnName = "FCHECK_STATUS")] + /// <summary> + /// 瀹℃壒鐘舵�� + /// </summary> + [SugarColumn(ColumnName = "FCHECK_STATUS")] public string FcheckStatus { get; set; } - /// <summary> - /// 瀹℃牳浜� - /// </summary> - [SugarColumn(ColumnName = "FCHECK_BY")] + /// <summary> + /// 瀹℃牳浜� + /// </summary> + [SugarColumn(ColumnName = "FCHECK_BY")] public string FcheckBy { get; set; } - /// <summary> - /// 瀹℃牳鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "FCHECK_DATE")] + /// <summary> + /// 瀹℃牳鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "FCHECK_DATE")] public DateTime? FcheckDate { get; set; } - /// <summary> - /// 宸ュ巶 - /// </summary> - [SugarColumn(ColumnName = "FACTORY")] + /// <summary> + /// 宸ュ巶 + /// </summary> + [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } - /// <summary> - /// 鍏徃 - /// </summary> - [SugarColumn(ColumnName = "COMPANY")] + /// <summary> + /// 鍏徃 + /// </summary> + [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } - /// <summary> - /// 鏁版嵁鏉ユ簮 - /// </summary> - [SugarColumn(ColumnName = "DATA_FROM")] + /// <summary> + /// 鏁版嵁鏉ユ簮 + /// </summary> + [SugarColumn(ColumnName = "DATA_FROM")] public string DataFrom { get; set; } - /// <summary> - /// 鐢熶骇璁㈠崟琛ㄥごID - /// </summary> - [SugarColumn(ColumnName = "MOID")] + /// <summary> + /// 鐢熶骇璁㈠崟琛ㄥごID + /// </summary> + [SugarColumn(ColumnName = "MOID")] public decimal? Moid { get; set; } - /// <summary> - /// 鐗╂枡ID - /// </summary> - [SugarColumn(ColumnName = "PARTID")] + /// <summary> + /// 鐗╂枡ID + /// </summary> + [SugarColumn(ColumnName = "PARTID")] public decimal? Partid { get; set; } - /// <summary> - /// ERP宸ュ崟鐘舵�� 鐘舵�侊紙NA-寮�绔�/FM-閿佸畾/OP-瀹℃牳/CL-鍏抽棴锛� - /// </summary> - [SugarColumn(ColumnName = "STATUS")] + /// <summary> + /// ERP宸ュ崟鐘舵�� 鐘舵�侊紙NA-寮�绔�/FM-閿佸畾/OP-瀹℃牳/CL-鍏抽棴锛� + /// </summary> + [SugarColumn(ColumnName = "STATUS")] public string Status { get; set; } - /// <summary> - /// 鐢熶骇宸ュ崟 - /// </summary> - [SugarColumn(ColumnName = "MOCODE")] + /// <summary> + /// 鐢熶骇宸ュ崟 + /// </summary> + [SugarColumn(ColumnName = "MOCODE")] public string Mocode { get; set; } - /// <summary> - /// 鍒涘缓鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "CREATEDATE")] + /// <summary> + /// 鍒涘缓鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "CREATEDATE")] public DateTime? Createdate { get; set; } - /// <summary> - /// 棰滆壊 - /// </summary> - [SugarColumn(ColumnName = "COLOR_NAME")] + /// <summary> + /// 棰滆壊 + /// </summary> + [SugarColumn(ColumnName = "COLOR_NAME")] public string ColorName { get; set; } - /// <summary> - /// 鍏抽棴鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CLOSETIME")] + /// <summary> + /// 鍏抽棴鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CLOSETIME")] public DateTime? Closetime { get; set; } - /// <summary> - /// 鐗╂枡缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "ITEM_NO")] + /// <summary> + /// 鐗╂枡缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } - /// <summary> - /// 浠庤〃ID - /// </summary> - [SugarColumn(ColumnName = "MODID")] + /// <summary> + /// 浠庤〃ID + /// </summary> + [SugarColumn(ColumnName = "MODID")] public decimal? Modid { get; set; } - /// <summary> - /// 鏈�鏂颁笅杞芥洿鏂版爣璇� - /// </summary> - [SugarColumn(ColumnName = "UPDATE_FLG")] + /// <summary> + /// 鏈�鏂颁笅杞芥洿鏂版爣璇� + /// </summary> + [SugarColumn(ColumnName = "UPDATE_FLG")] public decimal? UpdateFlg { get; set; } - /// <summary> - /// 鐢熶骇宸ュ崟琛屽彿 - /// </summary> - [SugarColumn(ColumnName = "MOCODE_LINE")] + /// <summary> + /// 鐢熶骇宸ュ崟琛屽彿 + /// </summary> + [SugarColumn(ColumnName = "MOCODE_LINE")] public decimal? MocodeLine { get; set; } - /// <summary> - /// 涓濆嵃鎬绘暟 - /// </summary> - [SugarColumn(ColumnName = "SILK_QTY")] + /// <summary> + /// 涓濆嵃鎬绘暟 + /// </summary> + [SugarColumn(ColumnName = "SILK_QTY")] public decimal? SilkQty { get; set; } - /// <summary> - /// 涓濆嵃鍗曚环 - /// </summary> - [SugarColumn(ColumnName = "SILK_PRICE")] + /// <summary> + /// 涓濆嵃鍗曚环 + /// </summary> + [SugarColumn(ColumnName = "SILK_PRICE")] public decimal? SilkPrice { get; set; } - /// <summary> - /// 鐗╂枡ID - /// </summary> - [SugarColumn(ColumnName = "ITEM_ID")] + /// <summary> + /// 鐗╂枡ID + /// </summary> + [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } } \ No newline at end of file diff --git a/MES.Service/Modes/MesInvBusiness2.cs b/MES.Service/Modes/MesInvBusiness2.cs index 8bfba78..cf003a1 100644 --- a/MES.Service/Modes/MesInvBusiness2.cs +++ b/MES.Service/Modes/MesInvBusiness2.cs @@ -16,218 +16,218 @@ public decimal Id { get; set; } /// <summary> - /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄� - ///</summary> + /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄� + /// </summary> [SugarColumn(ColumnName = "STATUS")] public decimal? Status { get; set; } /// <summary> - /// 鍗曟嵁绫诲瀷ID - ///</summary> + /// 鍗曟嵁绫诲瀷ID + /// </summary> [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } /// <summary> - /// 浜嬪姟绫诲瀷缂栫爜 - ///</summary> + /// 浜嬪姟绫诲瀷缂栫爜 + /// </summary> [SugarColumn(ColumnName = "TRANSACTION_CODE")] public string? TransactionCode { get; set; } /// <summary> - /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱 - ///</summary> + /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱 + /// </summary> [SugarColumn(ColumnName = "BUSINESS_TYPE")] public decimal? BusinessType { get; set; } /// <summary> - /// 鍗曟嵁ID - ///</summary> + /// 鍗曟嵁ID + /// </summary> [SugarColumn(ColumnName = "BILL_ID")] public decimal? BillId { get; set; } /// <summary> - /// 鍗曟嵁缂栫爜 - ///</summary> + /// 鍗曟嵁缂栫爜 + /// </summary> [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; } /// <summary> - /// 鐢熶骇璁㈠崟鍙� - ///</summary> + /// 鐢熶骇璁㈠崟鍙� + /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; } /// <summary> - /// 瀹㈡埛缂栧彿 - ///</summary> + /// 瀹㈡埛缂栧彿 + /// </summary> [SugarColumn(ColumnName = "CUSTOMER_NO")] public string? CustomerNo { get; set; } /// <summary> - /// 鍗曟嵁琛孖D - ///</summary> + /// 鍗曟嵁琛孖D + /// </summary> [SugarColumn(ColumnName = "BILL_LINE_ID")] public decimal? BillLineId { get; set; } /// <summary> - /// 鐗╂枡鏉$爜 - ///</summary> + /// 鐗╂枡鏉$爜 + /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] public string? ItemBarcode { get; set; } /// <summary> - /// 鏈徃鐗╂枡缂栫爜 - ///</summary> + /// 鏈徃鐗╂枡缂栫爜 + /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; } /// <summary> - /// 瀹㈡埛鐗╂枡缂栫爜 - ///</summary> + /// 瀹㈡埛鐗╂枡缂栫爜 + /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] public string? CItemCode { get; set; } /// <summary> - /// 鍘傚鎵规 - ///</summary> + /// 鍘傚鎵规 + /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string? LotNo { get; set; } /// <summary> - /// 鏄惁鐜繚(0:鍚�,1:鏄�) - ///</summary> + /// 鏄惁鐜繚(0:鍚�,1:鏄�) + /// </summary> [SugarColumn(ColumnName = "EP_FLAG")] public short? EpFlag { get; set; } /// <summary> - /// 鏁伴噺 - ///</summary> + /// 鏁伴噺 + /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> - /// 婧愬瓙搴揅ODE - ///</summary> + /// 婧愬瓙搴揅ODE + /// </summary> [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")] public string? FromInvDepotsCode { get; set; } /// <summary> - /// 婧愯揣浣岰ODE - ///</summary> + /// 婧愯揣浣岰ODE + /// </summary> [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")] public string? FromInvDepotSectionsCode { get; set; } /// <summary> - /// 鐩殑瀛愬簱CODE - ///</summary> + /// 鐩殑瀛愬簱CODE + /// </summary> [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")] public string? ToInvDepotsCode { get; set; } /// <summary> - /// 鐩殑璐т綅CODE - ///</summary> + /// 鐩殑璐т綅CODE + /// </summary> [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")] public string? ToInvDepotSectionsCode { get; set; } /// <summary> - /// 浜ゆ槗寮傚父淇℃伅 - ///</summary> + /// 浜ゆ槗寮傚父淇℃伅 + /// </summary> [SugarColumn(ColumnName = "DESCRIPTION")] public string? Description { get; set; } /// <summary> - /// 鍒涘缓浜� - ///</summary> + /// 鍒涘缓浜� + /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string? CreateBy { get; set; } /// <summary> - /// 鍒涘缓鏃堕棿 - ///</summary> + /// 鍒涘缓鏃堕棿 + /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - ///</summary> + /// 鏈�鍚庢洿鏂颁汉 + /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string? LastupdateBy { get; set; } /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - ///</summary> + /// 鏈�鍚庢洿鏂版椂闂� + /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> - /// 瓒呮崯缁熻鏍囪瘑 - ///</summary> + /// 瓒呮崯缁熻鏍囪瘑 + /// </summary> [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")] public short? UllageStatFlag { get; set; } /// <summary> - /// 鍒嗗巶缂栫爜 - ///</summary> + /// 鍒嗗巶缂栫爜 + /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string? Factory { get; set; } /// <summary> - /// 鍏徃浠g爜 - ///</summary> + /// 鍏徃浠g爜 + /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string? Company { get; set; } /// <summary> - /// 绠卞彿鏉$爜 - ///</summary> + /// 绠卞彿鏉$爜 + /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE2")] public string? ItemBarcode2 { get; set; } /// <summary> - /// 鍗℃澘鏉$爜 - ///</summary> + /// 鍗℃澘鏉$爜 + /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE3")] public string? ItemBarcode3 { get; set; } /// <summary> - /// 浠诲姟鍗曞彿 - ///</summary> + /// 浠诲姟鍗曞彿 + /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string? WorkNo { get; set; } /// <summary> - /// 浠诲姟鍗曡鍙� - ///</summary> + /// 浠诲姟鍗曡鍙� + /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> - /// 渚涘簲鍟� - ///</summary> + /// 渚涘簲鍟� + /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string? SuppNo { get; set; } /// <summary> - /// 鐢熶骇绾� - ///</summary> + /// 鐢熶骇绾� + /// </summary> [SugarColumn(ColumnName = "LINE_NO")] public string? LineNo { get; set; } /// <summary> - /// 閲囪喘璁㈠崟id - ///</summary> + /// 閲囪喘璁㈠崟id + /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public decimal? EbelnK3id { get; set; } /// <summary> - /// 閲囪喘璁㈠崟琛宨d - ///</summary> + /// 閲囪喘璁㈠崟琛宨d + /// </summary> [SugarColumn(ColumnName = "LINE_K3ID")] public decimal? LineK3id { get; set; } /// <summary> - /// 鐗╂枡ID - ///</summary> + /// 鐗╂枡ID + /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } } \ No newline at end of file diff --git a/MES.Service/Modes/MesInvItemArn.cs b/MES.Service/Modes/MesInvItemArn.cs index bf0d207..518f09f 100644 --- a/MES.Service/Modes/MesInvItemArn.cs +++ b/MES.Service/Modes/MesInvItemArn.cs @@ -8,232 +8,232 @@ [SugarTable("MES_INV_ITEM_ARN")] public class MesInvItemArn { - /// <summary> - /// ID(SEQ_INV_ID) - /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + /// <summary> + /// ID(SEQ_INV_ID) + /// </summary> + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } - /// <summary> - /// 鍒拌揣鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "BILL_NO")] + /// <summary> + /// 鍒拌揣鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } - /// <summary> - /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴 - /// </summary> - [SugarColumn(ColumnName = "STATUS")] + /// <summary> + /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴 + /// </summary> + [SugarColumn(ColumnName = "STATUS")] public short? Status { get; set; } - /// <summary> - /// 鍘熷洜 - /// </summary> - [SugarColumn(ColumnName = "REASON")] + /// <summary> + /// 鍘熷洜 + /// </summary> + [SugarColumn(ColumnName = "REASON")] public string Reason { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + /// <summary> + /// 鍒涘缓浜� + /// </summary> + [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + /// <summary> + /// 鏈�鍚庢洿鏂颁汉 + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + /// <summary> + /// 鏈�鍚庢洿鏂版椂闂� + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } - /// <summary> - /// 鍗曟嵁绫诲瀷ID - /// </summary> - [SugarColumn(ColumnName = "BILL_TYPE_ID")] + /// <summary> + /// 鍗曟嵁绫诲瀷ID + /// </summary> + [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } - /// <summary> - /// 浜嬪姟绫诲瀷ID - /// </summary> - [SugarColumn(ColumnName = "TRANSACTION_ID")] + /// <summary> + /// 浜嬪姟绫诲瀷ID + /// </summary> + [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - [SugarColumn(ColumnName = "REMARK")] + /// <summary> + /// 澶囨敞 + /// </summary> + [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } - /// <summary> - /// 閫佽揣鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "PAPER_BILL_NO")] + /// <summary> + /// 閫佽揣鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "PAPER_BILL_NO")] public string PaperBillNo { get; set; } - /// <summary> - /// 閫�鏂欎汉宸ュ彿 - /// </summary> - [SugarColumn(ColumnName = "USER_NO_BACK")] + /// <summary> + /// 閫�鏂欎汉宸ュ彿 + /// </summary> + [SugarColumn(ColumnName = "USER_NO_BACK")] public string UserNoBack { get; set; } - /// <summary> - /// 鎻愪氦浜� - /// </summary> - [SugarColumn(ColumnName = "CHECK_USER")] + /// <summary> + /// 鎻愪氦浜� + /// </summary> + [SugarColumn(ColumnName = "CHECK_USER")] public string CheckUser { get; set; } - /// <summary> - /// 鎻愪氦鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "CHECK_DATE")] + /// <summary> + /// 鎻愪氦鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "CHECK_DATE")] public DateTime? CheckDate { get; set; } - /// <summary> - /// 鍏ュ簱鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "INS_DATE")] + /// <summary> + /// 鍏ュ簱鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "INS_DATE")] public DateTime? InsDate { get; set; } - /// <summary> - /// 妫�楠岀粨鏋� - /// </summary> - [SugarColumn(ColumnName = "CHECK_RES")] + /// <summary> + /// 妫�楠岀粨鏋� + /// </summary> + [SugarColumn(ColumnName = "CHECK_RES")] public string CheckRes { get; set; } - /// <summary> - /// 宸叉崱鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "CHECK_QTY")] + /// <summary> + /// 宸叉崱鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "CHECK_QTY")] public decimal? CheckQty { get; set; } - /// <summary> - /// 浠撳簱缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "DEPOTS_CODE")] + /// <summary> + /// 浠撳簱缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "DEPOTS_CODE")] public string DepotsCode { get; set; } - /// <summary> - /// 浜嬪姟绫诲瀷缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "TRANSCTION_NO")] + /// <summary> + /// 浜嬪姟绫诲瀷缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "TRANSCTION_NO")] public string TransctionNo { get; set; } - /// <summary> - /// 渚涘簲鍟嗙紪鐮� - /// </summary> - [SugarColumn(ColumnName = "SUPP_NO")] + /// <summary> + /// 渚涘簲鍟嗙紪鐮� + /// </summary> + [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } - /// <summary> - /// 鎻愪氦鐘舵�� - /// </summary> - [SugarColumn(ColumnName = "FSTATUS")] + /// <summary> + /// 鎻愪氦鐘舵�� + /// </summary> + [SugarColumn(ColumnName = "FSTATUS")] public short? Fstatus { get; set; } - /// <summary> - /// 宸ュ巶缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "FACTORY")] + /// <summary> + /// 宸ュ巶缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } - /// <summary> - /// 鏄惁宸插洖鍐橲AP - /// </summary> - [SugarColumn(ColumnName = "SAPSTATUS")] + /// <summary> + /// 鏄惁宸插洖鍐橲AP + /// </summary> + [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } - /// <summary> - /// 纭鍏ュ簱鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "INS_DATE")] + /// <summary> + /// 纭鍏ュ簱鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "INS_DATE")] public DateTime? Insdate { get; set; } - /// <summary> - /// 鏄惁妫�楠� - /// </summary> - [SugarColumn(ColumnName = "ISCHECK")] + /// <summary> + /// 鏄惁妫�楠� + /// </summary> + [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } - /// <summary> - /// 瀹℃牳鍏ュ簱浜� - /// </summary> - [SugarColumn(ColumnName = "INSBY")] + /// <summary> + /// 瀹℃牳鍏ュ簱浜� + /// </summary> + [SugarColumn(ColumnName = "INSBY")] public string Insby { get; set; } - /// <summary> - /// 鍏徃浠g爜 - /// </summary> - [SugarColumn(ColumnName = "COMPANY")] + /// <summary> + /// 鍏徃浠g爜 + /// </summary> + [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } - /// <summary> - /// 鎬ユ枡鏍囪瘑 - /// </summary> - [SugarColumn(ColumnName = "URGENT_FLAG")] + /// <summary> + /// 鎬ユ枡鏍囪瘑 + /// </summary> + [SugarColumn(ColumnName = "URGENT_FLAG")] public short? UrgentFlag { get; set; } - /// <summary> - /// 鍐查攢浜嬪姟绫诲瀷缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "MTTRANSCTION_NO")] + /// <summary> + /// 鍐查攢浜嬪姟绫诲瀷缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "MTTRANSCTION_NO")] public decimal? MttransctionNo { get; set; } - /// <summary> - /// IQC妫�楠屽崟鍙� - /// </summary> - [SugarColumn(ColumnName = "IQC_RELEASE_NO")] + /// <summary> + /// IQC妫�楠屽崟鍙� + /// </summary> + [SugarColumn(ColumnName = "IQC_RELEASE_NO")] public string IqcReleaseNo { get; set; } - /// <summary> - /// 鏄惁鏄剧ず - /// </summary> - [SugarColumn(ColumnName = "IS_VISUAL")] + /// <summary> + /// 鏄惁鏄剧ず + /// </summary> + [SugarColumn(ColumnName = "IS_VISUAL")] public decimal? IsVisual { get; set; } - /// <summary> - /// 0=閲囪喘锛�1=濮斿 - /// </summary> - [SugarColumn(ColumnName = "F_TYPE")] + /// <summary> + /// 0=閲囪喘锛�1=濮斿 + /// </summary> + [SugarColumn(ColumnName = "F_TYPE")] public decimal? FType { get; set; } - /// <summary> - /// ERP鍒拌揣鍗旾D - /// </summary> - [SugarColumn(ColumnName = "EBELN_K3ID")] + /// <summary> + /// ERP鍒拌揣鍗旾D + /// </summary> + [SugarColumn(ColumnName = "EBELN_K3ID")] public string EbelnK3id { get; set; } - /// <summary> - /// 鏉$爜鏉″嵃杩涘害 - /// </summary> - [SugarColumn(ColumnName = "BARCODE_RATIO")] + /// <summary> + /// 鏉$爜鏉″嵃杩涘害 + /// </summary> + [SugarColumn(ColumnName = "BARCODE_RATIO")] public decimal? BarcodeRatio { get; set; } - /// <summary> - /// ERP鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "ERPNO")] + /// <summary> + /// ERP鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "ERPNO")] public string Erpno { get; set; } - /// <summary> - /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐� - /// </summary> - [SugarColumn(ColumnName = "THSTATUS")] + /// <summary> + /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐� + /// </summary> + [SugarColumn(ColumnName = "THSTATUS")] public short? Thstatus { get; set; } - /// <summary> - /// ERP閫�璐у崟鍙� - /// </summary> - [SugarColumn(ColumnName = "ERPTHNO")] + /// <summary> + /// ERP閫�璐у崟鍙� + /// </summary> + [SugarColumn(ColumnName = "ERPTHNO")] public string Erpthno { get; set; } diff --git a/MES.Service/Modes/MesInvItemInCItems.cs b/MES.Service/Modes/MesInvItemInCItems.cs index 9c3eb27..05e3293 100644 --- a/MES.Service/Modes/MesInvItemInCItems.cs +++ b/MES.Service/Modes/MesInvItemInCItems.cs @@ -8,141 +8,141 @@ [SugarTable("MES_INV_ITEM_IN_C_ITEMS")] public class MesInvItemInCItems { - /// <summary> - /// SEQ_OUT - /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + /// <summary> + /// SEQ_OUT + /// </summary> + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } - /// <summary> - /// 鍏ュ簱鍗昳d - /// </summary> - [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)] + /// <summary> + /// 鍏ュ簱鍗昳d + /// </summary> + [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)] public decimal ItemInId { get; set; } - /// <summary> - /// 楠屾敹鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "QUANTITY")] + /// <summary> + /// 楠屾敹鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + /// <summary> + /// 鍒涘缓浜� + /// </summary> + [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + /// <summary> + /// 鏈�鍚庢洿鏂颁汉 + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + /// <summary> + /// 鏈�鍚庢洿鏂版椂闂� + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } - /// <summary> - /// 鐗╂枡缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "ITEM_NO")] + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } - /// <summary> - /// 浠撳簱缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "DEPOT_CODE")] + /// <summary> + /// 浠撳簱缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } - /// <summary> - /// 璐т綅缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] + /// <summary> + /// 璐т綅缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] public string DepotSectionCode { get; set; } - /// <summary> - /// 鐗硅浜嬮」 - /// </summary> - [SugarColumn(ColumnName = "REMARK")] + /// <summary> + /// 鐗硅浜嬮」 + /// </summary> + [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } - /// <summary> - /// 鐗╂枡绠�绉� - /// </summary> - [SugarColumn(ColumnName = "ITEM_SNAME")] + /// <summary> + /// 鐗╂枡绠�绉� + /// </summary> + [SugarColumn(ColumnName = "ITEM_SNAME")] public string ItemSname { get; set; } - /// <summary> - /// 鍗曚綅 - /// </summary> - [SugarColumn(ColumnName = "UNIT")] + /// <summary> + /// 鍗曚綅 + /// </summary> + [SugarColumn(ColumnName = "UNIT")] public string Unit { get; set; } - /// <summary> - /// 閲囪喘璁㈠崟 - /// </summary> - [SugarColumn(ColumnName = "EBELN")] + /// <summary> + /// 閲囪喘璁㈠崟 + /// </summary> + [SugarColumn(ColumnName = "EBELN")] public string Ebeln { get; set; } - /// <summary> - /// 鍏ュ簱鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "BILL_NO")] + /// <summary> + /// 鍏ュ簱鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } - /// <summary> - /// 鍒嗗巶缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "FACTORY")] + /// <summary> + /// 鍒嗗巶缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } - /// <summary> - /// 鍏徃浠g爜 - /// </summary> - [SugarColumn(ColumnName = "COMPANY")] + /// <summary> + /// 鍏徃浠g爜 + /// </summary> + [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } - /// <summary> - /// 浠诲姟鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "WORK_NO")] + /// <summary> + /// 浠诲姟鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } - /// <summary> - /// 琛屽彿 - /// </summary> - [SugarColumn(ColumnName = "EBELN_LINE_NO")] + /// <summary> + /// 琛屽彿 + /// </summary> + [SugarColumn(ColumnName = "EBELN_LINE_NO")] public decimal? EbelnLineNo { get; set; } - /// <summary> - /// 鍒拌揣鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "CBILL_NO")] + /// <summary> + /// 鍒拌揣鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "CBILL_NO")] public string CbillNo { get; set; } - /// <summary> - /// 浠诲姟鍗曡鍙� - /// </summary> - [SugarColumn(ColumnName = "WORK_LINE")] + /// <summary> + /// 浠诲姟鍗曡鍙� + /// </summary> + [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } - /// <summary> - /// 鐢熶骇宸ュ崟 - /// </summary> - [SugarColumn(ColumnName = "TASK_NO")] + /// <summary> + /// 鐢熶骇宸ュ崟 + /// </summary> + [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } - /// <summary> - /// 渚涘簲鍟� - /// </summary> - [SugarColumn(ColumnName = "SUPP_NO")] + /// <summary> + /// 渚涘簲鍟� + /// </summary> + [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } } \ No newline at end of file diff --git a/MES.Service/Modes/MesInvItemMoves.cs b/MES.Service/Modes/MesInvItemMoves.cs index 07b4ba6..b65928e 100644 --- a/MES.Service/Modes/MesInvItemMoves.cs +++ b/MES.Service/Modes/MesInvItemMoves.cs @@ -8,171 +8,171 @@ [SugarTable("MES_INV_ITEM_MOVES")] public class MesInvItemMoves { - /// <summary> - /// SEQ_INV_ID - /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + /// <summary> + /// SEQ_INV_ID + /// </summary> + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } - /// <summary> - /// 绉诲簱鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "BILL_NO")] + /// <summary> + /// 绉诲簱鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "BILL_NO")] public string BillNo { get; set; } - /// <summary> - /// 绉诲叆瀛愬簱id - /// </summary> - [SugarColumn(ColumnName = "INV_DEPOTS_ID")] + /// <summary> + /// 绉诲叆瀛愬簱id + /// </summary> + [SugarColumn(ColumnName = "INV_DEPOTS_ID")] public decimal? InvDepotsId { get; set; } - /// <summary> - /// 绉诲叆璐т綅id - /// </summary> - [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")] + /// <summary> + /// 绉诲叆璐т綅id + /// </summary> + [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_ID")] public decimal? InvDepotSectionsId { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + /// <summary> + /// 鍒涘缓浜� + /// </summary> + [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + /// <summary> + /// 鏈�鍚庢洿鏂颁汉 + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + /// <summary> + /// 鏈�鍚庢洿鏂版椂闂� + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } - /// <summary> - /// 鐘舵�亅0-鍒跺崟1-杩囪处 - /// </summary> - [SugarColumn(ColumnName = "STATUS")] + /// <summary> + /// 鐘舵�亅0-鍒跺崟1-杩囪处 + /// </summary> + [SugarColumn(ColumnName = "STATUS")] public decimal? Status { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - [SugarColumn(ColumnName = "REMARK")] + /// <summary> + /// 澶囨敞 + /// </summary> + [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } - /// <summary> - /// 鍗曟嵁绫诲瀷ID - /// </summary> - [SugarColumn(ColumnName = "BILL_TYPE_ID")] + /// <summary> + /// 鍗曟嵁绫诲瀷ID + /// </summary> + [SugarColumn(ColumnName = "BILL_TYPE_ID")] public decimal? BillTypeId { get; set; } - /// <summary> - /// 浜嬪姟绫诲瀷ID - /// </summary> - [SugarColumn(ColumnName = "TRANSACTION_ID")] + /// <summary> + /// 浜嬪姟绫诲瀷ID + /// </summary> + [SugarColumn(ColumnName = "TRANSACTION_ID")] public decimal? TransactionId { get; set; } - /// <summary> - /// 瀹℃牳浜� - /// </summary> - [SugarColumn(ColumnName = "CHECKUSER")] + /// <summary> + /// 瀹℃牳浜� + /// </summary> + [SugarColumn(ColumnName = "CHECKUSER")] public string Checkuser { get; set; } - /// <summary> - /// 瀹℃牳鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "CHECKDATE")] + /// <summary> + /// 瀹℃牳鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "CHECKDATE")] public DateTime? Checkdate { get; set; } - /// <summary> - /// 绉诲叆瀛愬簱code - /// </summary> - [SugarColumn(ColumnName = "INV_DEPOTS_CODE")] + /// <summary> + /// 绉诲叆瀛愬簱code + /// </summary> + [SugarColumn(ColumnName = "INV_DEPOTS_CODE")] public string InvDepotsCode { get; set; } - /// <summary> - /// 绉诲叆璐т綅code - /// </summary> - [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")] + /// <summary> + /// 绉诲叆璐т綅code + /// </summary> + [SugarColumn(ColumnName = "INV_DEPOT_SECTIONS_CODE")] public string InvDepotSectionsCode { get; set; } - /// <summary> - /// 浜嬪姟绫诲瀷缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "TRANSACTION_NO")] + /// <summary> + /// 浜嬪姟绫诲瀷缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "TRANSACTION_NO")] public decimal? TransactionNo { get; set; } - /// <summary> - /// 绉诲嚭瀛愬簱code - /// </summary> - [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")] + /// <summary> + /// 绉诲嚭瀛愬簱code + /// </summary> + [SugarColumn(ColumnName = "FROM_DEPOTS_CODE")] public string FromDepotsCode { get; set; } - /// <summary> - /// 宸ュ巶缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "FACTORY_CODE")] + /// <summary> + /// 宸ュ巶缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "FACTORY_CODE")] public string FactoryCode { get; set; } - /// <summary> - /// SAP杩斿洖鍗曟嵁 - /// </summary> - [SugarColumn(ColumnName = "SAPNO")] + /// <summary> + /// SAP杩斿洖鍗曟嵁 + /// </summary> + [SugarColumn(ColumnName = "SAPNO")] public string Sapno { get; set; } - /// <summary> - /// 宸插洖鍐橲AP - /// </summary> - [SugarColumn(ColumnName = "SAPSTATUS")] + /// <summary> + /// 宸插洖鍐橲AP + /// </summary> + [SugarColumn(ColumnName = "SAPSTATUS")] public short? Sapstatus { get; set; } - /// <summary> - /// SAP杩斿洖骞翠唤 - /// </summary> - [SugarColumn(ColumnName = "SAPYEAR")] + /// <summary> + /// SAP杩斿洖骞翠唤 + /// </summary> + [SugarColumn(ColumnName = "SAPYEAR")] public short? Sapyear { get; set; } - /// <summary> - /// SAP杩斿洖淇℃伅 - /// </summary> - [SugarColumn(ColumnName = "SAPTEXT")] + /// <summary> + /// SAP杩斿洖淇℃伅 + /// </summary> + [SugarColumn(ColumnName = "SAPTEXT")] public string Saptext { get; set; } - /// <summary> - /// 鍒嗗巶缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "FACTORY")] + /// <summary> + /// 鍒嗗巶缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } - /// <summary> - /// 鍏徃浠g爜 - /// </summary> - [SugarColumn(ColumnName = "COMPANY")] + /// <summary> + /// 鍏徃浠g爜 + /// </summary> + [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } - /// <summary> - /// 鍙嶅鏍镐簨鍔$被鍨嬬紪鐮� - /// </summary> - [SugarColumn(ColumnName = "MTRANSACTION_NO")] + /// <summary> + /// 鍙嶅鏍镐簨鍔$被鍨嬬紪鐮� + /// </summary> + [SugarColumn(ColumnName = "MTRANSACTION_NO")] public decimal? MtransactionNo { get; set; } - /// <summary> - /// 鑷姩淇濆瓨瀛楁 - /// </summary> - [SugarColumn(ColumnName = "ZD_NUM")] + /// <summary> + /// 鑷姩淇濆瓨瀛楁 + /// </summary> + [SugarColumn(ColumnName = "ZD_NUM")] public decimal? ZdNum { get; set; } - /// <summary> - /// 鏄惁鎺ㄩ�丒RP1-鏄紝2-鍚� - /// </summary> - [SugarColumn(ColumnName = "TS")] + /// <summary> + /// 鏄惁鎺ㄩ�丒RP1-鏄紝2-鍚� + /// </summary> + [SugarColumn(ColumnName = "TS")] public decimal? Ts { get; set; } } \ No newline at end of file diff --git a/MES.Service/Modes/MesInvItemOutCDetails.cs b/MES.Service/Modes/MesInvItemOutCDetails.cs index 2aa1821..e05eb63 100644 --- a/MES.Service/Modes/MesInvItemOutCDetails.cs +++ b/MES.Service/Modes/MesInvItemOutCDetails.cs @@ -16,230 +16,229 @@ public decimal Id { get; set; } /// <summary> - /// 鍑哄簱鍗昳d - ///</summary> + /// 鍑哄簱鍗昳d + /// </summary> [SugarColumn(ColumnName = "ITEM_OUT_ID")] public decimal? ItemOutId { get; set; } /// <summary> - /// 鐗╂枡鏉$爜 - ///</summary> + /// 鐗╂枡鏉$爜 + /// </summary> [SugarColumn(ColumnName = "ITEM_BARCODE")] public string ItemBarcode { get; set; } /// <summary> - /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 - ///</summary> + /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 + /// </summary> [SugarColumn(ColumnName = "C_ITEM_CODE")] public string CItemCode { get; set; } /// <summary> - /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 - ///</summary> + /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 + /// </summary> [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } /// <summary> - /// 鍘傚鎵规 - ///</summary> + /// 鍘傚鎵规 + /// </summary> [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } /// <summary> - /// 鏁伴噺锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 - ///</summary> + /// 鏁伴噺锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 + /// </summary> [SugarColumn(ColumnName = "QUANTITY")] public decimal? Quantity { get; set; } /// <summary> - /// 鎸枡鏍囧織锛�0锛嶅惁锛�1锛嶆槸锛� - ///</summary> + /// 鎸枡鏍囧織锛�0锛嶅惁锛�1锛嶆槸锛� + /// </summary> [SugarColumn(ColumnName = "FORCE_OUT_FLAG")] public decimal? ForceOutFlag { get; set; } /// <summary> - /// 鍒涘缓浜� - ///</summary> + /// 鍒涘缓浜� + /// </summary> [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } /// <summary> - /// 鍒涘缓鏃堕棿 - ///</summary> + /// 鍒涘缓鏃堕棿 + /// </summary> [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - ///</summary> + /// 鏈�鍚庢洿鏂颁汉 + /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - ///</summary> + /// 鏈�鍚庢洿鏂版椂闂� + /// </summary> [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } /// <summary> - /// 瀹㈡埛缂栫爜 - ///</summary> + /// 瀹㈡埛缂栫爜 + /// </summary> [SugarColumn(ColumnName = "CUST_NO")] public string CustNo { get; set; } /// <summary> - /// 浠撳簱缂栫爜 - ///</summary> + /// 浠撳簱缂栫爜 + /// </summary> [SugarColumn(ColumnName = "DEPOT_CODE")] public string DepotCode { get; set; } /// <summary> - /// 璐т綅缂栫爜 - ///</summary> + /// 璐т綅缂栫爜 + /// </summary> [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] public string DepotSectionCode { get; set; } /// <summary> - /// - ///</summary> + /// </summary> [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } /// <summary> - /// 鍏嶆鏍囪瘑(0-鍚︼紝1-鏄�) - ///</summary> + /// 鍏嶆鏍囪瘑(0-鍚︼紝1-鏄�) + /// </summary> [SugarColumn(ColumnName = "FORCE_EXEMPT_FLAG")] public short? ForceExemptFlag { get; set; } /// <summary> - /// 鎶曟枡鎵规 - ///</summary> + /// 鎶曟枡鎵规 + /// </summary> [SugarColumn(ColumnName = "PRD_LOT_NO")] public string PrdLotNo { get; set; } /// <summary> - /// 鏄惁鍋氭帴鏀舵鏌� - ///</summary> + /// 鏄惁鍋氭帴鏀舵鏌� + /// </summary> [SugarColumn(ColumnName = "CHECK_STATUS")] public short? CheckStatus { get; set; } /// <summary> - /// 宸ュ巶缂栧彿 - ///</summary> + /// 宸ュ巶缂栧彿 + /// </summary> [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } /// <summary> - /// 鍏徃缂栧彿 - ///</summary> + /// 鍏徃缂栧彿 + /// </summary> [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } /// <summary> - /// 鍘熺敓浜у伐鍗� - ///</summary> + /// 鍘熺敓浜у伐鍗� + /// </summary> [SugarColumn(ColumnName = "TASK_NOY")] public string TaskNoy { get; set; } /// <summary> - /// 绠卞彿 - ///</summary> + /// 绠卞彿 + /// </summary> [SugarColumn(ColumnName = "BOX_NO")] public string BoxNo { get; set; } /// <summary> - /// 鍖呰鎵规 - ///</summary> + /// 鍖呰鎵规 + /// </summary> [SugarColumn(ColumnName = "TASK_PACK")] public string TaskPack { get; set; } /// <summary> - /// 鍗℃澘 - ///</summary> + /// 鍗℃澘 + /// </summary> [SugarColumn(ColumnName = "KB_NO")] public string KbNo { get; set; } /// <summary> - /// 浜у搧鏈哄瀷 - ///</summary> + /// 浜у搧鏈哄瀷 + /// </summary> [SugarColumn(ColumnName = "BOARD_STYLE")] public string BoardStyle { get; set; } /// <summary> - /// 鐢熶骇宸ュ崟 - ///</summary> + /// 鐢熶骇宸ュ崟 + /// </summary> [SugarColumn(ColumnName = "TASK_NO")] public string TaskNo { get; set; } /// <summary> - /// 浠诲姟鍗曞彿 - ///</summary> + /// 浠诲姟鍗曞彿 + /// </summary> [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } /// <summary> - /// 浠诲姟鍗曡鍙� - ///</summary> + /// 浠诲姟鍗曡鍙� + /// </summary> [SugarColumn(ColumnName = "WORK_LINE")] public decimal? WorkLine { get; set; } /// <summary> - /// 渚涘簲鍟嗙紪鍙� - ///</summary> + /// 渚涘簲鍟嗙紪鍙� + /// </summary> [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } /// <summary> - /// 棰嗘枡鍗曞彿/濮斿璁㈠崟 - ///</summary> + /// 棰嗘枡鍗曞彿/濮斿璁㈠崟 + /// </summary> [SugarColumn(ColumnName = "PBILL_NO")] public string PbillNo { get; set; } /// <summary> - /// 鎺ユ敹鏍囪瘑/1宸叉帴鏀� - ///</summary> + /// 鎺ユ敹鏍囪瘑/1宸叉帴鏀� + /// </summary> [SugarColumn(ColumnName = "RECEIVE")] public decimal? Receive { get; set; } /// <summary> - /// 鎺ユ敹鏃堕棿 - ///</summary> + /// 鎺ユ敹鏃堕棿 + /// </summary> [SugarColumn(ColumnName = "RTIME")] public DateTime? Rtime { get; set; } /// <summary> - /// 鎺ユ敹浜� - ///</summary> + /// 鎺ユ敹浜� + /// </summary> [SugarColumn(ColumnName = "RCV_BY")] public string RcvBy { get; set; } /// <summary> - /// 鎺ユ敹杞﹂棿 - ///</summary> + /// 鎺ユ敹杞﹂棿 + /// </summary> [SugarColumn(ColumnName = "RCV_PART")] public string RcvPart { get; set; } /// <summary> - /// 鍏ュ簱鍗曞彿 - ///</summary> + /// 鍏ュ簱鍗曞彿 + /// </summary> [SugarColumn(ColumnName = "RK_NO")] public string RkNo { get; set; } /// <summary> - /// 閲囪喘璁㈠崟id - ///</summary> + /// 閲囪喘璁㈠崟id + /// </summary> [SugarColumn(ColumnName = "EBELN_K3ID")] public decimal? EbelnK3id { get; set; } /// <summary> - /// 閲囪喘璁㈠崟琛宨d - ///</summary> + /// 閲囪喘璁㈠崟琛宨d + /// </summary> [SugarColumn(ColumnName = "LINE_K3ID")] public decimal? LineK3id { get; set; } /// <summary> - /// 鐗╂枡ID - ///</summary> + /// 鐗╂枡ID + /// </summary> [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; } diff --git a/MES.Service/Modes/MesInvTransaction.cs b/MES.Service/Modes/MesInvTransaction.cs index 635c014..6b3aeae 100644 --- a/MES.Service/Modes/MesInvTransaction.cs +++ b/MES.Service/Modes/MesInvTransaction.cs @@ -8,75 +8,75 @@ [SugarTable("MES_INV_TRANSACTION")] public class MesInvTransaction { - /// <summary> - /// ID - /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + /// <summary> + /// ID + /// </summary> + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } - /// <summary> - /// 浜嬪姟绫诲瀷 - /// </summary> - [SugarColumn(ColumnName = "TRANSACTION_NAME")] + /// <summary> + /// 浜嬪姟绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "TRANSACTION_NAME")] public string TransactionName { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - [SugarColumn(ColumnName = "REMARK")] + /// <summary> + /// 澶囨敞 + /// </summary> + [SugarColumn(ColumnName = "REMARK")] public string Remark { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + /// <summary> + /// 鍒涘缓浜� + /// </summary> + [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂颁汉 - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + /// <summary> + /// 鏈�鍚庢洿鏂颁汉 + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } - /// <summary> - /// 鏈�鍚庢洿鏂版椂闂� - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + /// <summary> + /// 鏈�鍚庢洿鏂版椂闂� + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } - /// <summary> - /// 鍗曟嵁ID - /// </summary> - [SugarColumn(ColumnName = "BUSINESS_ID")] + /// <summary> + /// 鍗曟嵁ID + /// </summary> + [SugarColumn(ColumnName = "BUSINESS_ID")] public decimal? BusinessId { get; set; } - /// <summary> - /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱 - /// </summary> - [SugarColumn(ColumnName = "BUSINESS_TYPE")] + /// <summary> + /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱 + /// </summary> + [SugarColumn(ColumnName = "BUSINESS_TYPE")] public decimal? BusinessType { get; set; } - /// <summary> - /// 浜嬪姟缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "TRANSACTION_NO")] + /// <summary> + /// 浜嬪姟缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "TRANSACTION_NO")] public decimal? TransactionNo { get; set; } - /// <summary> - /// 鍒嗗巶缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "FACTORY")] + /// <summary> + /// 鍒嗗巶缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } - /// <summary> - /// 鍏徃浠g爜 - /// </summary> - [SugarColumn(ColumnName = "COMPANY")] + /// <summary> + /// 鍏徃浠g爜 + /// </summary> + [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } } \ No newline at end of file diff --git a/MES.Service/Modes/MesQaIqc.cs b/MES.Service/Modes/MesQaIqc.cs index ee6425d..ea15cee 100644 --- a/MES.Service/Modes/MesQaIqc.cs +++ b/MES.Service/Modes/MesQaIqc.cs @@ -1,79 +1,85 @@ -锘縰sing System; -using System.Collections.Generic; -using System.Linq; -using SqlSugar; -namespace MES.Service.Modes +锘縰sing SqlSugar; + +namespace MES.Service.Modes; + +/// <summary> +/// 鏁版嵁婧愬鍏� +/// </summary> +[SugarTable("Mes_Qa_Iqc")] +public class MesQaIqc { - /// <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; } - } -} + /// <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/MesQaItemsDetect01.cs b/MES.Service/Modes/MesQaItemsDetect01.cs index caa83d1..4a0b0f4 100644 --- a/MES.Service/Modes/MesQaItemsDetect01.cs +++ b/MES.Service/Modes/MesQaItemsDetect01.cs @@ -8,330 +8,330 @@ [SugarTable("MES_QA_ITEMS_DETECT_01")] public class MesQaItemsDetect01 { - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)] public decimal Id { get; set; } - /// <summary> - /// 妫�楠屽崟鍙� - /// </summary> - [SugarColumn(ColumnName = "RELEASE_NO")] + /// <summary> + /// 妫�楠屽崟鍙� + /// </summary> + [SugarColumn(ColumnName = "RELEASE_NO")] public string ReleaseNo { get; set; } - /// <summary> - /// 妫�楠屾棩鏈� - /// </summary> - [SugarColumn(ColumnName = "FCHECK_DATE")] + /// <summary> + /// 妫�楠屾棩鏈� + /// </summary> + [SugarColumn(ColumnName = "FCHECK_DATE")] public DateTime? FcheckDate { get; set; } - /// <summary> - /// 妫�楠屼汉鍛� - /// </summary> - [SugarColumn(ColumnName = "FCHECK_BY")] + /// <summary> + /// 妫�楠屼汉鍛� + /// </summary> + [SugarColumn(ColumnName = "FCHECK_BY")] public string FcheckBy { get; set; } - /// <summary> - /// 鐗╂枡缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "ITEM_NO")] + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "ITEM_NO")] public string ItemNo { get; set; } - /// <summary> - /// 鏉ユ枡鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "FBATCH_QTY")] + /// <summary> + /// 鏉ユ枡鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "FBATCH_QTY")] public decimal? FbatchQty { get; set; } - /// <summary> - /// 鍒ゅ畾缁撴灉 - /// </summary> - [SugarColumn(ColumnName = "FRECE_QTY")] + /// <summary> + /// 鍒ゅ畾缁撴灉 + /// </summary> + [SugarColumn(ColumnName = "FRECE_QTY")] public string FreceQty { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "SUPP_NO")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "SUPP_NO")] public string SuppNo { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "FNG_DESC")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "FNG_DESC")] public string FngDesc { get; set; } - /// <summary> - /// 妫�楠岀粨鏋� - /// </summary> - [SugarColumn(ColumnName = "FCHECK_RESU")] + /// <summary> + /// 妫�楠岀粨鏋� + /// </summary> + [SugarColumn(ColumnName = "FCHECK_RESU")] public string FcheckResu { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "FREVIEW")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "FREVIEW")] public string Freview { get; set; } - /// <summary> - /// 妫�楠屾按鍑� - /// </summary> - [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] + /// <summary> + /// 妫�楠屾按鍑� + /// </summary> + [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")] public string SampleSizeNo { get; set; } - /// <summary> - /// 妫�楠屾按骞� - /// </summary> - [SugarColumn(ColumnName = "FCHECK_LEVEL")] + /// <summary> + /// 妫�楠屾按骞� + /// </summary> + [SugarColumn(ColumnName = "FCHECK_LEVEL")] public string FcheckLevel { get; set; } - /// <summary> - /// 鎷掓敹姘村钩 - /// </summary> - [SugarColumn(ColumnName = "FAC_LEVEL")] + /// <summary> + /// 鎷掓敹姘村钩 + /// </summary> + [SugarColumn(ColumnName = "FAC_LEVEL")] public string FacLevel { get; set; } - /// <summary> - /// 鎶芥鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "CHECK_QTY")] + /// <summary> + /// 鎶芥鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "CHECK_QTY")] public string CheckQty { get; set; } - /// <summary> - /// 鎵规鍙� --鍒拌揣鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "LOT_NO")] + /// <summary> + /// 鎵规鍙� --鍒拌揣鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "LOT_NO")] public string LotNo { get; set; } - /// <summary> - /// 鏄惁鎺ㄩ�� - /// </summary> - [SugarColumn(ColumnName = "FMOVE")] + /// <summary> + /// 鏄惁鎺ㄩ�� + /// </summary> + [SugarColumn(ColumnName = "FMOVE")] public string Fmove { get; set; } - /// <summary> - /// 鏄惁澶勭悊 - /// </summary> - [SugarColumn(ColumnName = "FHANDLE")] + /// <summary> + /// 鏄惁澶勭悊 + /// </summary> + [SugarColumn(ColumnName = "FHANDLE")] public string Fhandle { get; set; } - /// <summary> - /// 鍒涘缓浜� - /// </summary> - [SugarColumn(ColumnName = "CREATE_BY")] + /// <summary> + /// 鍒涘缓浜� + /// </summary> + [SugarColumn(ColumnName = "CREATE_BY")] public string CreateBy { get; set; } - /// <summary> - /// 鍒涘缓鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "CREATE_DATE")] + /// <summary> + /// 鍒涘缓鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "CREATE_DATE")] public DateTime? CreateDate { get; set; } - /// <summary> - /// 鏇存柊浜� - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_BY")] + /// <summary> + /// 鏇存柊浜� + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_BY")] public string LastupdateBy { get; set; } - /// <summary> - /// 鏇存柊鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "LASTUPDATE_DATE")] + /// <summary> + /// 鏇存柊鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "LASTUPDATE_DATE")] public DateTime? LastupdateDate { get; set; } - /// <summary> - /// 鏄惁瀹℃牳 - /// </summary> - [SugarColumn(ColumnName = "MODIFY1_FLAG")] + /// <summary> + /// 鏄惁瀹℃牳 + /// </summary> + [SugarColumn(ColumnName = "MODIFY1_FLAG")] public decimal? Modify1Flag { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "MODIFY1_BY")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "MODIFY1_BY")] public string Modify1By { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "MODIFY1_DATE")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "MODIFY1_DATE")] public DateTime? Modify1Date { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "FACTORY")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "FACTORY")] public string Factory { get; set; } - /// <summary> - /// XRF娴嬭瘯鎶ュ憡缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "FCHECK_REPNO")] + /// <summary> + /// XRF娴嬭瘯鎶ュ憡缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "FCHECK_REPNO")] public string FcheckRepno { get; set; } - /// <summary> - /// 绗笁鏂规姤鍛� - /// </summary> - [SugarColumn(ColumnName = "FTHIRD_REP")] + /// <summary> + /// 绗笁鏂规姤鍛� + /// </summary> + [SugarColumn(ColumnName = "FTHIRD_REP")] public string FthirdRep { get; set; } - /// <summary> - /// 鏄惁浣滃簾 - /// </summary> - [SugarColumn(ColumnName = "FCANCEL")] + /// <summary> + /// 鏄惁浣滃簾 + /// </summary> + [SugarColumn(ColumnName = "FCANCEL")] public decimal? Fcancel { get; set; } - /// <summary> - /// 鎻愪氦鏍囪瘑 - /// </summary> - [SugarColumn(ColumnName = "FSUBMIT")] + /// <summary> + /// 鎻愪氦鏍囪瘑 + /// </summary> + [SugarColumn(ColumnName = "FSUBMIT")] public decimal? Fsubmit { get; set; } - /// <summary> - /// 妫�楠屼緷鎹� - /// </summary> - [SugarColumn(ColumnName = "FCHECK_ACCORD")] + /// <summary> + /// 妫�楠屼緷鎹� + /// </summary> + [SugarColumn(ColumnName = "FCHECK_ACCORD")] public string FcheckAccord { get; set; } - /// <summary> - /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱) - /// </summary> - [SugarColumn(ColumnName = "FTYPE")] + /// <summary> + /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱) + /// </summary> + [SugarColumn(ColumnName = "FTYPE")] public short? Ftype { get; set; } - /// <summary> - /// 鍗曚綅 - /// </summary> - [SugarColumn(ColumnName = "ITEM_UNIT")] + /// <summary> + /// 鍗曚綅 + /// </summary> + [SugarColumn(ColumnName = "ITEM_UNIT")] public string ItemUnit { get; set; } - /// <summary> - /// 鍑鸿揣鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "OUT_DATE")] + /// <summary> + /// 鍑鸿揣鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "OUT_DATE")] public string OutDate { get; set; } - /// <summary> - /// 鏄惁鍏嶆 - /// </summary> - [SugarColumn(ColumnName = "FEXEMPTION")] + /// <summary> + /// 鏄惁鍏嶆 + /// </summary> + [SugarColumn(ColumnName = "FEXEMPTION")] public decimal? Fexemption { get; set; } - /// <summary> - /// 妗d綅鏍囧噯 - /// </summary> - [SugarColumn(ColumnName = "FGEAR_STAND")] + /// <summary> + /// 妗d綅鏍囧噯 + /// </summary> + [SugarColumn(ColumnName = "FGEAR_STAND")] public string FgearStand { get; set; } - /// <summary> - /// 涓嶈壇澶勭悊鏂规硶 - /// </summary> - [SugarColumn(ColumnName = "FNG_HANDLE")] + /// <summary> + /// 涓嶈壇澶勭悊鏂规硶 + /// </summary> + [SugarColumn(ColumnName = "FNG_HANDLE")] public string FngHandle { get; set; } - /// <summary> - /// 绠$悊缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "FMANAGE_NO")] + /// <summary> + /// 绠$悊缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "FMANAGE_NO")] public string FmanageNo { get; set; } - /// <summary> - /// 杞崲鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "FCOVERT_QTY")] + /// <summary> + /// 杞崲鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "FCOVERT_QTY")] public string FcovertQty { get; set; } - /// <summary> - /// 鐗堟湰 - /// </summary> - [SugarColumn(ColumnName = "FVERSION")] + /// <summary> + /// 鐗堟湰 + /// </summary> + [SugarColumn(ColumnName = "FVERSION")] public decimal? Fversion { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "COMPANY")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "COMPANY")] public string Company { get; set; } - /// <summary> - /// </summary> - [SugarColumn(ColumnName = "FSECOND_RESU")] + /// <summary> + /// </summary> + [SugarColumn(ColumnName = "FSECOND_RESU")] public string FsecondResu { get; set; } - /// <summary> - /// 鏈�澶ф娊妫�鏁� - /// </summary> - [SugarColumn(ColumnName = "MAX_CHECK_QTY")] + /// <summary> + /// 鏈�澶ф娊妫�鏁� + /// </summary> + [SugarColumn(ColumnName = "MAX_CHECK_QTY")] public decimal? MaxCheckQty { get; set; } - /// <summary> - /// 鐗瑰畾淇敼鏄惁瀹℃牳 - /// </summary> - [SugarColumn(ColumnName = "MODIFY1_FLAG1")] + /// <summary> + /// 鐗瑰畾淇敼鏄惁瀹℃牳 + /// </summary> + [SugarColumn(ColumnName = "MODIFY1_FLAG1")] public decimal? Modify1Flag1 { get; set; } - /// <summary> - /// 鐗瑰畾淇敼瀹℃牳浜� - /// </summary> - [SugarColumn(ColumnName = "MODIFY1_BY1")] + /// <summary> + /// 鐗瑰畾淇敼瀹℃牳浜� + /// </summary> + [SugarColumn(ColumnName = "MODIFY1_BY1")] public string Modify1By1 { get; set; } - /// <summary> - /// 鐗瑰畾淇敼瀹℃牳鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "MODIFY1_DATE1")] + /// <summary> + /// 鐗瑰畾淇敼瀹℃牳鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "MODIFY1_DATE1")] public DateTime? Modify1Date1 { get; set; } - /// <summary> - /// 灏忔壒娆″彿 - /// </summary> - [SugarColumn(ColumnName = "LOT_NO1")] + /// <summary> + /// 灏忔壒娆″彿 + /// </summary> + [SugarColumn(ColumnName = "LOT_NO1")] public string LotNo1 { get; set; } - /// <summary> - /// 閲囪喘鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "LOT_NO2")] + /// <summary> + /// 閲囪喘鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "LOT_NO2")] public string LotNo2 { get; set; } - /// <summary> - /// 浜у搧鍨嬪彿 - /// </summary> - [SugarColumn(ColumnName = "BOARD_STYLE")] + /// <summary> + /// 浜у搧鍨嬪彿 + /// </summary> + [SugarColumn(ColumnName = "BOARD_STYLE")] public string BoardStyle { get; set; } - /// <summary> - /// 浠诲姟鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "WORK_NO")] + /// <summary> + /// 浠诲姟鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "WORK_NO")] public string WorkNo { get; set; } - /// <summary> - /// 鍒拌揣鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "DHA018")] + /// <summary> + /// 鍒拌揣鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "DHA018")] public string Dha018 { get; set; } - /// <summary> - /// 琛屽彿 - /// </summary> - [SugarColumn(ColumnName = "DHB002")] + /// <summary> + /// 琛屽彿 + /// </summary> + [SugarColumn(ColumnName = "DHB002")] public decimal? Dhb002 { get; set; } - /// <summary> - /// 鍒拌揣鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "DHB001")] + /// <summary> + /// 鍒拌揣鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "DHB001")] public string Dhb001 { get; set; } - /// <summary> - /// 渚涘簲鍟� - /// </summary> - [SugarColumn(ColumnName = "LIFNR")] + /// <summary> + /// 渚涘簲鍟� + /// </summary> + [SugarColumn(ColumnName = "LIFNR")] public string Lifnr { get; set; } - /// <summary> - /// 閫�鏂欐柟寮� - /// </summary> - [SugarColumn(ColumnName = "FMRMODE")] + /// <summary> + /// 閫�鏂欐柟寮� + /// </summary> + [SugarColumn(ColumnName = "FMRMODE")] public string Fmrmode { get; set; } - /// <summary> - /// 涓嶈壇鎻忚堪 - /// </summary> - [SugarColumn(ColumnName = "Remarks")] + + /// <summary> + /// 涓嶈壇鎻忚堪 + /// </summary> + [SugarColumn(ColumnName = "Remarks")] public string Remarks { get; set; } - } \ No newline at end of file diff --git a/MES.Service/Modes/MesQaItemsDetectDetail12.cs b/MES.Service/Modes/MesQaItemsDetectDetail12.cs index b54793e..9632891 100644 --- a/MES.Service/Modes/MesQaItemsDetectDetail12.cs +++ b/MES.Service/Modes/MesQaItemsDetectDetail12.cs @@ -1,72 +1,72 @@ -锘縰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; } +锘縰sing SqlSugar; - /// <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; } - } -} +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 index 24e9cbb..0aa4263 100644 --- a/MES.Service/Modes/MesQaItemsDetectDetail5.cs +++ b/MES.Service/Modes/MesQaItemsDetectDetail5.cs @@ -1,163 +1,185 @@ -锘縰sing System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Linq; +锘縰sing System.ComponentModel.DataAnnotations.Schema; using SqlSugar; -namespace MES.Service.Modes + +namespace MES.Service.Modes; + +/// <summary> +/// 鏉ユ枡妫�楠屼粠琛� +/// </summary> +[SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")] +public class MesQaItemsDetectDetail5 { - /// <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; } - } -} + /// <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/ProductionOrder.cs b/MES.Service/Modes/ProductionOrder.cs new file mode 100644 index 0000000..1a00649 --- /dev/null +++ b/MES.Service/Modes/ProductionOrder.cs @@ -0,0 +1,275 @@ +锘縰sing SqlSugar; + +namespace MES.Service.Modes; + +/// <summary> +/// 鐢熶骇璁㈠崟琛�(濮斿) +/// </summary> +[SugarTable("PRODUCTION_ORDER")] +public class ProductionOrder +{ + /// <summary> + /// SEQ_ORDER + /// </summary> + [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ORDER", + IsPrimaryKey = true)] + public decimal Id { get; set; } + + /// <summary> + /// 鍗曟嵁缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "ORDER_NO")] + public string? OrderNo { get; set; } + + /// <summary> + /// 璐寸墖宸ヨ壓灞炴�� + /// </summary> + [SugarColumn(ColumnName = "SMT_PROCESS_ATTR")] + public string? SmtProcessAttr { get; set; } + + /// <summary> + /// 浠撳簱 + /// </summary> + [SugarColumn(ColumnName = "WAREHOUSE")] + public string? Warehouse { get; set; } + + /// <summary> + /// 鍗曟嵁鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "ORDER_DATE")] + public DateTime? OrderDate { get; set; } + + /// <summary> + /// 鍗曟嵁绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "ORDER_TYPE")] + public string? OrderType { get; set; } + + /// <summary> + /// 涓氬姟鐘舵�� + /// </summary> + [SugarColumn(ColumnName = "BUSINESS_STATUS")] + public string? BusinessStatus { get; set; } + + /// <summary> + /// 浜у搧缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "PRODUCT_CODE")] + public string? ProductCode { get; set; } + + /// <summary> + /// 鍗曚綅 + /// </summary> + [SugarColumn(ColumnName = "UNIT")] + public string? Unit { get; set; } + + /// <summary> + /// 宸ュ崟鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "WORK_ORDER_QTY")] + public decimal? WorkOrderQty { get; set; } + + /// <summary> + /// 璁″垝缁� + /// </summary> + [SugarColumn(ColumnName = "PLANNING_GROUP")] + public string? PlanningGroup { get; set; } + + /// <summary> + /// 璁″垝鍛� + /// </summary> + [SugarColumn(ColumnName = "PLANNER")] + public string? Planner { get; set; } + + /// <summary> + /// 棰勮寮�宸ユ椂闂� + /// </summary> + [SugarColumn(ColumnName = "ESTIMATED_START_TIME")] + public DateTime? EstimatedStartTime { get; set; } + + /// <summary> + /// 棰勮瀹屽伐鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "ESTIMATED_END_TIME")] + public DateTime? EstimatedEndTime { get; set; } + + /// <summary> + /// 璁″垝涓嬭揪鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "PLAN_RELEASE_DATE")] + public DateTime? PlanReleaseDate { get; set; } + + /// <summary> + /// 鍏ュ簱涓婇檺 + /// </summary> + [SugarColumn(ColumnName = "STORAGE_UPPER_LIMIT")] + public decimal? StorageUpperLimit { get; set; } + + /// <summary> + /// 鍏ュ簱涓嬮檺 + /// </summary> + [SugarColumn(ColumnName = "STORAGE_LOWER_LIMIT")] + public decimal? StorageLowerLimit { get; set; } + + /// <summary> + /// 璁″垝璺熻釜鍙� + /// </summary> + [SugarColumn(ColumnName = "TRACKING_NO")] + public string? TrackingNo { get; set; } + + /// <summary> + /// 鎵瑰彿 + /// </summary> + [SugarColumn(ColumnName = "BATCH_NO")] + public string? BatchNo { get; set; } + + /// <summary> + /// BOM鐗堟 + /// </summary> + [SugarColumn(ColumnName = "BOM_VERSION")] + public string? BomVersion { get; set; } + + /// <summary> + /// 閿�鍞鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "SALES_ORDER_NO")] + public string? SalesOrderNo { get; set; } + + /// <summary> + /// 閿�鍞鍗曡鍙� + /// </summary> + [SugarColumn(ColumnName = "SALES_ORDER_LINE_NO")] + public string? SalesOrderLineNo { get; set; } + + /// <summary> + /// 鐢熸垚鏂瑰紡 + /// </summary> + [SugarColumn(ColumnName = "GENERATION_METHOD")] + public string? GenerationMethod { get; set; } + + /// <summary> + /// ERP鐢熶骇璁㈠崟ID + /// </summary> + [SugarColumn(ColumnName = "ERP_PRODUCTION_ORDER_ID")] + public string? ErpProductionOrderId { get; set; } + + /// <summary> + /// ERP鐢熶骇璁㈠崟搴忓彿 + /// </summary> + [SugarColumn(ColumnName = "ERP_PRODUCTION_ORDER_LINE_NO")] + public string? ErpProductionOrderLineNo { get; set; } + + /// <summary> + /// ERP鐢熶骇璁㈠崟鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "ERP_PRODUCTION_ORDER_NO")] + public string? ErpProductionOrderNo { get; set; } + + /// <summary> + /// 婧愬崟绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "SOURCE_ORDER_TYPE")] + public string? SourceOrderType { get; set; } + + /// <summary> + /// 婧愬崟缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "SOURCE_ORDER_NO")] + public string? SourceOrderNo { get; set; } + + /// <summary> + /// 婧愬崟鍒嗗綍琛屽彿 + /// </summary> + [SugarColumn(ColumnName = "SOURCE_ORDER_ENTRY_NO")] + public string? SourceOrderEntryNo { get; set; } + + /// <summary> + /// 闇�姹傚崟鎹彿 + /// </summary> + [SugarColumn(ColumnName = "DEMAND_ORDER_NO")] + public string? DemandOrderNo { get; set; } + + /// <summary> + /// 闇�姹傚崟鎹鍙� + /// </summary> + [SugarColumn(ColumnName = "DEMAND_ORDER_LINE_NO")] + public string? DemandOrderLineNo { get; set; } + + /// <summary> + /// 缁撴浜� + /// </summary> + [SugarColumn(ColumnName = "CLOSING_PERSON")] + public string? ClosingPerson { get; set; } + + /// <summary> + /// 缁撴绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "CLOSING_TYPE")] + public string? ClosingType { get; set; } + + /// <summary> + /// 婧愭媶鍒嗚鍗曠紪鍙� + /// </summary> + [SugarColumn(ColumnName = "SPLIT_ORDER_NO")] + public string? SplitOrderNo { 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鐢熶骇璁㈠崟鍒嗗綍鍐呯爜 + /// </summary> + [SugarColumn(ColumnName = "ERP_PRODUCTION_ENTRY_CODE")] + public string? ErpProductionEntryCode { get; set; } + + /// <summary> + /// 閲囪喘璁㈠崟 + /// </summary> + [SugarColumn(ColumnName = "PURCHASEORDERNO")] + public string? PurchaseOrderNo { get; set; } + + /// <summary> + /// 閲囪喘璁㈠崟琛屽彿 + /// </summary> + [SugarColumn(ColumnName = "PURCHASEORDERENTRYSEQ")] + public long? PurchaseOrderEntrySeq { get; set; } + + /// <summary> + /// 鏍囧噯鐐规暟 + /// </summary> + [SugarColumn(ColumnName = "STANDARDPOINTS")] + public decimal? StandardPoints { get; set; } + + /// <summary> + /// 璁′环鐐规暟 + /// </summary> + [SugarColumn(ColumnName = "PRICINGPOINTS")] + public decimal? PricingPoints { get; set; } + + /// <summary> + /// 鍏ュ簱鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "STOCKINQTY")] + public decimal? StockInQty { get; set; } + + /// <summary> + /// 鏈叆搴撴暟閲� + /// </summary> + [SugarColumn(ColumnName = "NOSTOCKINQTY")] + public decimal? NoStockInQty { get; set; } + + /// <summary> + /// 鍏ュ簱璐т富 + /// </summary> + [SugarColumn(ColumnName = "STOCKOWNER")] + public string? StockOwner { get; set; } +} \ No newline at end of file diff --git a/MES.Service/Modes/ProductionOrderSub.cs b/MES.Service/Modes/ProductionOrderSub.cs new file mode 100644 index 0000000..034c198 --- /dev/null +++ b/MES.Service/Modes/ProductionOrderSub.cs @@ -0,0 +1,209 @@ +锘縰sing SqlSugar; + +namespace MES.Service.Modes; + +/// <summary> +/// 鐢熶骇璁㈠崟琛�(濮斿)瀛愯〃 +/// </summary> +[SugarTable("PRODUCTION_ORDER_SUB")] +public class ProductionOrderSub +{ + /// <summary> + /// SEQ_ORDER + /// </summary> + [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ORDER", + IsPrimaryKey = true)] + public decimal Id { get; set; } + + /// <summary> + /// 宸ュ崟鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "WORK_ORDER_NO")] + public string? WorkOrderNo { get; set; } + + /// <summary> + /// 搴忓彿 + /// </summary> + [SugarColumn(ColumnName = "SEQUENCE_NO")] + public long? SequenceNo { get; set; } + + /// <summary> + /// 鏉愭枡缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "MATERIAL_CODE")] + public string? MaterialCode { get; set; } + + /// <summary> + /// 闇�棰嗙敤閲� + /// </summary> + [SugarColumn(ColumnName = "REQUIRED_QTY")] + public decimal? RequiredQty { get; set; } + + /// <summary> + /// 宸查鐢ㄩ噺 + /// </summary> + [SugarColumn(ColumnName = "ISSUED_QTY")] + public decimal? IssuedQty { get; set; } + + /// <summary> + /// 浣嶇疆鍙� + /// </summary> + [SugarColumn(ColumnName = "LOCATION_NO")] + public string? LocationNo { get; set; } + + /// <summary> + /// 渚涘簲缁勭粐 + /// </summary> + [SugarColumn(ColumnName = "SUPPLYING_ORG")] + public string? SupplyingOrg { get; set; } + + /// <summary> + /// 鍙戞枡缁勭粐 + /// </summary> + [SugarColumn(ColumnName = "ISSUING_ORG")] + public string? IssuingOrg { get; set; } + + /// <summary> + /// 璐т富 + /// </summary> + [SugarColumn(ColumnName = "STOCK_OWNER")] + public string? StockOwner { get; set; } + + /// <summary> + /// 璁″垝璺熻釜鍙� + /// </summary> + [SugarColumn(ColumnName = "TRACKING_NO")] + public string? TrackingNo { get; set; } + + /// <summary> + /// 鎵瑰彿 + /// </summary> + [SugarColumn(ColumnName = "BATCH_NO")] + public string? BatchNo { get; set; } + + /// <summary> + /// 浠撳簱 + /// </summary> + [SugarColumn(ColumnName = "WAREHOUSE")] + public string? Warehouse { get; set; } + + /// <summary> + /// 鍙戞枡鏂瑰紡 + /// </summary> + [SugarColumn(ColumnName = "ISSUING_METHOD")] + public string? IssuingMethod { get; set; } + + /// <summary> + /// 宸ヨ壓 + /// </summary> + [SugarColumn(ColumnName = "PROCESS")] + public string? Process { get; set; } + + /// <summary> + /// 鍗曚綅 + /// </summary> + [SugarColumn(ColumnName = "UNIT")] + public string? Unit { get; set; } + + /// <summary> + /// 渚涘簲绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "SUPPLYING_TYPE")] + public string? SupplyingType { get; set; } + + /// <summary> + /// 缁勬垚鐢ㄩ噺 + /// </summary> + [SugarColumn(ColumnName = "COMPOSITION_QTY")] + public decimal? CompositionQty { get; set; } + + /// <summary> + /// 鏄惁鏇挎枡 + /// </summary> + [SugarColumn(ColumnName = "IS_SUBSTITUTE")] + public string? IsSubstitute { get; set; } + + /// <summary> + /// 鍒嗗瓙 + /// </summary> + [SugarColumn(ColumnName = "NUMERATOR")] + public long? Numerator { get; set; } + + /// <summary> + /// 鍒嗘瘝 + /// </summary> + [SugarColumn(ColumnName = "DENOMINATOR")] + public long? Denominator { get; set; } + + /// <summary> + /// ERPID + /// </summary> + [SugarColumn(ColumnName = "ERP_ID")] + public string? ErpId { get; set; } + + /// <summary> + /// ERP澶碔D + /// </summary> + [SugarColumn(ColumnName = "ERP_HEADER_ID")] + public string? ErpHeaderId { get; set; } + + /// <summary> + /// 鍥哄畾鎹熻�� + /// </summary> + [SugarColumn(ColumnName = "FIXED_LOSS")] + public decimal? FixedLoss { get; set; } + + /// <summary> + /// 鍙樺姩鎹熻�楃巼% + /// </summary> + [SugarColumn(ColumnName = "VARIABLE_LOSS_RATE")] + public string? VariableLossRate { get; set; } + + /// <summary> + /// 瀛愰」绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "SUB_ITEM_TYPE")] + public string? SubItemType { get; set; } + + /// <summary> + /// 瀛愰」鍗曚綅 + /// </summary> + [SugarColumn(ColumnName = "SUB_ITEM_UNIT")] + public string? SubItemUnit { get; set; } + + /// <summary> + /// 閿�鍞鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "SALES_ORDER_NO")] + public string? SalesOrderNo { get; set; } + + /// <summary> + /// 椤规鍙� + /// </summary> + [SugarColumn(ColumnName = "ITEM_NO")] + public string? ItemNo { get; set; } + + /// <summary> + /// 鍙戞枡缁勭粐 + /// </summary> + [SugarColumn(ColumnName = "ISSUING_ORG_2")] + public string? IssuingOrg2 { get; set; } + + /// <summary> + /// 璐т富绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "OWNER_TYPE")] + public string? OwnerType { get; set; } + + /// <summary> + /// 璐т富 + /// </summary> + [SugarColumn(ColumnName = "OWNER")] + public string? Owner { get; set; } + + /// <summary> + /// 渚涘簲缁勭粐 + /// </summary> + [SugarColumn(ColumnName = "SUPPLYING_ORG_2")] + public string? SupplyingOrg2 { get; set; } +} \ No newline at end of file diff --git a/MES.Service/Modes/Purdhb.cs b/MES.Service/Modes/Purdhb.cs index b8de0cc..7fff6ee 100644 --- a/MES.Service/Modes/Purdhb.cs +++ b/MES.Service/Modes/Purdhb.cs @@ -8,267 +8,267 @@ [SugarTable("PURDHB")] public class Purdhb { - /// <summary> - /// 鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "DHB001")] + /// <summary> + /// 鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "DHB001")] public string Dhb001 { get; set; } - /// <summary> - /// 搴忓彿 - /// </summary> - [SugarColumn(ColumnName = "DHB002")] + /// <summary> + /// 搴忓彿 + /// </summary> + [SugarColumn(ColumnName = "DHB002")] public string Dhb002 { get; set; } - /// <summary> - /// 鐗╂枡缂栫爜 - /// </summary> - [SugarColumn(ColumnName = "DHB003")] + /// <summary> + /// 鐗╂枡缂栫爜 + /// </summary> + [SugarColumn(ColumnName = "DHB003")] public string Dhb003 { get; set; } - /// <summary> - /// 鐗╂枡鍚嶇О - /// </summary> - [SugarColumn(ColumnName = "DHB004")] + /// <summary> + /// 鐗╂枡鍚嶇О + /// </summary> + [SugarColumn(ColumnName = "DHB004")] public string Dhb004 { get; set; } - /// <summary> - /// 鐗╂枡瑙勬牸 - /// </summary> - [SugarColumn(ColumnName = "DHB005")] + /// <summary> + /// 鐗╂枡瑙勬牸 + /// </summary> + [SugarColumn(ColumnName = "DHB005")] public string Dhb005 { get; set; } - /// <summary> - /// 浜よ揣鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "DHB006")] + /// <summary> + /// 浜よ揣鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "DHB006")] public decimal? Dhb006 { get; set; } - /// <summary> - /// 鍗曚綅 - /// </summary> - [SugarColumn(ColumnName = "DHB007")] + /// <summary> + /// 鍗曚綅 + /// </summary> + [SugarColumn(ColumnName = "DHB007")] public string Dhb007 { get; set; } - /// <summary> - /// 浠撳簱 - /// </summary> - [SugarColumn(ColumnName = "DHB008")] + /// <summary> + /// 浠撳簱 + /// </summary> + [SugarColumn(ColumnName = "DHB008")] public string Dhb008 { get; set; } - /// <summary> - /// 浠撳簱鍚嶇О - /// </summary> - [SugarColumn(ColumnName = "DHB009")] + /// <summary> + /// 浠撳簱鍚嶇О + /// </summary> + [SugarColumn(ColumnName = "DHB009")] public string Dhb009 { get; set; } - /// <summary> - /// 鎵瑰彿 - /// </summary> - [SugarColumn(ColumnName = "DHB010")] + /// <summary> + /// 鎵瑰彿 + /// </summary> + [SugarColumn(ColumnName = "DHB010")] public string Dhb010 { get; set; } - /// <summary> - /// 鏉ユ簮鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "DHB011")] + /// <summary> + /// 鏉ユ簮鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "DHB011")] public string Dhb011 { get; set; } - /// <summary> - /// 鏉ユ簮搴忓彿 - /// </summary> - [SugarColumn(ColumnName = "DHB012")] + /// <summary> + /// 鏉ユ簮搴忓彿 + /// </summary> + [SugarColumn(ColumnName = "DHB012")] public decimal? Dhb012 { get; set; } - /// <summary> - /// 娓呯偣鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "DHB013")] + /// <summary> + /// 娓呯偣鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "DHB013")] public decimal? Dhb013 { get; set; } - /// <summary> - /// 鍒板巶鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "DHB014")] + /// <summary> + /// 鍒板巶鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "DHB014")] public string Dhb014 { get; set; } - /// <summary> - /// 楠屾敹鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "DHB015")] + /// <summary> + /// 楠屾敹鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "DHB015")] public decimal? Dhb015 { get; set; } - /// <summary> - /// 楠岄��鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "DHB016")] + /// <summary> + /// 楠岄��鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "DHB016")] public decimal? Dhb016 { get; set; } - /// <summary> - /// 杩涜揣鍗曚环 - /// </summary> - [SugarColumn(ColumnName = "DHB017")] + /// <summary> + /// 杩涜揣鍗曚环 + /// </summary> + [SugarColumn(ColumnName = "DHB017")] public decimal? Dhb017 { get; set; } - /// <summary> - /// 杩涜揣閲戦 - /// </summary> - [SugarColumn(ColumnName = "DHB018")] + /// <summary> + /// 杩涜揣閲戦 + /// </summary> + [SugarColumn(ColumnName = "DHB018")] public decimal? Dhb018 { get; set; } - /// <summary> - /// 瀹㈡埛鏂欏彿 - /// </summary> - [SugarColumn(ColumnName = "DHB019")] + /// <summary> + /// 瀹㈡埛鏂欏彿 + /// </summary> + [SugarColumn(ColumnName = "DHB019")] public string Dhb019 { get; set; } - /// <summary> - /// 閮ㄩ棬缂栧彿 - /// </summary> - [SugarColumn(ColumnName = "DHB020")] + /// <summary> + /// 閮ㄩ棬缂栧彿 + /// </summary> + [SugarColumn(ColumnName = "DHB020")] public string Dhb020 { get; set; } - /// <summary> - /// 璧犲搧鏁� - /// </summary> - [SugarColumn(ColumnName = "DHB021")] + /// <summary> + /// 璧犲搧鏁� + /// </summary> + [SugarColumn(ColumnName = "DHB021")] public decimal? Dhb021 { get; set; } - /// <summary> - /// 鏇存柊ERP - /// </summary> - [SugarColumn(ColumnName = "DHB022")] + /// <summary> + /// 鏇存柊ERP + /// </summary> + [SugarColumn(ColumnName = "DHB022")] public string Dhb022 { get; set; } - /// <summary> - /// 妫�楠岀姸鎬� - /// </summary> - [SugarColumn(ColumnName = "DHB023")] + /// <summary> + /// 妫�楠岀姸鎬� + /// </summary> + [SugarColumn(ColumnName = "DHB023")] public string Dhb023 { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - [SugarColumn(ColumnName = "DHB024")] + /// <summary> + /// 澶囨敞 + /// </summary> + [SugarColumn(ColumnName = "DHB024")] public string Dhb024 { get; set; } - /// <summary> - /// 瀹℃牳 - /// </summary> - [SugarColumn(ColumnName = "AUDITING")] + /// <summary> + /// 瀹℃牳 + /// </summary> + [SugarColumn(ColumnName = "AUDITING")] public decimal? Auditing { get; set; } - /// <summary> - /// ERP閲囪喘鍗曞彿ID - /// </summary> - [SugarColumn(ColumnName = "DHB026")] + /// <summary> + /// ERP閲囪喘鍗曞彿ID + /// </summary> + [SugarColumn(ColumnName = "DHB026")] public decimal? Dhb026 { get; set; } - /// <summary> - /// ERP閲囪喘搴忓彿ID - /// </summary> - [SugarColumn(ColumnName = "DHB027")] + /// <summary> + /// ERP閲囪喘搴忓彿ID + /// </summary> + [SugarColumn(ColumnName = "DHB027")] public decimal? Dhb027 { get; set; } - /// <summary> - /// ERP鐗╂枡ID - /// </summary> - [SugarColumn(ColumnName = "DHB028")] + /// <summary> + /// ERP鐗╂枡ID + /// </summary> + [SugarColumn(ColumnName = "DHB028")] public decimal? Dhb028 { get; set; } - /// <summary> - /// 寰呮鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "DHB029")] + /// <summary> + /// 寰呮鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "DHB029")] public decimal? Dhb029 { get; set; } - /// <summary> - /// 妫�楠屾棩鏈� - /// </summary> - [SugarColumn(ColumnName = "DHB030")] + /// <summary> + /// 妫�楠屾棩鏈� + /// </summary> + [SugarColumn(ColumnName = "DHB030")] public string Dhb030 { get; set; } - /// <summary> - /// 妫�楠屽憳 - /// </summary> - [SugarColumn(ColumnName = "DHB031")] + /// <summary> + /// 妫�楠屽憳 + /// </summary> + [SugarColumn(ColumnName = "DHB031")] public string Dhb031 { get; set; } - /// <summary> - /// 鍏ュ簱鏁伴噺 - /// </summary> - [SugarColumn(ColumnName = "DHB032")] + /// <summary> + /// 鍏ュ簱鏁伴噺 + /// </summary> + [SugarColumn(ColumnName = "DHB032")] public decimal? Dhb032 { get; set; } - /// <summary> - /// 鍏ュ簱浜� - /// </summary> - [SugarColumn(ColumnName = "DHB033")] + /// <summary> + /// 鍏ュ簱浜� + /// </summary> + [SugarColumn(ColumnName = "DHB033")] public string Dhb033 { get; set; } - /// <summary> - /// 鍏ュ簱鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "DHB034")] + /// <summary> + /// 鍏ュ簱鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "DHB034")] public string Dhb034 { get; set; } - /// <summary> - /// 閫�璐ф暟閲� - /// </summary> - [SugarColumn(ColumnName = "DHB035")] + /// <summary> + /// 閫�璐ф暟閲� + /// </summary> + [SugarColumn(ColumnName = "DHB035")] public decimal? Dhb035 { get; set; } - /// <summary> - /// ERPID - /// </summary> - [SugarColumn(ColumnName = "DHB037")] + /// <summary> + /// ERPID + /// </summary> + [SugarColumn(ColumnName = "DHB037")] public decimal? Dhb037 { get; set; } - /// <summary> - /// 閫�璐т汉 - /// </summary> - [SugarColumn(ColumnName = "DHB036")] + /// <summary> + /// 閫�璐т汉 + /// </summary> + [SugarColumn(ColumnName = "DHB036")] public string Dhb036 { get; set; } - /// <summary> - /// ERP鍘熷垎褰曞彿 - /// </summary> - [SugarColumn(ColumnName = "DHB038")] + /// <summary> + /// ERP鍘熷垎褰曞彿 + /// </summary> + [SugarColumn(ColumnName = "DHB038")] public decimal? Dhb038 { get; set; } - /// <summary> - /// ERP婧愬崟鍐呯爜 - /// </summary> - [SugarColumn(ColumnName = "DHB039")] + /// <summary> + /// ERP婧愬崟鍐呯爜 + /// </summary> + [SugarColumn(ColumnName = "DHB039")] public decimal? Dhb039 { get; set; } - /// <summary> - /// ERP婧愬崟绫诲瀷 - /// </summary> - [SugarColumn(ColumnName = "DHB040")] + /// <summary> + /// ERP婧愬崟绫诲瀷 + /// </summary> + [SugarColumn(ColumnName = "DHB040")] public decimal? Dhb040 { get; set; } - /// <summary> - /// ERP璁㈠崟鍐呯爜 - /// </summary> - [SugarColumn(ColumnName = "DHB041")] + /// <summary> + /// ERP璁㈠崟鍐呯爜 + /// </summary> + [SugarColumn(ColumnName = "DHB041")] public decimal? Dhb041 { get; set; } - /// <summary> - /// 鑷鍒� - /// </summary> - [SugarColumn(ColumnName = "ID")] + /// <summary> + /// 鑷鍒� + /// </summary> + [SugarColumn(ColumnName = "ID")] public decimal? Id { get; set; } - /// <summary> - /// 鏄惁妫�楠岋紝1涓哄凡妫� - /// </summary> - [SugarColumn(ColumnName = "ISCHECK")] + /// <summary> + /// 鏄惁妫�楠岋紝1涓哄凡妫� + /// </summary> + [SugarColumn(ColumnName = "ISCHECK")] public decimal? Ischeck { get; set; } - /// <summary> - /// 浠撳簱 - /// </summary> - [SugarColumn(ColumnName = "DHB042")] + /// <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 index 4330c13..1c3ea40 100644 --- a/MES.Service/Modes/Purdka.cs +++ b/MES.Service/Modes/Purdka.cs @@ -8,123 +8,123 @@ [SugarTable("PURDKA")] public class Purdka { - /// <summary> - /// 鑷鍒� - /// </summary> - [SugarColumn(ColumnName = "ID")] + /// <summary> + /// 鑷鍒� + /// </summary> + [SugarColumn(ColumnName = "ID")] public decimal? Id { get; set; } - /// <summary> - /// 鍒涘缓浜哄憳 - /// </summary> - [SugarColumn(ColumnName = "CREATEUSER")] + /// <summary> + /// 鍒涘缓浜哄憳 + /// </summary> + [SugarColumn(ColumnName = "CREATEUSER")] public string Createuser { get; set; } - /// <summary> - /// 鍒涘缓鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "CREATETIME")] + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "CREATETIME")] public string Createtime { get; set; } - /// <summary> - /// 淇敼鏃堕棿 - /// </summary> - [SugarColumn(ColumnName = "MODIFYTIME")] + /// <summary> + /// 淇敼鏃堕棿 + /// </summary> + [SugarColumn(ColumnName = "MODIFYTIME")] public string Modifytime { get; set; } - /// <summary> - /// 淇敼浜哄憳 - /// </summary> - [SugarColumn(ColumnName = "MODIFYUSER")] + /// <summary> + /// 淇敼浜哄憳 + /// </summary> + [SugarColumn(ColumnName = "MODIFYUSER")] public string Modifyuser { get; set; } - /// <summary> - /// 瀹℃牳 - /// </summary> - [SugarColumn(ColumnName = "AUDITING")] + /// <summary> + /// 瀹℃牳 + /// </summary> + [SugarColumn(ColumnName = "AUDITING")] public string Auditing { get; set; } - /// <summary> - /// 閫�璐у崟鍙� - /// </summary> - [SugarColumn(ColumnName = "DKA001")] + /// <summary> + /// 閫�璐у崟鍙� + /// </summary> + [SugarColumn(ColumnName = "DKA001")] public string Dka001 { get; set; } - /// <summary> - /// 閫�璐х被鍨� - /// </summary> - [SugarColumn(ColumnName = "DKA002")] + /// <summary> + /// 閫�璐х被鍨� + /// </summary> + [SugarColumn(ColumnName = "DKA002")] public string Dka002 { get; set; } - /// <summary> - /// 閫�璐ф棩鏈� - /// </summary> - [SugarColumn(ColumnName = "DKA003")] + /// <summary> + /// 閫�璐ф棩鏈� + /// </summary> + [SugarColumn(ColumnName = "DKA003")] public string Dka003 { get; set; } - /// <summary> - /// 閫�璐ф椂闂� - /// </summary> - [SugarColumn(ColumnName = "DKA004")] + /// <summary> + /// 閫�璐ф椂闂� + /// </summary> + [SugarColumn(ColumnName = "DKA004")] public string Dka004 { get; set; } - /// <summary> - /// 渚涘簲鍟� - /// </summary> - [SugarColumn(ColumnName = "DKA005")] + /// <summary> + /// 渚涘簲鍟� + /// </summary> + [SugarColumn(ColumnName = "DKA005")] public string Dka005 { get; set; } - /// <summary> - /// 渚涘簲鍟嗗悕绉� - /// </summary> - [SugarColumn(ColumnName = "DKA006")] + /// <summary> + /// 渚涘簲鍟嗗悕绉� + /// </summary> + [SugarColumn(ColumnName = "DKA006")] public string Dka006 { get; set; } - /// <summary> - /// 閮ㄩ棬 - /// </summary> - [SugarColumn(ColumnName = "DKA007")] + /// <summary> + /// 閮ㄩ棬 + /// </summary> + [SugarColumn(ColumnName = "DKA007")] public string Dka007 { get; set; } - /// <summary> - /// 瀹℃牳鑰� - /// </summary> - [SugarColumn(ColumnName = "DKA008")] + /// <summary> + /// 瀹℃牳鑰� + /// </summary> + [SugarColumn(ColumnName = "DKA008")] public string Dka008 { get; set; } - /// <summary> - /// 瀹℃牳鏃ユ湡 - /// </summary> - [SugarColumn(ColumnName = "DKA009")] + /// <summary> + /// 瀹℃牳鏃ユ湡 + /// </summary> + [SugarColumn(ColumnName = "DKA009")] public string Dka009 { get; set; } - /// <summary> - /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹� - /// </summary> - [SugarColumn(ColumnName = "DKA010")] + /// <summary> + /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹� + /// </summary> + [SugarColumn(ColumnName = "DKA010")] public string Dka010 { get; set; } - /// <summary> - /// ERPID - /// </summary> - [SugarColumn(ColumnName = "ERPID")] + /// <summary> + /// ERPID + /// </summary> + [SugarColumn(ColumnName = "ERPID")] public decimal? Erpid { get; set; } - /// <summary> - /// 淇濈鍛樼紪鐮� - /// </summary> - [SugarColumn(ColumnName = "DKA011")] + /// <summary> + /// 淇濈鍛樼紪鐮� + /// </summary> + [SugarColumn(ColumnName = "DKA011")] public string Dka011 { get; set; } - /// <summary> - /// 楠屾敹鍛樼紪鐮� - /// </summary> - [SugarColumn(ColumnName = "DKA012")] + /// <summary> + /// 楠屾敹鍛樼紪鐮� + /// </summary> + [SugarColumn(ColumnName = "DKA012")] public string Dka012 { get; set; } - /// <summary> - /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫� - /// </summary> - [SugarColumn(ColumnName = "DKA013")] + /// <summary> + /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫� + /// </summary> + [SugarColumn(ColumnName = "DKA013")] public decimal? Dka013 { get; set; } } \ No newline at end of file diff --git a/MES.Service/Modes/Womdab.cs b/MES.Service/Modes/Womdab.cs index a8e39b2..6eab4be 100644 --- a/MES.Service/Modes/Womdab.cs +++ b/MES.Service/Modes/Womdab.cs @@ -144,14 +144,11 @@ /// </summary> [SugarColumn(ColumnName = "ERP_ID")] public decimal? ErpId { get; set; } - + // 鍔ㄦ�佹坊鍔犵殑灞炴�� - [SugarColumn(IsIgnore = true)] - public decimal? wNum { get; set; } + [SugarColumn(IsIgnore = true)] public decimal? wNum { get; set; } - [SugarColumn(IsIgnore = true)] - public string? ItemName { get; set; } + [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; } - [SugarColumn(IsIgnore = true)] - public string? ItemNo { get; set; } + [SugarColumn(IsIgnore = true)] public string? ItemNo { get; set; } } \ No newline at end of file diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs index 35acb3c..31da941 100644 --- a/MES.Service/service/BasicData/MesRohInManager.cs +++ b/MES.Service/service/BasicData/MesRohInManager.cs @@ -15,7 +15,7 @@ var rohInErpRohIn = rohIn.ErpRohIn; var mesRohIn = GetMesRohIn(rohInErpRohIn); var mesRohInDatas = - GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type); + GetMesRohInDatas(rohIn.ErpRohinDatas); return UseTransaction(db => { @@ -183,7 +183,7 @@ // 灏� ErpRohinData 瀵硅薄杞崲涓� MesRohInData 瀵硅薄鐨勬柟娉� public List<MesRohInData> GetMesRohInDatas( - List<ErpRohinData> erpRohinDatas, string type) + List<ErpRohinData> erpRohinDatas) { return erpRohinDatas.Select(s => { diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs new file mode 100644 index 0000000..aedbd5d --- /dev/null +++ b/MES.Service/service/BasicData/ProductionOrderManager.cs @@ -0,0 +1,200 @@ +锘縰sing System.Globalization; +using MES.Service.DB; +using MES.Service.Dto.webApi; +using MES.Service.Modes; +using SqlSugar; + +namespace MES.Service.service; + +public class ProductionOrderManager : Repository<ProductionOrder> +{ + //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉� + + private readonly ProductionOrderSubManager _productionOrderSubManager = + new(); + + + //ErpWYOrder + public bool Save(ErpWYOrder wyOrder) + { + var erpProductionOrderDto = wyOrder.OrderDto; + var mesRohIn = ConvertErpToProductionOrder(erpProductionOrderDto); + var mesRohInDatas = + ConvertErpToProductionOrderSub(wyOrder.Items); + + return UseTransaction(db => + { + switch (erpProductionOrderDto.Type) + { + // case "2": + // return InsertData(db, mesRohIn, mesRohInDatas, + // rohInErpRohIn.FBILLTYPE) + // ? 1 + // : 0; + case "3": + return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0; + case "2": + case "4": + return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) + ? 1 + : 0; + default: + throw new NotImplementedException( + $"type娌℃湁{erpProductionOrderDto.Type}杩欎釜绫诲瀷"); + } + }) > 0; + } + + private bool UpdateData(SqlSugarScope db, ProductionOrder mesRohIn, + List<ProductionOrderSub> 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, ProductionOrder mesRohIn, + List<ProductionOrderSub> mesRohInDatas) + { + if (mesRohIn.Id != null) base.DeleteById(mesRohIn.Id); + + if (mesRohInDatas.Count > 0) + db.Deleteable<ProductionOrderSub>() + .Where(s => s.ErpHeaderId == mesRohIn.ErpId).ExecuteCommand(); + + var orUpdate = base.Insert(mesRohIn); + var baOrUpdate = _productionOrderSubManager.InsertRange(mesRohInDatas); + if (orUpdate && baOrUpdate) return true; + throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�"); + } + + // 鎵归噺淇濆瓨璁板綍鐨勬柟娉� + public bool SaveList(List<ErpWYOrder> rohIns) + { + var result = rohIns.Select(Save).ToList(); + return result.All(b => b); + } + + private ProductionOrder ConvertErpToProductionOrder( + ErpProductionOrderDto erpDto) + { + DateTime parsedDate; + + // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss.fff" + DateTime? ParseDateTime(string dateStr) + { + if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss.fff", + CultureInfo.InvariantCulture, + DateTimeStyles.None, + out parsedDate)) + return parsedDate; + + return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull + } + + var productionOrder = new ProductionOrder + { + OrderNo = erpDto.FBillNo, + SmtProcessAttr = erpDto.F_UNW_Text_tpgy, + Warehouse = erpDto.FStockID, + OrderDate = ParseDateTime(erpDto.FDate) ?? null, + OrderType = erpDto.FBillType, + BusinessStatus = erpDto.FStatus, + ProductCode = erpDto.FMaterialId, + Unit = erpDto.FUnitID, + WorkOrderQty = Convert.ToDecimal(erpDto.FQty), + PlanningGroup = erpDto.FWorkGroupId, + Planner = erpDto.FPlannerID, + EstimatedStartTime = + ParseDateTime(erpDto.FPlanStartDate) ?? null, + EstimatedEndTime = + ParseDateTime(erpDto.FPlanFinishDate) ?? null, + StorageUpperLimit = Convert.ToDecimal(erpDto.FStockInLimitH), + StorageLowerLimit = Convert.ToDecimal(erpDto.FStockInLimitL), + TrackingNo = erpDto.FMTONO, + BatchNo = erpDto.FLot, + BomVersion = erpDto.FBomId, + SalesOrderNo = erpDto.F_UNW_XSDDH, + GenerationMethod = erpDto.FCreateType, + ErpProductionOrderId = erpDto.FSUBID, + ErpProductionOrderLineNo = erpDto.FSUBBILLNOSEQ, + ErpProductionOrderNo = erpDto.FSUBBILLNO, + SourceOrderType = erpDto.FSrcBillType, + SourceOrderNo = erpDto.FSrcBillNo, + SourceOrderEntryNo = erpDto.FSrcBillEntrySeq, + DemandOrderNo = erpDto.FSALEORDERNO, + DemandOrderLineNo = erpDto.FSaleOrderEntrySeq, + ClosingPerson = erpDto.FFORCECLOSERID, + ClosingType = erpDto.FCloseType, + Remarks = erpDto.FDescription, + ErpId = erpDto.FPPOMID, + ErpProductionEntryCode = erpDto.FSUBENTRYID, + PurchaseOrderNo = erpDto.FPurOrderNo, + PurchaseOrderEntrySeq = long.Parse(erpDto.FPurOrderEntrySeq), + StandardPoints = + Convert.ToDecimal(erpDto.F_UNW_BaseProperty_bzds), + PricingPoints = + Convert.ToDecimal(erpDto.F_UNW_BaseProperty_jjds), + StockInQty = Convert.ToDecimal(erpDto.FBaseStockInQty), + NoStockInQty = Convert.ToDecimal(erpDto.FBaseNoStockInQty), + StockOwner = erpDto.FInStockOwnerId + }; + + var single = base.GetSingle(it => it.ErpId == erpDto.FPPOMID); + if (single != null) productionOrder.Id = single.Id; + + return productionOrder; + } + + private List<ProductionOrderSub> ConvertErpToProductionOrderSub( + List<ErpProductionOrderSubDto> erpDtoList) + { + var productionOrderSubList = + new List<ProductionOrderSub>(); + + foreach (var erpDto in erpDtoList) + { + var productionOrderSub = new ProductionOrderSub + { + SequenceNo = long.Parse(erpDto.FSEQ), + MaterialCode = erpDto.FMaterialID2, + RequiredQty = Convert.ToDecimal(erpDto.FMustQty), + IssuedQty = Convert.ToDecimal(erpDto.FPickedQty), + LocationNo = erpDto.FPositionNO, + StockOwner = erpDto.FOwnerID, + TrackingNo = erpDto.FMTONO, + BatchNo = erpDto.FLot, + Warehouse = erpDto.FStockID, + IssuingMethod = erpDto.FIssueType, + Process = erpDto.F_UNW_Text_tpgy_Z, + Unit = erpDto.FUnitID2, + SupplyingType = erpDto.FSupplyType, + Numerator = long.Parse(erpDto.FNumerator), + Denominator = long.Parse(erpDto.FDenominator), + ErpId = erpDto.FPPOMENTRYID, + ErpHeaderId = erpDto.FPPOMID, + FixedLoss = Convert.ToDecimal(erpDto.FFixScrapQty), + VariableLossRate = erpDto.FScrapRate, + SubItemType = erpDto.FMaterialType, + SalesOrderNo = erpDto.F_UNW_Text_xsddh, + ItemNo = erpDto.FReplaceGroup, + OwnerType = erpDto.FOwnerTypeId, + Owner = erpDto.FOwnerID2 + }; + + var single = _productionOrderSubManager.GetSingle(it => + it.ErpId == productionOrderSub.ErpId); + if (single != null) productionOrderSub.Id = single.Id; + + productionOrderSubList.Add(productionOrderSub); + } + + return productionOrderSubList; + } +} \ No newline at end of file diff --git a/MES.Service/service/BasicData/ProductionOrderSubManager.cs b/MES.Service/service/BasicData/ProductionOrderSubManager.cs new file mode 100644 index 0000000..70d5162 --- /dev/null +++ b/MES.Service/service/BasicData/ProductionOrderSubManager.cs @@ -0,0 +1,78 @@ +锘縰sing MES.Service.DB; +using MES.Service.Modes; +using SqlSugar; + +namespace MES.Service.service; + +public class ProductionOrderSubManager : Repository<ProductionOrderSub> +{ + //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉� + + //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 ProductionOrderSubManager.cs + + + #region 鏁欏鏂规硶 + + /// <summary> + /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉� + /// </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(ProductionOrderSub).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 ProductionOrderSub(); //娴嬭瘯鍙傛暟 + var insertArray = new[] { insertData }; + base.Insert(insertData); //鎻掑叆 + base.InsertRange(insertArray); //鎵归噺鎻掑叆 + var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒� + AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆 + + + /*********鏇存柊*********/ + var updateData = new ProductionOrderSub(); //娴嬭瘯鍙傛暟 + var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟 + base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊 + base.UpdateRange(updateArray); //鎵归噺鏇存柊 + //base.Update(it => new ProductionOrderSub() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1 + AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏� + + + /*********鍒犻櫎*********/ + var deldata = new ProductionOrderSub(); //娴嬭瘯鍙傛暟 + 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/GetErpParametersServer.cs b/MES.Service/service/GetErpParametersServer.cs index 9d1c4d4..b8dc519 100644 --- a/MES.Service/service/GetErpParametersServer.cs +++ b/MES.Service/service/GetErpParametersServer.cs @@ -95,7 +95,7 @@ centers.Add(mesToErp); //鑾峰彇鍓╀綑鐨勮姹� - PostRequest(data, query, centers,centerUpdateDate); + PostRequest(data, query, centers, centerUpdateDate); break; //鐢熶骇棰嗘枡鍗� case "INV_ITEM_OUTS_A": @@ -113,9 +113,9 @@ mesToErp.UpdateDate = centerUpdateDate; //娣诲姞鍒拌姹傞泦鍚堜腑 centers.Add(mesToErp); - + //鑾峰彇鍓╀綑鐨勮姹� - PostRequest(data, query, centers,centerUpdateDate); + PostRequest(data, query, centers, centerUpdateDate); break; default: throw new Exception("鏃犳硶璇嗗埆TableName绫诲瀷"); @@ -125,10 +125,11 @@ return centers.OrderBy(p => p.Seq).ToList(); } - private void PostRequest(List<MessageCenter> data, WarehouseQuery query, List<MessageCenter> centers,string centerUpdateDate) + private void PostRequest(List<MessageCenter> data, WarehouseQuery query, + List<MessageCenter> centers, string centerUpdateDate) { var find = data.FindAll(s => s.Seq != 1); - + var result = new JObject { new JProperty("id", query.id), diff --git a/MES.Service/service/QC/LljService.cs b/MES.Service/service/QC/LljService.cs index 2d9397c..73a5651 100644 --- a/MES.Service/service/QC/LljService.cs +++ b/MES.Service/service/QC/LljService.cs @@ -1,5 +1,4 @@ 锘縰sing System.Data; -using System.Dynamic; using MES.Service.DB; using MES.Service.Dto.service; using MES.Service.Modes; @@ -27,8 +26,8 @@ StringUtil.IsNotNullOrEmpty(queryObj.result) && !"鏈畬鎴�".Equals(queryObj.result), a => a.FcheckResu != null) - .WhereIF(id > 0, (a) => a.Id == id) - .OrderByDescending(a=>a.Id) + .WhereIF(id > 0, a => a.Id == id) + .OrderByDescending(a => a.Id) .ToPageList(queryObj.PageIndex, queryObj.Limit); } @@ -66,7 +65,7 @@ // FcheckItemDesc = "0", // FcheckResu = "0", FcheckTool = b.FcheckTool, - FspecRequ = b.FspecRequ, + FspecRequ = b.FspecRequ // FtextType = "0", // Funit = "0", // LastupdateBy = "0", @@ -176,17 +175,11 @@ .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(); @@ -590,10 +583,7 @@ var resultValue = outputResult.Value?.ToString(); var messageValue = outputMessage.Value?.ToString(); - if ("1".Equals(resultValue)) - { - throw new Exception(messageValue); - } + if ("1".Equals(resultValue)) throw new Exception(messageValue); return true; } diff --git a/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs b/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs index d1a6bea..9f59fba 100644 --- a/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs +++ b/MES.Service/service/Warehouse/MesInvItemBarcodesManager.cs @@ -20,62 +20,40 @@ try { // 1. 妫�鏌ユ潯鐮佹槸鍚︿负绌� - if (string.IsNullOrEmpty(cBarcode)) - { - throw new Exception("璇疯緭鍏ユ潯鐮侊紒"); - } + if (string.IsNullOrEmpty(cBarcode)) throw new Exception("璇疯緭鍏ユ潯鐮侊紒"); // 2. 妫�鏌ユ潯鐮佹槸鍚﹀瓨鍦ㄤ簬 MesInvItemBarcodes 琛ㄤ腑 - int tempNum = Db.Queryable<MesInvItemBarcodes>() + var tempNum = Db.Queryable<MesInvItemBarcodes>() .Where(it => it.ItemBarcode == cBarcode) .Count(); - if (tempNum == 0) - { - throw new Exception("鏉$爜涓嶅瓨鍦紒"); - } + if (tempNum == 0) throw new Exception("鏉$爜涓嶅瓨鍦紒"); // 3. 妫�鏌ユ潯鐮佹槸鍚﹀瓨鍦ㄤ簬 MesInvItemStocks 琛ㄤ腑 tempNum = Db.Queryable<MesInvItemStocks>() .Where(it => it.ItemBarcode == cBarcode) .Count(); - if (tempNum == 0) - { - throw new Exception("搴撳瓨涓棤姝ゆ潯鐮侊紒"); - } + if (tempNum == 0) throw new Exception("搴撳瓨涓棤姝ゆ潯鐮侊紒"); // 4. 鑾峰彇 MesInvItemBarcodes 鐨勬暟鎹� var mesInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>() .Where(it => it.ItemBarcode == cBarcode) .First(); - if (mesInvItemBarcodes == null) - { - throw new Exception("鏉$爜涓嶅瓨鍦紒"); - } + if (mesInvItemBarcodes == null) throw new Exception("鏉$爜涓嶅瓨鍦紒"); // 5. 妫�鏌ユ潯鐮佹暟閲忔槸鍚︿负 0 if (mesInvItemBarcodes.Quantity == 0) - { throw new Exception("姝ゆ潯鐮佹暟閲忎负0锛�"); - } // 6. 妫�鏌ユ潯鐮佺姸鎬� if (mesInvItemBarcodes.Barcodestatus == 1 || mesInvItemBarcodes.Hbdytm == 1) - { throw new Exception("鏃犳晥鏉$爜锛�"); - } // 7. 妫�鏌ユ潯鐮佹槸鍚﹁鍐荤粨 - if (mesInvItemBarcodes.Visable == 1) - { - throw new Exception("鏉$爜鍐荤粨锛�"); - } + if (mesInvItemBarcodes.Visable == 1) throw new Exception("鏉$爜鍐荤粨锛�"); // 8. 妫�鏌ユ潯鐮佹槸鍚︿綔搴� - if (mesInvItemBarcodes.Location == 2) - { - throw new Exception("鏉$爜浣滃簾锛�"); - } + if (mesInvItemBarcodes.Location == 2) throw new Exception("鏉$爜浣滃簾锛�"); // 9. 妫�鏌ユ姇鏂欏崟鏄惁闇�瑕佹鐗╂枡 tempNum = Db.Queryable<Womdab>() @@ -83,12 +61,9 @@ it.Dab001 == cDaa001 && it.Dab003 == mesInvItemBarcodes.ItemId.ToString()) .Count(); - if (tempNum == 0) - { - throw new Exception("鎶曟枡鍗曚笉闇�瑕佹鐗╂枡锛�"); - } + if (tempNum == 0) throw new Exception("鎶曟枡鍗曚笉闇�瑕佹鐗╂枡锛�"); - string sql = + var sql = "SELECT COUNT(1) FROM WOMDAB WHERE DAB001='" + cDaa001 + "' AND DAB003='" + mesInvItemBarcodes.ItemId + "' AND DAB017=(SELECT DEPOTS_CODE FROM MES_INV_ITEM_STOCKS WHERE ITEM_BARCODE='" + @@ -96,10 +71,7 @@ // 10. 妫�鏌ュ彂鏂欎粨搴撴槸鍚︽纭� tempNum = Db.Ado.SqlQuerySingle<int>(sql); - if (tempNum == 0) - { - throw new Exception("鍙戞枡浠撳簱鏈夎锛�"); - } + if (tempNum == 0) throw new Exception("鍙戞枡浠撳簱鏈夎锛�"); // 11. 鎴愬姛锛岃繑鍥炵粨鏋� return true; @@ -113,18 +85,12 @@ public decimal? GetBarCodesQuan(WarehouseQuery query) { - if (!PdaProdPickItemCkBar(query.barcode, query.daa001)) - { - return null; - } + if (!PdaProdPickItemCkBar(query.barcode, query.daa001)) return null; var invItemBarcodes = Db.Queryable<MesInvItemBarcodes>() .Where(s => s.ItemBarcode == query.barcode).First(); - if (invItemBarcodes == null) - { - throw new Exception("鏉$爜涓嶅瓨鍦紒"); - } + if (invItemBarcodes == null) throw new Exception("鏉$爜涓嶅瓨鍦紒"); return invItemBarcodes.Quantity; } @@ -144,57 +110,37 @@ }; // 妫�鏌ュ彂鏂欐暟閲忔槸鍚﹀悎娉� - if (param.CNum <= 0) - { - throw new Exception("鍙戞枡鏁伴噺涓嶈兘灏忎簬绛変簬0锛�"); - } + if (param.CNum <= 0) throw new Exception("鍙戞枡鏁伴噺涓嶈兘灏忎簬绛変簬0锛�"); // 妫�鏌ユ潯鐮佹槸鍚﹀瓨鍦� param.CInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>() .Where(it => it.ItemBarcode == param.CBarcode) .First(); - if (param.CInvItemBarcodes == null) - { - throw new Exception("鏉$爜涓嶅瓨鍦紒"); - } + if (param.CInvItemBarcodes == null) throw new Exception("鏉$爜涓嶅瓨鍦紒"); // 妫�鏌ユ潯鐮佹槸鍚﹀凡鍏ュ簱 param.CInvItemStocks = Db.Queryable<MesInvItemStocks>() .Where(it => it.ItemBarcode == param.CBarcode) .First(); - if (param.CInvItemStocks == null) - { - throw new Exception("鏉$爜鏈叆搴擄紒"); - } + if (param.CInvItemStocks == null) throw new Exception("鏉$爜鏈叆搴擄紒"); // 妫�鏌ュ伐鍗曞彿鏄惁瀛樺湪 param.CWomdaa = Db.Queryable<Womdaa>() .Where(it => it.Daa001 == param.CDaa001) .First(); - if (param.CWomdaa == null) - { - throw new Exception("涓嶅瓨鍦ㄦ宸ュ崟锛�"); - } + if (param.CWomdaa == null) throw new Exception("涓嶅瓨鍦ㄦ宸ュ崟锛�"); // 妫�鏌ュ彂鏂欐暟閲忔槸鍚﹁秴鍑烘潯鐮佹暟閲� if (param.CNum > param.CInvItemBarcodes.Quantity) - { throw new Exception("鍙戞枡鏁伴噺涓嶈兘澶т簬鏉$爜鏁伴噺锛�"); - } // 妫�鏌ユ潯鐮佸悎娉曟�� - if (!PdaProdPickItemCkBar(param.CBarcode, param.CDaa001)) - { - return null; - } + if (!PdaProdPickItemCkBar(param.CBarcode, param.CDaa001)) return null; // 璁$畻鍓╀綑鍙彂鏁伴噺 - decimal? tempNum = CalculateRemainingQuantity(param.CDaa001, + var tempNum = CalculateRemainingQuantity(param.CDaa001, param.CInvItemBarcodes.ItemId); - if (param.CNum > tempNum) - { - throw new Exception("鍙戞枡鏁伴噺涓嶈兘澶т簬瀵瑰簲鐗╂枡鐨勬湭鍙戞枡鏁伴噺锛�"); - } + if (param.CNum > tempNum) throw new Exception("鍙戞枡鏁伴噺涓嶈兘澶т簬瀵瑰簲鐗╂枡鐨勬湭鍙戞枡鏁伴噺锛�"); // 宸ュ崟閮ㄩ棬鍚嶇О param.CDepart = Db.Queryable<SysDepartment>() @@ -319,14 +265,12 @@ { string cSupName = null; if (!string.IsNullOrEmpty(param.CInvItemBarcodes.SuppNo)) - { cSupName = db.Queryable<MesSupplier>() .Where(it => it.SuppNo == param.CInvItemBarcodes.SuppNo) .Select(it => it.SuppName) .First(); - } - int cId = + var cId = db.Ado.GetInt( "SELECT F_GETSEQNEXTVALUE('MES_RF_PRNBARCODE') FROM dual"); @@ -381,16 +325,16 @@ .Where(it => it.TaskNo == param.CDaa001 && it.Status == 0) .Count(); - int cOutId = 0; + var cOutId = 0; string cOutBill; if (tempNum == 0) { - string sql = + var sql = "SELECT COUNT(1) FROM MES_INV_ITEM_OUTS WHERE TRUNC(CREATE_DATE)=TRUNC(SYSDATE);"; - int todayCount = db.Ado.SqlQuerySingle<int>(sql); + var todayCount = db.Ado.SqlQuerySingle<int>(sql); - cOutBill = $"P{DateTime.Now:yyyyMMdd}{(todayCount + 1):D4}"; + cOutBill = $"P{DateTime.Now:yyyyMMdd}{todayCount + 1:D4}"; // 鎻掑叆鏂扮殑鍑哄簱鍗� db.Insertable(new MesInvItemOuts @@ -441,9 +385,9 @@ it.ItemOutId == cOutId) .Count(); - decimal? cNumTemp = param.CNum; + var cNumTemp = param.CNum; - string sql = + var sql = "SELECT B.Id, NVL(A.YF, 0) yfl, B.DAB006 - NVL(A.YF, 0) Qty FROM WOMDAB B LEFT JOIN (SELECT SUM(QUANTITY) YF, ITEM_DABID FROM MES_INV_ITEM_OUT_ITEMS GROUP BY ITEM_DABID) A ON A.ITEM_DABID = B.ID WHERE DAB003 = '" + param.CInvItemBarcodes.ItemId + "' AND DAB001 = '" + param.CDaa001 + "' ORDER BY TO_NUMBER(DAB002)"; @@ -457,7 +401,6 @@ if (cNumTemp <= item.Qty) { if (tempNum == 0) - { // 鎻掑叆鏂扮殑鍙戞枡璁板綍 db.Insertable(new MesInvItemOutItems { @@ -480,9 +423,7 @@ DepotSectionCode = param.CInvItemStocks.DepotSectionsCode }).ExecuteCommand(); - } else - { // 鏇存柊鐜版湁鍙戞枡璁板綍鐨勬暟閲� db.Updateable<MesInvItemOutItems>() .SetColumns(it => new MesInvItemOutItems @@ -491,7 +432,6 @@ it.ItemOutId == cOutId && it.ItemDabid == itemDabid) .ExecuteCommand(); - } // 鏇存柊 WOMDAB 琛ㄧ殑鍙戞枡鏁伴噺 db.Updateable<Womdab>() @@ -538,7 +478,7 @@ private string GenerateNewBarcode(string oldBarcode) { // 鐢熸垚鏂扮殑鏉$爜閫昏緫 - int count = Db.Queryable<MesInvItemBarcodes>() + var count = Db.Queryable<MesInvItemBarcodes>() .Where(b => b.OldItemBarcode == oldBarcode).Count(); return $"{oldBarcode}-{count + 1}"; } @@ -565,13 +505,10 @@ { try { - if (pId == null) - { - return null; - } + if (pId == null) return null; // 鏌ヨ鐗╂枡鍚嶇О - string itemName = Db.Queryable<MesItems>() + var itemName = Db.Queryable<MesItems>() .Where(it => it.Id == pId) .Select(it => it.ItemName) .First(); @@ -588,28 +525,22 @@ { try { - if (string.IsNullOrEmpty(pId)) - { - return null; - } + if (string.IsNullOrEmpty(pId)) return null; // 鏌ヨ鍗曚綅鍚嶇О鏄惁瀛樺湪 - int tempNum = Db.Queryable<MesUnit>() + var tempNum = Db.Queryable<MesUnit>() .Where(it => it.Id.ToString() == pId) .Count(); string unitName; if (tempNum != 0) - { // 濡傛灉鍦� MES_UNIT 琛ㄤ腑鎵惧埌鍗曚綅鍚嶇О unitName = Db.Queryable<MesUnit>() .Where(it => it.Id.ToString() == pId) .Select(it => it.Fname) .First(); - } else - { // 濡傛灉鍦� MES_UNIT 琛ㄤ腑鎵句笉鍒帮紝鍦� MES_ITEMS 琛ㄤ腑鏌ユ壘鐩稿叧鑱旂殑鍗曚綅鍚嶇О unitName = Db.Queryable<MesItems, MesUnit>((i, u) => new JoinQueryInfos( @@ -617,7 +548,6 @@ .Where((i, u) => i.Id.ToString() == pId) .Select((i, u) => u.Fname) .First(); - } return unitName; } @@ -631,13 +561,10 @@ { try { - if (pId == null) - { - return null; - } + if (pId == null) return null; // 鏌ヨ鐗╂枡瑙勬牸 - string itemModel = Db.Queryable<MesItems>() + var itemModel = Db.Queryable<MesItems>() .Where(it => it.Id == pId) .Select(it => it.ItemModel) .First(); diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs index 8b255c9..3a1b97c 100644 --- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs +++ b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs @@ -14,9 +14,10 @@ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉� //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemOutsManager.cs - public (List<MesInvItemOuts> Items, int TotalCount) GetProductionPickPage(WarehouseQuery query) + public (List<MesInvItemOuts> Items, int TotalCount) GetProductionPickPage( + WarehouseQuery query) { - int totalCount = 0; // 鍒濆鍖� totalCount + var totalCount = 0; // 鍒濆鍖� totalCount // 纭繚杩欓噷浣跨敤 'out' 鏉ヨ幏鍙栨�昏鏁� var result = Db.Queryable<MesInvItemOuts, MesDepots>((a, o) => new JoinQueryInfos( @@ -48,7 +49,8 @@ ItemOutNo = a.ItemOutNo, DepotName = o.DepotName // 闇�瑕佸姩鎬佹坊鍔犵殑瀛楁 }) - .ToPageList(query.PageIndex, query.Limit, ref totalCount); // 纭繚杩欓噷浣跨敤 'out' + .ToPageList(query.PageIndex, query.Limit, + ref totalCount); // 纭繚杩欓噷浣跨敤 'out' return (result, totalCount); } @@ -940,8 +942,8 @@ { FMaterialId = item.ItemNo, FUnitID = C_ITEM_UNIT, - FAppQty = qty, - FActualQty = qty, + FAppQty = qty, + FActualQty = qty, FStockId = item.DepotCode, FPPBomEntryId = erpid, F_UNW_Text_xsddh = xsddh, diff --git a/MES.Service/service/WomdaaManager.cs b/MES.Service/service/WomdaaManager.cs index bab21e5..39ecd65 100644 --- a/MES.Service/service/WomdaaManager.cs +++ b/MES.Service/service/WomdaaManager.cs @@ -13,7 +13,7 @@ //鑾峰彇宸ュ崟鍙� public List<string> GetProductionPickDaa001(WarehouseQuery query) { - string sql = + var sql = "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB WHERE DAB006 > DAB007 GROUP BY PID) B ON A.ID = B.PID WHERE DAA001 LIKE '%" + query.daa001 + "%' and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc"; @@ -24,10 +24,7 @@ //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡 public ProductionPickDto GetItemsByDaa001(WarehouseQuery query) { - if (string.IsNullOrEmpty(query.daa001)) - { - throw new Exception("宸ュ崟鍙蜂负绌�"); - } + if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�"); var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) => new JoinQueryInfos(JoinType.Left, @@ -38,10 +35,7 @@ i.ItemModel }).First(); - if (womdaa?.ItemModel == null) - { - throw new Exception("宸ュ崟鍙蜂笉瀛樺湪"); - } + if (womdaa?.ItemModel == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪"); var dto = new ProductionPickDto { @@ -58,7 +52,7 @@ )) .Where((a, b, c) => a.Daa001 == query.daa001) // WHERE DAA001 = 'SCDD003681-1' - .Select((a, b, c) => new Womdab() + .Select((a, b, c) => new Womdab { Pid = b.Pid, Dab003 = b.Dab003, diff --git a/MES.Service/util/ResponseResult.cs b/MES.Service/util/ResponseResult.cs index 24f8f15..cd81c43 100644 --- a/MES.Service/util/ResponseResult.cs +++ b/MES.Service/util/ResponseResult.cs @@ -15,7 +15,7 @@ //杩斿洖鐨勬暟鎹� public object data { get; set; } - public int TotalCount { get; set; } = 0; + public int TotalCount { get; set; } = 0; //澶辫触鐨勮繑鍥炵粨鏋� public static ResponseResult ResponseError(Exception e) diff --git a/MES.Service/util/UserUtil.cs b/MES.Service/util/UserUtil.cs index 8339590..7908e22 100644 --- a/MES.Service/util/UserUtil.cs +++ b/MES.Service/util/UserUtil.cs @@ -6,7 +6,7 @@ { public static (string factory, string company) GetFactory(string user) { - string sql = + var sql = "select t.Ffactory factory, t.Fcompany company from sys_user t where t.fcode = upper(trim('" + user + "'))"; diff --git a/MESApplication/Controllers/BasicData/ProductionOrderController.cs b/MESApplication/Controllers/BasicData/ProductionOrderController.cs new file mode 100644 index 0000000..23c4931 --- /dev/null +++ b/MESApplication/Controllers/BasicData/ProductionOrderController.cs @@ -0,0 +1,259 @@ +锘縰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.BasicData; + +[ApiController] +[Route("api/[controller]")] +public class ProductionOrderController : ControllerBase +{ + private readonly MessageCenterManager _manager = new(); + + private readonly string METHOD = "POST"; + + private readonly string TableName = "PRODUCTION_ORDER"; + + private readonly string URL = + "http://localhost:10054/api/PRODUCTION_ORDER/"; + + private readonly ProductionOrderManager m = new(); + + // + [HttpPost("Save")] + public ResponseResult Save(ErpWYOrder 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<ErpWYOrder> 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] ProductionOrder 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] ProductionOrder 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] ProductionOrder 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/ProductionOrderSubController.cs b/MESApplication/Controllers/BasicData/ProductionOrderSubController.cs new file mode 100644 index 0000000..cf2776c --- /dev/null +++ b/MESApplication/Controllers/BasicData/ProductionOrderSubController.cs @@ -0,0 +1,163 @@ +锘縰sing System.Dynamic; +using MES.Service.Modes; +using MES.Service.service; +using MES.Service.util; +using Microsoft.AspNetCore.Mvc; + +namespace MESApplication.Controllers.BasicData; + +[ApiController] +[Route("api/[controller]")] +public class ProductionOrderSubController : ControllerBase +{ + private readonly ProductionOrderSubManager 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] ProductionOrderSub 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] ProductionOrderSub 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] ProductionOrderSub 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 index 55ba24d..fda3e60 100644 --- a/MESApplication/Controllers/WomdaaController.cs +++ b/MESApplication/Controllers/WomdaaController.cs @@ -12,8 +12,9 @@ public class WomdaaController : ControllerBase { private readonly WomdaaManager m = new(); - + #region 鐢熶骇棰嗘枡 + //GetProductionPickDaa001 /// <summary> /// 妯$硦鏌ヨ宸ュ崟鍙峰苟杩斿洖 @@ -38,7 +39,7 @@ return ResponseResult.ResponseError(ex); } } - + //GetItemsByDaa001 /// <summary> /// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁� @@ -63,7 +64,7 @@ return ResponseResult.ResponseError(ex); } } - + /// <summary> /// 鑾峰彇鎵�鏈� /// </summary> @@ -208,5 +209,6 @@ return ResponseResult.ResponseError(ex); } } + #endregion } \ No newline at end of file -- Gitblit v1.9.3